From 1a14c2ccd112d905077daaeae7a234aaa396a088 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 25 Mar 2006 21:52:34 +0000
Subject: [PATCH] updated for version 7.0b01

---
 nsis/icons/enabled.bmp | Bin 0 -> 358 bytes
 runtime/doc/vim.man    | 119 +++++++++++++++++++++--------------------
 runtime/synmenu.vim    |   2 +-
 src/Make_bc3.mak       |   2 +-
 src/Makefile           |   2 +-
 5 files changed, 64 insertions(+), 61 deletions(-)
 create mode 100644 nsis/icons/enabled.bmp

diff --git a/nsis/icons/enabled.bmp b/nsis/icons/enabled.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..766e11a93291a9c7bae50a89d4fefa1bd517e7d0
GIT binary patch
literal 358
zcmZ?rO=DyLgEAng0mLFu%*en37XJVwkMKdT09b^9fya!8fn_NR16K|g!;&RS7#=)$
zz!2{3#*m(x&T#0!AqGxgP6oGhH-?_}9)@3kelf5%u`p;FX)+jj3Nbh|I56zqUB25j
zWH%5nFznu*Rvr5k%HCFW^UXPs1W<gN^MW&Ho_a&r?q)q_&P7An<#}KUpqj1j<q!!5
zhAs2l%ZncYC4hQ8kGhwauhTiB7s9~s=bU@7dlg86f#Ks(_hJ)}gen7rznpvVW%sh4
zgI|E={B$qAWL=&i53(0%W`?r6<!!JVfb0_`#mQjt^70jD*vrkVfoiPEf%Y<&7pDX5
gUE<<WckqdeGf3PlEp4K_Sz0hiJrMYR0g((00I=nT(*OVf

literal 0
HcmV?d00001

diff --git a/runtime/doc/vim.man b/runtime/doc/vim.man
index f26c13000..9b70e7f96 100644
--- a/runtime/doc/vim.man
+++ b/runtime/doc/vim.man
@@ -217,62 +217,65 @@ OPTIONS
        -O[N]       Open N windows side by side.  When N is omitted,  open  one
                    window for each file.
 
-       -R          Read-only  mode.   The  'readonly' option will be set.  You
+       -p[N]       Open N tab pages.  When N is omitted, open one tab page for
+                   each file.
+
+       -R          Read-only mode.  The 'readonly' option will  be  set.   You
                    can still edit the buffer, but will be prevented from acci-
-                   dently  overwriting  a file.  If you do want to overwrite a
-                   file, add an exclamation mark to  the  Ex  command,  as  in
-                   ":w!".   The  -R  option  also  implies  the -n option (see
-                   below).  The 'readonly' option  can  be  reset  with  ":set
+                   dently overwriting a file.  If you do want to  overwrite  a
+                   file,  add  an  exclamation  mark  to the Ex command, as in
+                   ":w!".  The -R option  also  implies  the  -n  option  (see
+                   below).   The  'readonly'  option  can  be reset with ":set
                    noro".  See ":help 'readonly'".
 
-       -r          List  swap  files,  with  information  about using them for
+       -r          List swap files, with  information  about  using  them  for
                    recovery.
 
-       -r {file}   Recovery mode.  The swap file is used to recover a  crashed
-                   editing  session.   The  swap  file is a file with the same
+       -r {file}   Recovery  mode.  The swap file is used to recover a crashed
+                   editing session.  The swap file is a  file  with  the  same
                    filename as the text file with ".swp" appended.  See ":help
                    recovery".
 
-       -s          Silent  mode.   Only  when started as "Ex" or when the "-e"
+       -s          Silent mode.  Only when started as "Ex" or  when  the  "-e"
                    option was given before the "-s" option.
 
        -s {scriptin}
-                   The script file {scriptin} is read.  The characters in  the
-                   file  are  interpreted  as if you had typed them.  The same
+                   The  script file {scriptin} is read.  The characters in the
+                   file are interpreted as if you had typed  them.   The  same
                    can be done with the command ":source! {scriptin}".  If the
                    end of the file is reached before the editor exits, further
                    characters are read from the keyboard.
 
        -T {terminal}
-                   Tells Vim the name of the terminal  you  are  using.   Only
-                   required  when the automatic way doesn't work.  Should be a
-                   terminal known to Vim (builtin) or defined in  the  termcap
+                   Tells  Vim  the  name  of the terminal you are using.  Only
+                   required when the automatic way doesn't work.  Should be  a
+                   terminal  known  to Vim (builtin) or defined in the termcap
                    or terminfo file.
 
-       -u {vimrc}  Use  the  commands in the file {vimrc} for initializations.
-                   All the other initializations are  skipped.   Use  this  to
-                   edit  a special kind of files.  It can also be used to skip
-                   all initializations by giving the name "NONE".  See  ":help
+       -u {vimrc}  Use the commands in the file {vimrc}  for  initializations.
+                   All  the  other  initializations  are skipped.  Use this to
+                   edit a special kind of files.  It can also be used to  skip
+                   all  initializations by giving the name "NONE".  See ":help
                    initialization" within vim for more details.
 
-       -U {gvimrc} Use  the  commands in the file {gvimrc} for GUI initializa-
-                   tions.  All the other GUI initializations are skipped.   It
-                   can  also be used to skip all GUI initializations by giving
-                   the name "NONE".  See ":help gui-init" within vim for  more
+       -U {gvimrc} Use the commands in the file {gvimrc} for  GUI  initializa-
+                   tions.   All the other GUI initializations are skipped.  It
+                   can also be used to skip all GUI initializations by  giving
+                   the  name "NONE".  See ":help gui-init" within vim for more
                    details.
 
-       -V[N]       Verbose.   Give  messages about which files are sourced and
-                   for reading and writing a viminfo file.  The optional  num-
+       -V[N]       Verbose.  Give messages about which files are  sourced  and
+                   for  reading and writing a viminfo file.  The optional num-
                    ber N is the value for 'verbose'.  Default is 10.
 
-       -v          Start  Vim  in Vi mode, just like the executable was called
-                   "vi".  This only has effect when the executable  is  called
+       -v          Start Vim in Vi mode, just like the executable  was  called
+                   "vi".   This  only has effect when the executable is called
                    "ex".
 
        -w {scriptout}
-                   All  the  characters that you type are recorded in the file
-                   {scriptout}, until you exit Vim.  This  is  useful  if  you
-                   want  to  create  a script file to be used with "vim -s" or
+                   All the characters that you type are recorded in  the  file
+                   {scriptout},  until  you  exit  Vim.  This is useful if you
+                   want to create a script file to be used with  "vim  -s"  or
                    ":source!".  If the {scriptout} file exists, characters are
                    appended.
 
@@ -282,27 +285,27 @@ OPTIONS
        -x          Use encryption when writing files.  Will prompt for a crypt
                    key.
 
-       -X          Don't connect to the X server.  Shortens startup time in  a
-                   terminal,  but  the  window title and clipboard will not be
+       -X          Don't  connect to the X server.  Shortens startup time in a
+                   terminal, but the window title and clipboard  will  not  be
                    used.
 
        -y          Start Vim in easy mode, just like the executable was called
-                   "evim"  or "eview".  Makes Vim behave like a click-and-type
+                   "evim" or "eview".  Makes Vim behave like a  click-and-type
                    editor.
 
-       -Z          Restricted mode.  Works like  the  executable  starts  with
+       -Z          Restricted  mode.   Works  like  the executable starts with
                    "r".
 
-       --          Denotes  the end of the options.  Arguments after this will
-                   be handled as a file name.  This can  be  used  to  edit  a
+       --          Denotes the end of the options.  Arguments after this  will
+                   be  handled  as  a  file  name.  This can be used to edit a
                    filename that starts with a '-'.
 
        --echo-wid  GTK GUI only: Echo the Window ID on stdout.
 
        --help      Give a help message and exit, just like "-h".
 
-       --literal   Take  file  name  arguments  literally, do not expand wild-
-                   cards.  This has no effect on Unix where the shell  expands
+       --literal   Take file name arguments literally,  do  not  expand  wild-
+                   cards.   This has no effect on Unix where the shell expands
                    wildcards.
 
        --noplugin  Skip loading plugins.  Implied by -u NONE.
@@ -312,18 +315,18 @@ OPTIONS
                    is given and the files are edited in the current Vim.
 
        --remote-expr {expr}
-                   Connect  to  a  Vim server, evaluate {expr} in it and print
+                   Connect to a Vim server, evaluate {expr} in  it  and  print
                    the result on stdout.
 
        --remote-send {keys}
                    Connect to a Vim server and send {keys} to it.
 
        --remote-silent
-                   As --remote, but without the  warning  when  no  server  is
+                   As  --remote,  but  without  the  warning when no server is
                    found.
 
        --remote-wait
-                   As  --remote,  but  Vim  does not exit until the files have
+                   As --remote, but Vim does not exit  until  the  files  have
                    been edited.
 
        --remote-wait-silent
@@ -334,31 +337,31 @@ OPTIONS
                    List the names of all Vim servers that can be found.
 
        --servername {name}
-                   Use  {name}  as the server name.  Used for the current Vim,
+                   Use {name} as the server name.  Used for the  current  Vim,
                    unless used with a --remote argument, then it's the name of
                    the server to connect to.
 
        --socketid {id}
-                   GTK  GUI  only:  Use  the  GtkPlug mechanism to run gvim in
+                   GTK GUI only: Use the GtkPlug  mechanism  to  run  gvim  in
                    another window.
 
        --version   Print version information and exit.
 
 ON-LINE HELP
-       Type ":help" in Vim to get started.  Type ":help subject" to  get  help
-       on  a  specific  subject.   For example: ":help ZZ" to get help for the
-       "ZZ" command.  Use <Tab> and CTRL-D to complete subjects  (":help  cmd-
-       line-completion").   Tags are present to jump from one place to another
+       Type  ":help"  in Vim to get started.  Type ":help subject" to get help
+       on a specific subject.  For example: ":help ZZ" to  get  help  for  the
+       "ZZ"  command.   Use <Tab> and CTRL-D to complete subjects (":help cmd-
+       line-completion").  Tags are present to jump from one place to  another
        (sort of hypertext links, see ":help").  All documentation files can be
        viewed in this way, for example ":help syntax.txt".
 
 FILES
        /usr/local/lib/vim/doc/*.txt
-                      The  Vim documentation files.  Use ":help doc-file-list"
+                      The Vim documentation files.  Use ":help  doc-file-list"
                       to get the complete list.
 
        /usr/local/lib/vim/doc/tags
-                      The tags file used for finding information in the  docu-
+                      The  tags file used for finding information in the docu-
                       mentation files.
 
        /usr/local/lib/vim/syntax/syntax.vim
@@ -378,7 +381,7 @@ FILES
        ~/.gvimrc      Your personal gvim initializations.
 
        /usr/local/lib/vim/optwin.vim
-                      Script  used  for  the ":options" command, a nice way to
+                      Script used for the ":options" command, a  nice  way  to
                       view and set options.
 
        /usr/local/lib/vim/menu.vim
@@ -388,11 +391,11 @@ FILES
                       Script to generate a bug report.  See ":help bugs".
 
        /usr/local/lib/vim/filetype.vim
-                      Script to detect the type of a file by  its  name.   See
+                      Script  to  detect  the type of a file by its name.  See
                       ":help 'filetype'".
 
        /usr/local/lib/vim/scripts.vim
-                      Script  to  detect  the  type of a file by its contents.
+                      Script to detect the type of a  file  by  its  contents.
                       See ":help 'filetype'".
 
        /usr/local/lib/vim/*.ps
@@ -407,17 +410,17 @@ SEE ALSO
 AUTHOR
        Most of Vim was made by Bram Moolenaar, with a lot of help from others.
        See ":help credits" in Vim.
-       Vim  is  based  on Stevie, worked on by: Tim Thompson, Tony Andrews and
-       G.R. (Fred) Walter.  Although hardly any of the original code  remains.
+       Vim is based on Stevie, worked on by: Tim Thompson,  Tony  Andrews  and
+       G.R.  (Fred) Walter.  Although hardly any of the original code remains.
 
 BUGS
        Probably.  See ":help todo" for a list of known problems.
 
-       Note  that a number of things that may be regarded as bugs by some, are
-       in fact caused by a too-faithful reproduction of Vi's  behaviour.   And
-       if  you  think  other things are bugs "because Vi does it differently",
-       you should take a closer look at the vi_diff.txt file  (or  type  :help
-       vi_diff.txt  when  in  Vim).   Also have a look at the 'compatible' and
+       Note that a number of things that may be regarded as bugs by some,  are
+       in  fact  caused by a too-faithful reproduction of Vi's behaviour.  And
+       if you think other things are bugs "because Vi  does  it  differently",
+       you  should  take  a closer look at the vi_diff.txt file (or type :help
+       vi_diff.txt when in Vim).  Also have a look  at  the  'compatible'  and
        'cpoptions' options.
 
 
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index 35f0f71ea..05ff118e1 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -123,7 +123,7 @@ an 50.30.160 &Syntax.DE.Diff :cal SetSyn("diff")<CR>
 an 50.30.170 &Syntax.DE.Digital\ Command\ Lang :cal SetSyn("dcl")<CR>
 an 50.30.180 &Syntax.DE.Dircolors :cal SetSyn("dircolors")<CR>
 an 50.30.190 &Syntax.DE.Django\ template :cal SetSyn("django")<CR>
-an 50.30.200 &Syntax.DE.DNS/BIND\ zone :cal SetSyn("dns")<CR>
+an 50.30.200 &Syntax.DE.DNS/BIND\ zone :cal SetSyn("bindzone")<CR>
 an 50.30.210 &Syntax.DE.DocBook.auto-detect :cal SetSyn("docbk")<CR>
 an 50.30.220 &Syntax.DE.DocBook.SGML :cal SetSyn("docbksgml")<CR>
 an 50.30.230 &Syntax.DE.DocBook.XML :cal SetSyn("docbkxml")<CR>
diff --git a/src/Make_bc3.mak b/src/Make_bc3.mak
index 461763088..1aa82a351 100644
--- a/src/Make_bc3.mak
+++ b/src/Make_bc3.mak
@@ -168,7 +168,7 @@ vim.cfg: Make_bc3.mak
 -Iproto
 -I$(INCLUDEPATH)
 -L$(LIBPATH)
--DMSDOS$(SPAWND)
+-DMSDOS;FEAT_TINY$(SPAWND)
 | vim.cfg
 
 test:
diff --git a/src/Makefile b/src/Makefile
index 86291b647..027421431 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1708,7 +1708,7 @@ types.vim: $(TAGS_SRC) $(TAGS_INCL)
 #
 test check:
 	$(MAKE) -f Makefile $(VIMTARGET)
-	-@if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
+	-if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
 		cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \
 	fi
 	cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG)
-- 
2.50.1