source: patches/vim-7.2-branch_update-7.patch@ 7f5fee7

Filelist

@@ -285 +285 @@
                 src/proto/os_win32.pro \
                 src/proto/os_mswin.pro \
                 src/testdir/Make_dos.mak \
+                src/testdir/Make_ming.mak \
                 src/testdir/dos.vim \
                 src/uninstal.c \
                 src/vim.def \

runtime/doc/cmdline.txt

@@ -1 @@
-*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Jul 29
+*cmdline.txt*   For Vim version 7.2.  Last change: 2008 Sep 18
 
 
                   VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -157 +157 @@
                                 (doesn't work at the expression prompt; some
                                 things such as changing the buffer or current
                                 window are not allowed to avoid side effects)
+                                When the result is a |List| the items are used
+                                as lines.  They can have line breaks inside
+                                too.
+                                When the result is a Float it's automatically
+                                converted to a String.
                 See |registers| about registers.  {not in Vi}
                 Implementation detail: When using the |expression| register
                 and invoking setcmdpos(), this sets the position before
@@ -730 +735 @@
 In Ex commands, at places where a file name can be used, the following
 characters have a special meaning.  These can also be used in the expression
 function expand() |expand()|.
-        %       is replaced with the current file name                  *:_%*
-        #       is replaced with the alternate file name                *:_#*
+        %       Is replaced with the current file name.           *:_%* *c_%*
+        #       Is replaced with the alternate file name.         *:_#* *c_#*
         #n      (where n is a number) is replaced with the file name of
-                buffer n.  "#0" is the same as "#"
-        ##      is replaced with all names in the argument list         *:_##*
+                buffer n.  "#0" is the same as "#".
+        ##      Is replaced with all names in the argument list   *:_##* *c_##*
                 concatenated, separated by spaces.  Each space in a name
                 is preceded with a backslash.
-Note that these give the file name as it was typed.  If an absolute path is
-needed (when using the file name from a different directory), you need to add
-":p".  See |filename-modifiers|.
+        #<n     (where n is a number > 0) is replaced with old    *:_#<* *c_#<*
+                file name n.  See |:oldfiles| or |v:oldfiles| to get the
+                number.                                                 *E809*
+                {only when compiled with the +eval and +viminfo features}
+
+Note that these, except "#<n", give the file name as it was typed.  If an
+absolute path is needed (when using the file name from a different directory),
+you need to add ":p".  See |filename-modifiers|.
+
+The "#<n" item returns an absolute path, but it will start with "~/" for files
+below your home directory.
+
 Note that backslashes are inserted before spaces, so that the command will
 correctly interpret the file name.  But this doesn't happen for shell
-commands.  For those you probably have to use quotes: >
+commands.  For those you probably have to use quotes (this fails for files
+that contain a quote and wildcards): >
         :!ls "%"
         :r !spell "%"
 

runtime/doc/eval.txt

@@ -1 @@
-*eval.txt*      For Vim version 7.2.  Last change: 2008 Aug 09
+*eval.txt*      For Vim version 7.2.  Last change: 2008 Nov 27
 
 
                   VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1484 +1484 @@
                 This is the screen column number, like with |virtcol()|.  The
                 value is zero when there was no mouse button click.
 
+                                        *v:oldfiles* *oldfiles-variable*
+v:oldfiles      List of file names that is loaded from the |viminfo| file on
+                startup.  These are the files that Vim remembers marks for.
+                The length of the List is limited by the ' argument of the
+                'viminfo' option (default is 100).
+                Also see |:oldfiles| and |c_#<|.
+                The List can be modified, but this has no effect on what is
+                stored in the |viminfo| file later.  If you use values other
+                than String this will cause trouble.
+                {only when compiled with the +viminfo feature}
+
                                         *v:operator* *operator-variable*
 v:operator      The last operator given in Normal mode.  This is a single
                 character except for commands starting with <g> or <z>,
@@ -1695 +1706 @@
 exists( {expr})                 Number  TRUE if {expr} exists
 extend({expr1}, {expr2} [, {expr3}])
                                 List/Dict insert items of {expr2} into {expr1}
-expand( {expr})                 String  expand special keywords in {expr}
+expand( {expr} [, {flag}])      String  expand special keywords in {expr}
 feedkeys( {string} [, {mode}])  Number  add key sequence to typeahead buffer
 filereadable( {file})           Number  TRUE if {file} is a readable file
 filewritable( {file})           Number  TRUE if {file} is a writable file
@@ -1747 +1758 @@
 getwinposx()                    Number  X coord in pixels of GUI Vim window
 getwinposy()                    Number  Y coord in pixels of GUI Vim window
 getwinvar( {nr}, {varname})     any     variable {varname} in window {nr}
-glob( {expr})                   String  expand file wildcards in {expr}
-globpath( {path}, {expr})       String  do glob({expr}) for all dirs in {path}
+glob( {expr} [, {flag}])        String  expand file wildcards in {expr}
+globpath( {path}, {expr} [, {flag}])
+                                String  do glob({expr}) for all dirs in {path}
 has( {feature})                 Number  TRUE if feature {feature} supported
 has_key( {dict}, {key})         Number  TRUE if {dict} has entry {key}
 haslocaldir()                   Number  TRUE if current window executed |:lcd|
@@ -3275 +3287 @@
                         :let list_is_on = getwinvar(2, '&list')
                         :echo "myvar = " . getwinvar(1, 'myvar')
 <
-                                                        *glob()*
-glob({expr})    Expand the file wildcards in {expr}.  See |wildcards| for the
+glob({expr} [, {flag}])                                 *glob()*
+                Expand the file wildcards in {expr}.  See |wildcards| for the
                 use of special characters.
                 The result is a String.
                 When there are several matches, they are separated by <NL>
                 characters.
-                The 'wildignore' option applies: Names matching one of the
-                patterns in 'wildignore' will be skipped.
+                Unless the optional {flag} argument is given and is non-zero,
+                the 'suffixes' and 'wildignore' options apply: Names matching
+                one of the patterns in 'wildignore' will be skipped and
+                'suffixes' affect the ordering of matches.
                 If the expansion fails, the result is an empty string.
                 A name for a non-existing file is not included.
 
@@ -3296 +3310 @@
                 See |expand()| for expanding special Vim variables.  See
                 |system()| for getting the raw output of an external command.
 
-globpath({path}, {expr})                                *globpath()*
+globpath({path}, {expr} [, {flag}])                     *globpath()*
                 Perform glob() on all directories in {path} and concatenate
                 the results.  Example: >
                         :echo globpath(&rtp, "syntax/c.vim")
 <               {path} is a comma-separated list of directory names.  Each
                 directory name is prepended to {expr} and expanded like with
-                glob().  A path separator is inserted when needed.
+                |glob()|.  A path separator is inserted when needed.
                 To add a comma inside a directory name escape it with a
                 backslash.  Note that on MS-Windows a directory may have a
                 trailing backslash, remove it if you put a comma after it.
                 If the expansion fails for one of the directories, there is no
                 error message.
-                The 'wildignore' option applies: Names matching one of the
-                patterns in 'wildignore' will be skipped.
+                Unless the optional {flag} argument is given and is non-zero,
+                the 'suffixes' and 'wildignore' options apply: Names matching
+                one of the patterns in 'wildignore' will be skipped and
+                'suffixes' affect the ordering of matches.
 
                 The "**" item can be used to search in a directory tree.
                 For example, to find all "README.txt" files in the directories
@@ -5332 +5348 @@
                 "fg"            foreground color (GUI: color name used to set
                                 the color, cterm: color number as a string,
                                 term: empty string)
-                "bg"            background color (like "fg")
+                "bg"            background color (as with "fg")
+                "sp"            special color (as with "fg") |highlight-guisp|
                 "fg#"           like "fg", but for the GUI and the GUI is
                                 running the name in "#RRGGBB" form
                 "bg#"           like "fg#" for "bg"
+                "sp#"           like "fg#" for "sp"
                 "bold"          "1" if bold
                 "italic"        "1" if italic
                 "reverse"       "1" if reverse
@@ -5823 +5841 @@
 mouse_pterm             Compiled with support for qnx pterm mouse.
 mouse_sysmouse          Compiled with support for sysmouse (*BSD console mouse)
 mouse_xterm             Compiled with support for xterm mouse.
-multi_byte              Compiled with support for editing Korean et al.
+multi_byte              Compiled with support for 'encoding'
+multi_byte_encoding     'encoding' is set to a multi-byte encoding.
 multi_byte_ime          Compiled with support for IME input method.
 multi_lang              Compiled with support for multiple languages.
 mzscheme                Compiled with MzScheme interface |mzscheme|.

runtime/doc/netbeans.txt

@@ -1 @@
-*netbeans.txt*  For Vim version 7.2.  Last change: 2008 Jun 28
+*netbeans.txt*  For Vim version 7.2.  Last change: 2009 Jan 06
 
 
                   VIM REFERENCE MANUAL    by Gordon Prieur et al.
@@ -722 +722 @@
                 of the cursor.
                 New in version 2.1.
 
-killed          A file was closed by the user.  Only for files that have been
-                assigned a number by the IDE.
+killed          A file was deleted or wiped out by the user and the buffer
+                annotations have been removed.  The bufID number for this
+                buffer has become invalid.  Only for files that have been
+                assigned a bufID number by the IDE.
 
 newDotAndMark off off
                 Reports the position of the cursor being at "off" bytes into

runtime/doc/options.txt

@@ -1 @@
-*options.txt*   For Vim version 7.2.  Last change: 2008 Aug 06
+*options.txt*   For Vim version 7.2.  Last change: 2008 Nov 25
 
 
                   VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -7472 +7472 @@
                         {not available when compiled without the |+wildignore|
                         feature}
         A list of file patterns.  A file that matches with one of these
-        patterns is ignored when completing file or directory names.
+        patterns is ignored when completing file or directory names, and
+        influences the result of |expand()|, |glob()| and |globpath()| unless
+        a flag is passed to disable this.
         The pattern is used like with |:autocmd|, see |autocmd-patterns|.
         Also see 'suffixes'.
         Example: >

runtime/doc/spell.txt

@@ -1 @@
-*spell.txt*     For Vim version 7.2.  Last change: 2008 Jun 21
+*spell.txt*     For Vim version 7.2.  Last change: 2008 Nov 30
 
 
                   VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -831 +831 @@
 
         # comment line ~
 
-With some items it's also possible to put a comment after it, but this isn't
-supported in general.
+Items with a fixed number of arguments can be followed by a comment.  But only
+if none of the arguments can contain white space.  The comment must start with
+a "#" character.  Example:
+
+        KEEPCASE =  # fix case for words with this flag ~
 
 
 ENCODING                                                        *spell-SET*
@@ -965 +968 @@
 
 Note: When using utf-8 only characters up to 65000 may be used for flags.
 
+Note: even when using "num" or "long" the number of flags available to
+compounding and prefixes is limited to about 250.
+
 
 AFFIXES
                                             *spell-PFX* *spell-SFX*
@@ -1178 +1184 @@
 The flag also applies to the word with affixes, thus this can be used to mark
 a whole bunch of related words as bad.
 
+                                                        *spell-FORBIDDENWORD*
+FORBIDDENWORD can be used just like BAD.  For compatibility with Hunspell.
+
                                                         *spell-NEEDAFFIX*
 The NEEDAFFIX flag is used to require that a word is used with an affix.  The
 word itself is not a good word (unless there is an empty affix).  Example:
@@ -1268 +1277 @@
 
         NEEDCOMPOUND & ~
 
+                                                        *spell-ONLYINCOMPOUND*
+The ONLYINCOMPOUND does exactly the same as NEEDCOMPOUND.  Supported for
+compatiblity with Hunspell.
+
                                                         *spell-COMPOUNDMIN*
 The minimal character length of a word used for compounding is specified with
 COMPOUNDMIN.  Example:
@@ -1328 +1341 @@
 rules.  Can also be used for an affix to count the affix as a compounding
 word.
 
+                                                *spell-CHECKCOMPOUNDPATTERN*
+CHECKCOMPOUNDPATTERN is used to define patterns that, when matching at the
+position where two words are compounded together forbids the compound.
+For example:
+        CHECKCOMPOUNDPATTERN o e ~
+
+This forbids compounding if the first word ends in "o" and the second word
+starts with "e".
+
+The arguments must be plain text, no patterns are actually supported, despite
+the item name.  Case is always ignored.
+
+The Hunspell feature to use three arguments and flags is not supported.
+
                                                         *spell-SYLLABLE*
 The SYLLABLE item defines characters or character sequences that are used to
 count the number of syllables in a word.  Example:
@@ -1496 +1523 @@
 ACCENT          (Hunspell)                              *spell-ACCENT*
                 Use MAP instead. |spell-MAP|
 
+BREAK           (Hunspell)                              *spell-BREAK*
+                Define break points.  Unclear how it works exactly.
+                Not supported.
+
 CHECKCOMPOUNDCASE  (Hunspell)                   *spell-CHECKCOMPOUNDCASE*
                 Disallow uppercase letters at compound word boundaries.
                 Not supported.
@@ -1512 +1543 @@
                 Forbid three identical characters when compounding.  Not
                 supported.
 
-CHECKCOMPOUNDPATTERN  (Hunspell)                *spell-CHECKCOMPOUNDPATTERN*
-                Forbid compounding when patterns match.  Not supported.
-
 COMPLEXPREFIXES  (Hunspell)                             *spell-COMPLEXPREFIXES*
                 Enables using two prefixes.  Not supported.
 
@@ -1536 +1564 @@
 COMPOUNDMIDDLE  (Hunspell)                              *spell-COMPOUNDMIDDLE*
                 Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
 
+COMPOUNDRULES   (Hunspell)                              *spell-COMPOUNDRULES*
+                Number of COMPOUNDRULE lines following.  Ignored, but the
+                argument must be a number.
+
 COMPOUNDSYLLABLE  (Hunspell)                    *spell-COMPOUNDSYLLABLE*
                 Use SYLLABLE and COMPOUNDSYLMAX instead. |spell-SYLLABLE|
                 |spell-COMPOUNDSYLMAX|
 
-FORBIDDENWORD   (Hunspell)                              *spell-FORBIDDENWORD*
-                Use BAD instead. |spell-BAD|
-
+KEY             (Hunspell)                              *spell-KEY*
+                Define characters that are close together on the keyboard.
+                Used to give better suggestions.  Not supported.
+                
 LANG            (Hunspell)                              *spell-LANG*
                 This specifies language-specific behavior.  This actually
                 moves part of the language knowledge into the program,
@@ -1553 +1586 @@
                 Only needed for morphological analysis.
 
 MAXNGRAMSUGS    (Hunspell)                              *spell-MAXNGRAMSUGS*
-                Not supported.
-
-ONLYINCOMPOUND  (Hunspell)                              *spell-ONLYINCOMPOUND*
-                Use NEEDCOMPOUND instead. |spell-NEEDCOMPOUND|
+                Set number of n-gram suggestions.  Not supported.
 
 PSEUDOROOT      (Hunspell)                              *spell-PSEUDOROOT*
                 Use NEEDAFFIX instead. |spell-NEEDAFFIX|

runtime/doc/starting.txt

@@ -1 @@
-*starting.txt*  For Vim version 7.2.  Last change: 2008 Jun 21
+*starting.txt*  For Vim version 7.2.  Last change: 2008 Nov 09
 
 
                   VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1337 +1337 @@
                                                         *viminfo-read*
 When Vim is started and the 'viminfo' option is non-empty, the contents of
 the viminfo file are read and the info can be used in the appropriate places.
-The marks are not read in at startup (but file marks are).  See
-|initialization| for how to set the 'viminfo' option upon startup.
+The |v:oldfiles| variable is filled.  The marks are not read in at startup
+(but file marks are).  See |initialization| for how to set the 'viminfo'
+option upon startup.
 
                                                         *viminfo-write*
 When Vim exits and 'viminfo' is non-empty, the info is stored in the viminfo
@@ -1372 +1373 @@
 that start with any string given with the "r" flag in 'viminfo'.  This can be
 used to avoid saving marks for files on removable media (for MS-DOS you would
 use "ra:,rb:", for Amiga "rdf0:,rdf1:,rdf2:").
+The |v:oldfiles| variable is filled with the file names that the viminfo file
+has marks for.
 
                                                         *viminfo-file-marks*
 Uppercase marks ('A to 'Z) are stored when writing the viminfo file.  The
@@ -1463 +1466 @@
                                                    *:rv* *:rviminfo* *E195*
 :rv[iminfo][!] [file]   Read from viminfo file [file] (default: see above).
                         If [!] is given, then any information that is
-                        already set (registers, marks, etc.) will be
-                        overwritten.  {not in Vi}
+                        already set (registers, marks, |v:oldfiles|, etc.)
+                        will be overwritten   {not in Vi}
 
                                         *:wv* *:wviminfo* *E137* *E138* *E574*
 :wv[iminfo][!] [file]   Write to viminfo file [file] (default: see above).
@@ -1479 +1482 @@
                         the .viminfo file.
                         {not in Vi}
 
+                                                *:ol* *:oldfiles*
+:ol[dfiles]             List the files that have marks stored in the viminfo
+                        file.  This list is read on startup and only changes
+                        afterwards with ":rviminfo!".  Also see |v:oldfiles|.
+                        The number can be used with |c_#<|.
+                        {not in Vi, only when compiled with the +eval feature}
+
+:bro[wse] ol[dfiles][!]
+                        List file names as with |:oldfiles|, and then prompt
+                        for a number.  When the number is valid that file from
+                        the list is edited.
+                        If you get the |press-enter| prompt you can press "q"
+                        and still get the prompt to enter a file number.
+                        Use ! to abondon a modified buffer. |abandon|
+                        {not when compiled with tiny or small features}
+
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/usr_21.txt

@@ -1 @@
-*usr_21.txt*    For Vim version 7.2.  Last change: 2007 May 01
+*usr_21.txt*    For Vim version 7.2.  Last change: 2008 Nov 09
 
                      VIM USER MANUAL - by Bram Moolenaar
 
@@ -153 +153 @@
 to be lost.  Each item can be remembered only once.
 
 
-GETTING BACK TO WHERE YOU WERE
+GETTING BACK TO WHERE YOU STOPPED VIM
 
 You are halfway editing a file and it's time to leave for holidays.  You exit
 Vim and go enjoy yourselves, forgetting all about your work.  After a couple
@@ -168 +168 @@
    The |:marks| command is useful to find out where '0 to '9 will take you.
 
 
+GETTING BACK TO SOME FILE
+
+If you want to go back to a file that you edited recently, but not when
+exiting Vim, there is a slightly more complicated way.  You can see a list of
+files by typing the command: >
+
+        :oldfiles
+<       1: ~/.viminfo ~
+        2: ~/text/resume.txt ~
+        3: /tmp/draft ~
+
+Now you would like to edit the second file, which is in the list preceded by
+"2:".  You type: >
+
+        :e #<2
+
+Instead of ":e" you can use any command that has a file name argument, the
+"#<2" item works in the same place as "%" (current file name) and "#"
+(alternate file name).  So you can also split the window to edit the third
+file: >
+
+        :split #<3
+
+That #<123 thing is a bit complicated when you just want to edit a file.
+Fortunately there is a simpler way: >
+
+        :browse oldfiles
+<       1: ~/.viminfo ~
+        2: ~/text/resume.txt ~
+        3: /tmp/draft ~
+        -- More --
+
+You get the same list of files as with |:oldfiles|.  If you want to edit
+"resume.txt" first press "q" to stop the listing.  You will get a prompt:
+
+        Type number and <Enter> (empty cancels): ~
+
+Type "2" and press <Enter> to edit the second file.
+
+More info at |:oldfiles|, |v:oldfiles| and |c_#<|.
+
+
 MOVE INFO FROM ONE VIM TO ANOTHER
 
 You can use the ":wviminfo" and ":rviminfo" commands to save and restore the

runtime/scripts.vim

@@ -234 +234 @@
   elseif s:line1 =~ '\<DTD\s\+XHTML\s'
     set ft=xhtml
 
+    " HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
+  elseif s:line1 =~? '\<DOCTYPE\s\+html\>'
+    set ft=html
+
     " PDF
   elseif s:line1 =~ '^%PDF-'
     set ft=pdf

src/auto/configure

@@ -16819 +16819 @@
   LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
-$as_echo_n "checking for GCC 3 or later... " >&6; }
 DEPEND_CFLAGS_FILTER=
 if test "$GCC" = yes; then
+  { $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
+$as_echo_n "checking for GCC 3 or later... " >&6; }
   gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
   if test "$gccmajor" -gt "2"; then
     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
-  fi
-fi
-if test "$DEPEND_CFLAGS_FILTER" = ""; then
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+  else
+    { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  fi
+      { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
+$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
+  if test "$gccmajor" -gt "3"; then
+    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
+  else
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  fi
 fi
 
 

src/buffer.c

@@ -437 +437 @@
         return;
 #endif
 
-#ifdef FEAT_NETBEANS_INTG
-    if (usingNetbeans)
-        netbeans_file_closed(buf);
-#endif
     /* Change directories when the 'acd' option is set. */
     DO_AUTOCHDIR
 
@@ -639 +635 @@
 #ifdef FEAT_SIGNS
     buf_delete_signs(buf);              /* delete any signs */
 #endif
+#ifdef FEAT_NETBEANS_INTG
+    if (usingNetbeans)
+        netbeans_file_killed(buf);
+#endif
 #ifdef FEAT_LOCALMAP
     map_clear_int(buf, MAP_ALL_MODES, TRUE, FALSE);  /* clear local mappings */
     map_clear_int(buf, MAP_ALL_MODES, TRUE, TRUE);   /* clear local abbrevs */
@@ -647 +647 @@
     vim_free(buf->b_start_fenc);
     buf->b_start_fenc = NULL;
 #endif
+#ifdef FEAT_SPELL
+    ga_clear(&buf->b_langp);
+#endif
 }
 
 /*
@@ -812 +815 @@
     int         bnr;            /* buffer number */
     char_u      *p;
 
-#ifdef FEAT_NETBEANS_INTG
-    netbeansCloseFile = 1;
-#endif
     if (addr_count == 0)
     {
         (void)do_buffer(command, DOBUF_CURRENT, FORWARD, 0, forceit);
@@ -909 +909 @@
         }
     }
 
-#ifdef FEAT_NETBEANS_INTG
-    netbeansCloseFile = 0;
-#endif
 
     return errormsg;
 }
@@ -1237 +1234 @@
          * "buf" if one exists */
         if ((swb_flags & SWB_USEOPEN) && buf_jump_open_win(buf))
             return OK;
-        /* If 'switchbuf' contians "usetab": jump to first window in any tab
+        /* If 'switchbuf' contains "usetab": jump to first window in any tab
          * page containing "buf" if one exists */
         if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf))
             return OK;
@@ -1351 +1348 @@
         }
     }
 #ifdef FEAT_AUTOCMD
+    /* An autocommand may have deleted "buf", already entered it (e.g., when
+     * it did ":bunload") or aborted the script processing! */
 # ifdef FEAT_EVAL
-    /* An autocommand may have deleted buf or aborted the script processing! */
-    if (buf_valid(buf) && !aborting())
+    if (buf_valid(buf) && buf != curbuf && !aborting())
 # else
-    if (buf_valid(buf))     /* an autocommand may have deleted buf! */
+    if (buf_valid(buf) && buf != curbuf)
 # endif
 #endif
         enter_buffer(buf);
@@ -1397 +1395 @@
     curwin->w_cursor.coladd = 0;
 #endif
     curwin->w_set_curswant = TRUE;
+#ifdef FEAT_AUTOCMD
+    curwin->w_topline_was_set = FALSE;
+#endif
 
     /* Make sure the buffer is loaded. */
     if (curbuf->b_ml.ml_mfp == NULL)    /* need to load the file */
@@ -1436 +1437 @@
     maketitle();
 #endif
 #ifdef FEAT_AUTOCMD
-    if (curwin->w_topline == 1)         /* when autocmds didn't change it */
+        /* when autocmds didn't change it */
+    if (curwin->w_topline == 1 && !curwin->w_topline_was_set)
 #endif
         scroll_cursor_halfway(FALSE);   /* redisplay at correct position */
 
@@ -3963 +3965 @@
     width = vim_strsize(out);
     if (maxwidth > 0 && width > maxwidth)
     {
-        /* Result is too long, must trunctate somewhere. */
+        /* Result is too long, must truncate somewhere. */
         l = 0;
         if (itemcnt == 0)
             s = out;
@@ -5062 +5064 @@
     {
         if (buf->b_sfname != NULL)
             return (char *)buf->b_sfname;
-        return "[Scratch]";
+        return _("[Scratch]");
     }
 #endif
     if (buf->b_fname == NULL)

src/configure.in

@@ -3152 +3152 @@
 dnl But only when making dependencies, cproto and lint don't take "-isystem".
 dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow
 dnl the number before the version number.
-AC_MSG_CHECKING(for GCC 3 or later)
 DEPEND_CFLAGS_FILTER=
 if test "$GCC" = yes; then
+  AC_MSG_CHECKING(for GCC 3 or later)
   gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
   if test "$gccmajor" -gt "2"; then
     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
+    AC_MSG_RESULT(yes)
+  else
+    AC_MSG_RESULT(no)
+  fi
+  dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is
+  dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
+  AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
+  if test "$gccmajor" -gt "3"; then
+    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
+    AC_MSG_RESULT(yes)
+  else
+    AC_MSG_RESULT(no)
   fi
-fi
-if test "$DEPEND_CFLAGS_FILTER" = ""; then
-  AC_MSG_RESULT(no)
-else
-  AC_MSG_RESULT(yes)
 fi
 AC_SUBST(DEPEND_CFLAGS_FILTER)
 

src/diff.c

@@ -8 +8 @@
  */
 
 /*
- * diff.c: code for diff'ing two or three buffers.
+ * diff.c: code for diff'ing two, three or four buffers.
  */
 
 #include "vim.h"
@@ -73 +73 @@
         {
             tp->tp_diffbuf[i] = NULL;
             tp->tp_diff_invalid = TRUE;
+            if (tp == curtab)
+                diff_redraw(TRUE);
         }
     }
 }
@@ -102 +104 @@
             {
                 curtab->tp_diffbuf[i] = NULL;
                 curtab->tp_diff_invalid = TRUE;
+                diff_redraw(TRUE);
             }
         }
     }
@@ -113 +116 @@
  * Add a buffer to make diffs for.
  * Call this when a new buffer is being edited in the current window where
  * 'diff' is set.
- * Marks the current buffer as being part of the diff and requireing updating.
+ * Marks the current buffer as being part of the diff and requiring updating.
  * This must be done before any autocmd, because a command may use info
  * about the screen contents.
  */
@@ -131 +134 @@
         {
             curtab->tp_diffbuf[i] = buf;
             curtab->tp_diff_invalid = TRUE;
+            diff_redraw(TRUE);
             return;
         }
 
@@ -661 +665 @@
     char_u      *tmp_diff;
     FILE        *fd;
     int         ok;
+    int         io_error = FALSE;
 
     /* Delete all diffblocks. */
     diff_clear(curtab);
@@ -697 +702 @@
     {
         ok = FALSE;
         fd = mch_fopen((char *)tmp_orig, "w");
-        if (fd != NULL)
+        if (fd == NULL)
+            io_error = TRUE;
+        else
         {
-            fwrite("line1\n", (size_t)6, (size_t)1, fd);
+            if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
+                io_error = TRUE;
             fclose(fd);
             fd = mch_fopen((char *)tmp_new, "w");
-            if (fd != NULL)
+            if (fd == NULL)
+                io_error = TRUE;
+            else
             {
-                fwrite("line2\n", (size_t)6, (size_t)1, fd);
+                if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
+                    io_error = TRUE;
                 fclose(fd);
                 diff_file(tmp_orig, tmp_new, tmp_diff);
                 fd = mch_fopen((char *)tmp_diff, "r");
-                if (fd != NULL)
+                if (fd == NULL)
+                    io_error = TRUE;
+                else
                 {
                     char_u      linebuf[LBUFLEN];
 
@@ -761 +774 @@
     }
     if (!ok)
     {
+        if (io_error)
+            EMSG(_("E810: Cannot read or write temp files"));
         EMSG(_("E97: Cannot create diffs"));
         diff_a_works = MAYBE;
 #if defined(MSWIN) || defined(MSDOS)
@@ -914 +929 @@
         goto theend;
 
 #ifdef UNIX
-    /* Temporaraly chdir to /tmp, to avoid patching files in the current
+    /* Temporarily chdir to /tmp, to avoid patching files in the current
      * directory when the patch file contains more than one patch.  When we
      * have our own temp dir use that instead, it will be cleaned up when we
      * exit (any .rej files created).  Don't change directory if we can't
@@ -925 +940 @@
     {
 # ifdef TEMPDIRNAMES
         if (vim_tempdir != NULL)
-            mch_chdir((char *)vim_tempdir);
+            ignored = mch_chdir((char *)vim_tempdir);
         else
 # endif
-            mch_chdir("/tmp");
+            ignored = mch_chdir("/tmp");
         shorten_fnames(TRUE);
     }
 #endif
@@ -2114 +2129 @@
             EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg);
             return;
         }
+        if (buf == curbuf)
+            return;             /* nothing to do */
         idx_other = diff_buf_idx(buf);
         if (idx_other == DB_COUNT)
         {

src/edit.c

@@ -147 +147 @@
 static int  ins_compl_bs __ARGS((void));
 static void ins_compl_new_leader __ARGS((void));
 static void ins_compl_addleader __ARGS((int c));
+static int ins_compl_len __ARGS((void));
 static void ins_compl_restart __ARGS((void));
 static void ins_compl_set_original_text __ARGS((char_u *str));
 static void ins_compl_addfrommatch __ARGS((void));
@@ -197 +198 @@
 static void mb_replace_pop_ins __ARGS((int cc));
 #endif
 static void replace_flush __ARGS((void));
-static void replace_do_bs __ARGS((void));
+static void replace_do_bs __ARGS((int limit_col));
+static int del_char_after_col __ARGS((int limit_col));
 #ifdef FEAT_CINDENT
 static int cindent_on __ARGS((void));
 #endif
@@ -1933 +1935 @@
 /*
  * Backspace the cursor until the given column.  Handles REPLACE and VREPLACE
  * modes correctly.  May also be used when not in insert mode at all.
+ * Will attempt not to go before "col" even when there is a composing
+ * character.
  */
     void
 backspace_until_column(col)
@@ -1942 +1946 @@
     {
         curwin->w_cursor.col--;
         if (State & REPLACE_FLAG)
-            replace_do_bs();
-        else
-            (void)del_char(FALSE);
+            replace_do_bs(col);
+        else if (!del_char_after_col(col))
+            break;
     }
 }
 #endif
 
+/*
+ * Like del_char(), but make sure not to go before column "limit_col".
+ * Only matters when there are composing characters.
+ * Return TRUE when something was deleted.
+ */
+/*ARGSUSED*/
+   static int
+del_char_after_col(limit_col)
+    int limit_col;
+{
+#ifdef FEAT_MBYTE
+    if (enc_utf8 && limit_col >= 0)
+    {
+        int ecol = curwin->w_cursor.col + 1;
+
+        /* Make sure the cursor is at the start of a character, but
+         * skip forward again when going too far back because of a
+         * composing character. */
+        mb_adjust_cursor();
+        while (curwin->w_cursor.col < (colnr_T)limit_col)
+        {
+            int l = utf_ptr2len(ml_get_cursor());
+
+            if (l == 0)  /* end of line */
+                break;
+            curwin->w_cursor.col += l;
+        }
+        if (*ml_get_cursor() == NUL || curwin->w_cursor.col == ecol)
+            return FALSE;
+        del_bytes((long)(ecol - curwin->w_cursor.col), FALSE, TRUE);
+    }
+    else
+#endif
+        (void)del_char(FALSE);
+    return TRUE;
+}
+
 #if defined(FEAT_INS_EXPAND) || defined(PROTO)
 /*
  * CTRL-X pressed in Insert mode.
@@ -2418 +2459 @@
         {
             had_match = (curwin->w_cursor.col > compl_col);
             ins_compl_delete();
-            ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+            ins_bytes(compl_leader + ins_compl_len());
             ins_redraw(FALSE);
 
             /* When the match isn't there (to avoid matching itself) remove it
@@ -2470 +2511 @@
             *p = NUL;
             had_match = (curwin->w_cursor.col > compl_col);
             ins_compl_delete();
-            ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+            ins_bytes(compl_leader + ins_compl_len());
             ins_redraw(FALSE);
 
             /* When the match isn't there (to avoid matching itself) remove it
@@ -3209 +3250 @@
 {
     ins_compl_del_pum();
     ins_compl_delete();
-    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+    ins_bytes(compl_leader + ins_compl_len());
     compl_used_match = FALSE;
 
     if (compl_started)
@@ -3264 +3305 @@
 }
 
 /*
+ * Return the length of the completion, from the completion start column to
+ * the cursor column.  Making sure it never goes below zero.
+ */
+    static int
+ins_compl_len()
+{
+    int off = curwin->w_cursor.col - compl_col;
+
+    if (off < 0)
+        return 0;
+    return off;
+}
+
+/*
  * Append one character to the match leader.  May reduce the number of
  * matches.
  */
@@ -3621 +3676 @@
             {
                 ins_compl_delete();
                 if (compl_leader != NULL)
-                    ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+                    ins_bytes(compl_leader + ins_compl_len());
                 else if (compl_first_match != NULL)
-                    ins_bytes(compl_orig_text
-                                          + curwin->w_cursor.col - compl_col);
+                    ins_bytes(compl_orig_text + ins_compl_len());
                 retval = TRUE;
             }
 
@@ -4187 +4241 @@
         }
 
         /* check if compl_curr_match has changed, (e.g. other type of
-         * expansion added somenthing) */
+         * expansion added something) */
         if (type != 0 && compl_curr_match != old_match)
             found_new_match = OK;
 
@@ -4256 +4310 @@
     static void
 ins_compl_insert()
 {
-    ins_bytes(compl_shown_match->cp_str + curwin->w_cursor.col - compl_col);
+    ins_bytes(compl_shown_match->cp_str + ins_compl_len());
     if (compl_shown_match->cp_flags & ORIGINAL_TEXT)
         compl_used_match = FALSE;
     else
@@ -4425 +4479 @@
         if (!compl_get_longest || compl_used_match)
             ins_compl_insert();
         else
-            ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+            ins_bytes(compl_leader + ins_compl_len());
     }
     else
         compl_used_match = FALSE;
@@ -4688 +4742 @@
                 }
                 compl_length = curwin->w_cursor.col - (int)compl_col;
                 /* IObuff is used to add a "word from the next line" would we
-                 * have enough space?  just being paranoic */
+                 * have enough space?  just being paranoid */
 #define MIN_SPACE 75
                 if (compl_length > (IOSIZE - MIN_SPACE))
                 {
@@ -7123 +7177 @@
  * cc == 0: character was inserted, delete it
  * cc > 0: character was replaced, put cc (first byte of original char) back
  * and check for more characters to be put back
+ * When "limit_col" is >= 0, don't delete before this column.  Matters when
+ * using composing characters, use del_char_after_col() instead of del_char().
  */
     static void
-replace_do_bs()
+replace_do_bs(limit_col)
+    int         limit_col;
 {
     int         cc;
 #ifdef FEAT_VREPLACE
@@ -7153 +7210 @@
 #ifdef FEAT_MBYTE
         if (has_mbyte)
         {
-            del_char(FALSE);
+            (void)del_char_after_col(limit_col);
 # ifdef FEAT_VREPLACE
             if (State & VREPLACE_FLAG)
                 orig_len = (int)STRLEN(ml_get_cursor());
@@ -7203 +7260 @@
         changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col);
     }
     else if (cc == 0)
-        (void)del_char(FALSE);
+        (void)del_char_after_col(limit_col);
 }
 
 #ifdef FEAT_CINDENT
@@ -8150 +8207 @@
 /*
  * If the cursor is on an indent, ^T/^D insert/delete one
  * shiftwidth.  Otherwise ^T/^D behave like a "<<" or ">>".
- * Always round the indent to 'shiftwith', this is compatible
+ * Always round the indent to 'shiftwidth', this is compatible
  * with vi.  But vi only supports ^T and ^D after an
  * autoindent, we support it everywhere.
  */
@@ -8239 +8296 @@
          * Replace mode */
         if (curwin->w_cursor.lnum != Insstart.lnum
                 || curwin->w_cursor.col >= Insstart.col)
-            replace_do_bs();
+            replace_do_bs(-1);
     }
     else
         (void)del_char(FALSE);
@@ -8556 +8613 @@
                 break;
             }
             if (State & REPLACE_FLAG)
-                replace_do_bs();
+                replace_do_bs(-1);
             else
             {
 #ifdef FEAT_MBYTE

src/eval.c

@@ -32 +32 @@
 
 #define DICT_MAXNEST 100        /* maximum nesting of lists and dicts */
 
+#define DO_NOT_FREE_CNT 99999   /* refcount for dict or list that should not
+                                   be freed. */
+
 /*
  * In a hashtab item "hi_key" points to "di_key" in a dictitem.
  * This avoids adding a pointer to the hashtab item.
@@ -348 +351 @@
     {VV_NAME("mouse_col",        VAR_NUMBER), 0},
     {VV_NAME("operator",         VAR_STRING), VV_RO},
     {VV_NAME("searchforward",    VAR_NUMBER), 0},
+    {VV_NAME("oldfiles",         VAR_LIST), 0},
 };
 
 /* shorthand */
@@ -355 +359 @@
 #define vv_nr           vv_di.di_tv.vval.v_number
 #define vv_float        vv_di.di_tv.vval.v_float
 #define vv_str          vv_di.di_tv.vval.v_string
+#define vv_list         vv_di.di_tv.vval.v_list
 #define vv_tv           vv_di.di_tv
 
 /*
@@ -426 +431 @@
 static long list_idx_of_item __ARGS((list_T *l, listitem_T *item));
 static void list_append __ARGS((list_T *l, listitem_T *item));
 static int list_append_tv __ARGS((list_T *l, typval_T *tv));
-static int list_append_string __ARGS((list_T *l, char_u *str, int len));
 static int list_append_number __ARGS((list_T *l, varnumber_T n));
 static int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));
 static int list_extend __ARGS((list_T   *l1, list_T *l2, listitem_T *bef));
@@ -788 +792 @@
 static void func_unref __ARGS((char_u *name));
 static void func_ref __ARGS((char_u *name));
 static void call_user_func __ARGS((ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rettv, linenr_T firstline, linenr_T lastline, dict_T *selfdict));
+static int can_free_funccal __ARGS((funccall_T *fc, int copyID)) ;
+static void free_funccal __ARGS((funccall_T *fc, int free_val));
 static void add_nr_var __ARGS((dict_T *dp, dictitem_T *v, char *name, varnumber_T nr));
 static win_T *find_win_by_nr __ARGS((typval_T *vp, tabpage_T *tp));
 static void getwinvar __ARGS((typval_T *argvars, typval_T *rettv, int off));
@@ -845 +851 @@
         p = &vimvars[i];
         if (p->vv_di.di_tv.v_type == VAR_STRING)
         {
-            vim_free(p->vv_di.di_tv.vval.v_string);
-            p->vv_di.di_tv.vval.v_string = NULL;
+            vim_free(p->vv_str);
+            p->vv_str = NULL;
+        }
+        else if (p->vv_di.di_tv.v_type == VAR_LIST)
+        {
+            list_unref(p->vv_list);
+            p->vv_list = NULL;
         }
     }
     hash_clear(&vimvarht);
+    hash_init(&vimvarht);  /* garbage_collect() will access it */
     hash_clear(&compat_hashtab);
 
     /* script-local variables */
@@ -916 +928 @@
 /* pointer to funccal for currently active function */
 funccall_T *current_funccal = NULL;
 
+/* pointer to list of previously used funccal, still around because some
+ * item in it is still being used. */
+funccall_T *previous_funccal = NULL;
+
 /*
  * Return TRUE when a function was ended by a ":return" command.
  */
@@ -1256 +1272 @@
 
 /*
  * Top level evaluation function, returning a string.
+ * When "convert" is TRUE convert a List into a sequence of lines and convert
+ * a Float to a String.
  * Return pointer to allocated memory, or NULL for failure.
  */
     char_u *
-eval_to_string(arg, nextcmd, dolist)
+eval_to_string(arg, nextcmd, convert)
     char_u      *arg;
     char_u      **nextcmd;
-    int         dolist;         /* turn List into sequence of lines */
+    int         convert;
 {
     typval_T    tv;
     char_u      *retval;
     garray_T    ga;
+    char_u      numbuf[NUMBUFLEN];
 
     if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
         retval = NULL;
     else
     {
-        if (dolist && tv.v_type == VAR_LIST)
+        if (convert && tv.v_type == VAR_LIST)
         {
             ga_init2(&ga, (int)sizeof(char), 80);
             if (tv.vval.v_list != NULL)
@@ -1280 +1299 @@
             ga_append(&ga, NUL);
             retval = (char_u *)ga.ga_data;
         }
+#ifdef FEAT_FLOAT
+        else if (convert && tv.v_type == VAR_FLOAT)
+        {
+            vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv.vval.v_float);
+            retval = vim_strsave(numbuf);
+        }
+#endif
         else
             retval = vim_strsave(get_tv_string(&tv));
         clear_tv(&tv);
@@ -3277 +3303 @@
 
     if (*startarg != '(')
     {
-        EMSG2(_("E107: Missing braces: %s"), eap->arg);
+        EMSG2(_("E107: Missing parentheses: %s"), eap->arg);
         goto end;
     }
 
@@ -3657 +3683 @@
 }
 
 /*
- * Return TRUE if typeval "tv" is locked: Either tha value is locked itself or
- * it refers to a List or Dictionary that is locked.
+ * Return TRUE if typeval "tv" is locked: Either that value is locked itself
+ * or it refers to a List or Dictionary that is locked.
  */
     static int
 tv_islocked(tv)
@@ -3902 +3928 @@
 
 /*
  * Handle top level expression:
- *      expr1 ? expr0 : expr0
+ *      expr2 ? expr1 : expr1
  *
  * "arg" must point to the first non-white of the expression.
  * "arg" is advanced to the next non-white after the recognized expression.
@@ -6047 +6073 @@
 }
 
 /*
+ * Get list item "l[idx - 1]" as a string.  Returns NULL for failure.
+ */
+    char_u *
+list_find_str(l, idx)
+    list_T      *l;
+    long        idx;
+{
+    listitem_T  *li;
+
+    li = list_find(l, idx - 1);
+    if (li == NULL)
+    {
+        EMSGN(_(e_listidx), idx);
+        return NULL;
+    }
+    return get_tv_string(&li->li_tv);
+}
+
+/*
  * Locate "item" list "l" and return its index.
  * Returns -1 when "item" is not in the list.
  */
@@ -6137 +6182 @@
  * When "len" >= 0 use "str[len]".
  * Returns FAIL when out of memory.
  */
-    static int
+    int
 list_append_string(l, str, len)
     list_T      *l;
     char_u      *str;
@@ -6454 +6499 @@
     buf_T       *buf;
     win_T       *wp;
     int         i;
-    funccall_T  *fc;
+    funccall_T  *fc, **pfc;
     int         did_free = FALSE;
 #ifdef FEAT_WINDOWS
     tabpage_T   *tp;
@@ -6497 +6542 @@
         set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID);
     }
 
+    /* v: vars */
+    set_ref_in_ht(&vimvarht, copyID);
+
     /*
      * 2. Go through the list of dicts and free items without the copyID.
      */
@@ -6535 +6583 @@
         else
             ll = ll->lv_used_next;
 
+    /* check if any funccal can be freed now */
+    for (pfc = &previous_funccal; *pfc != NULL; )
+    {
+        if (can_free_funccal(*pfc, copyID))
+        {
+            fc = *pfc;
+            *pfc = fc->caller;
+            free_funccal(fc, TRUE);
+            did_free = TRUE;
+        }
+        else
+            pfc = &(*pfc)->caller;
+    }
+
     return did_free;
 }
 
@@ -6587 +6649 @@
     {
         case VAR_DICT:
             dd = tv->vval.v_dict;
-            if (dd->dv_copyID != copyID)
+            if (dd != NULL && dd->dv_copyID != copyID)
             {
                 /* Didn't see this dict yet. */
                 dd->dv_copyID = copyID;
@@ -6597 +6659 @@
 
         case VAR_LIST:
             ll = tv->vval.v_list;
-            if (ll->lv_copyID != copyID)
+            if (ll != NULL && ll->lv_copyID != copyID)
             {
                 /* Didn't see this list yet. */
                 ll->lv_copyID = copyID;
@@ -7525 +7587 @@
     {"getwinposx",      0, 0, f_getwinposx},
     {"getwinposy",      0, 0, f_getwinposy},
     {"getwinvar",       2, 2, f_getwinvar},
-    {"glob",            1, 1, f_glob},
-    {"globpath",        2, 2, f_globpath},
+    {"glob",            1, 2, f_glob},
+    {"globpath",        2, 3, f_globpath},
     {"has",             1, 1, f_has},
     {"has_key",         2, 2, f_has_key},
     {"haslocaldir",     0, 0, f_haslocaldir},
@@ -7856 +7918 @@
     else if (!aborting())
     {
         if (argcount == MAX_FUNC_ARGS)
-            emsg_funcname("E740: Too many arguments for function %s", name);
+            emsg_funcname(N_("E740: Too many arguments for function %s"), name);
         else
-            emsg_funcname("E116: Invalid arguments for function %s", name);
+            emsg_funcname(N_("E116: Invalid arguments for function %s"), name);
     }
 
     while (--argcount >= 0)
@@ -8091 +8153 @@
 
 /*
  * Give an error message with a function name.  Handle <SNR> things.
+ * "ermsg" is to be passed without translation, use N_() instead of _().
  */
     static void
 emsg_funcname(ermsg, name)
@@ -9518 +9581 @@
     else
     {
         /* When the optional second argument is non-zero, don't remove matches
-         * for 'suffixes' and 'wildignore' */
+         * for 'wildignore' and don't put matches for 'suffixes' at the end. */
         if (argvars[1].v_type != VAR_UNKNOWN
                                     && get_tv_number_chk(&argvars[1], &error))
             flags |= WILD_KEEP_ALL;
@@ -10300 +10363 @@
     s = get_tv_string(&argvars[0]);
     if (s == NULL || *s == NUL || VIM_ISDIGIT(*s))
         EMSG2(_(e_invarg2), s);
-    else if (!function_exists(s))
+    /* Don't check an autoload name for existence here. */
+    else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s))
         EMSG2(_("E700: Unknown function: %s"), s);
     else
     {
@@ -10602 +10666 @@
 # ifdef FEAT_WINDOWS
             win_T       *wp;
 # endif
-            int         n = 1;
+            int         winnr = 1;
 
             if (row >= 0 && col >= 0)
             {
@@ -10612 +10676 @@
                 (void)mouse_comp_pos(win, &row, &col, &lnum);
 # ifdef FEAT_WINDOWS
                 for (wp = firstwin; wp != win; wp = wp->w_next)
-                    ++n;
+                    ++winnr;
 # endif
-                vimvars[VV_MOUSE_WIN].vv_nr = n;
+                vimvars[VV_MOUSE_WIN].vv_nr = winnr;
                 vimvars[VV_MOUSE_LNUM].vv_nr = lnum;
                 vimvars[VV_MOUSE_COL].vv_nr = col + 1;
             }
@@ -11284 +11348 @@
     typval_T    *argvars;
     typval_T    *rettv;
 {
+    int         flags = WILD_SILENT|WILD_USE_NL;
     expand_T    xpc;
+    int         error = FALSE;
 
-    ExpandInit(&xpc);
-    xpc.xp_context = EXPAND_FILES;
+    /* When the optional second argument is non-zero, don't remove matches
+    * for 'wildignore' and don't put matches for 'suffixes' at the end. */
+    if (argvars[1].v_type != VAR_UNKNOWN
+                                && get_tv_number_chk(&argvars[1], &error))
+        flags |= WILD_KEEP_ALL;
     rettv->v_type = VAR_STRING;
-    rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
-                                     NULL, WILD_USE_NL|WILD_SILENT, WILD_ALL);
+    if (!error)
+    {
+        ExpandInit(&xpc);
+        xpc.xp_context = EXPAND_FILES;
+        rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
+                                                       NULL, flags, WILD_ALL);
+    }
+    else
+        rettv->vval.v_string = NULL;
 }
 
 /*
@@ -11301 +11377 @@
     typval_T    *argvars;
     typval_T    *rettv;
 {
+    int         flags = 0;
     char_u      buf1[NUMBUFLEN];
     char_u      *file = get_tv_string_buf_chk(&argvars[1], buf1);
+    int         error = FALSE;
 
+    /* When the optional second argument is non-zero, don't remove matches
+    * for 'wildignore' and don't put matches for 'suffixes' at the end. */
+    if (argvars[2].v_type != VAR_UNKNOWN
+                                && get_tv_number_chk(&argvars[2], &error))
+        flags |= WILD_KEEP_ALL;
     rettv->v_type = VAR_STRING;
-    if (file == NULL)
+    if (file == NULL || error)
         rettv->vval.v_string = NULL;
     else
-        rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file);
+        rettv->vval.v_string = globpath(get_tv_string(&argvars[0]), file,
+                                                                       flags);
 }
 
 /*
@@ -11782 +11866 @@
             n = has_patch(atoi((char *)name + 5));
         else if (STRICMP(name, "vim_starting") == 0)
             n = (starting != 0);
+#ifdef FEAT_MBYTE
+        else if (STRICMP(name, "multi_byte_encoding") == 0)
+            n = has_mbyte;
+#endif
 #if defined(FEAT_BEVAL) && defined(FEAT_GUI_W32)
         else if (STRICMP(name, "balloon_multiline") == 0)
             n = multiline_balloon_available();
@@ -15838 +15926 @@
     if (res == FAIL)
         res = ITEM_COMPARE_FAIL;
     else
-        /* return value has wrong type */
         res = get_tv_number_chk(&rettv, &item_compare_func_err);
     if (item_compare_func_err)
-        res = ITEM_COMPARE_FAIL;
+        res = ITEM_COMPARE_FAIL;  /* return value has wrong type */
     clear_tv(&rettv);
     return res;
 }
@@ -16590 +16677 @@
                 p = highlight_has_attr(id, HL_INVERSE, modec);
                 break;
 
-        case 's':                                       /* standout */
-                p = highlight_has_attr(id, HL_STANDOUT, modec);
+        case 's':
+                if (TOLOWER_ASC(what[1]) == 'p')        /* sp[#] */
+                    p = highlight_color(id, what, modec);
+                else                                    /* standout */
+                    p = highlight_has_attr(id, HL_STANDOUT, modec);
                 break;
 
         case 'u':
@@ -16658 +16748 @@
     col = get_tv_number(&argvars[1]) - 1;       /* -1 on type error */
 
     if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
-            && col >= 0 && col < (long)STRLEN(ml_get(lnum))
+            && col >= 0 && (col == 0 || col < (long)STRLEN(ml_get(lnum)))
             && rettv_list_alloc(rettv) != FAIL)
     {
         (void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
@@ -18097 +18187 @@
 }
 
 /*
- * Set v:count, v:count1 and v:prevcount.
+ * Get List v: variable value.  Caller must take care of reference count when
+ * needed.
+ */
+    list_T *
+get_vim_var_list(idx)
+    int         idx;
+{
+    return vimvars[idx].vv_list;
+}
+
+/*
+ * Set v:count to "count" and v:count1 to "count1".
+ * When "set_prevcount" is TRUE first set v:prevcount from v:count.
  */
     void
-set_vcount(count, count1)
+set_vcount(count, count1, set_prevcount)
     long        count;
     long        count1;
+    int         set_prevcount;
 {
-    vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr;
+    if (set_prevcount)
+        vimvars[VV_PREVCOUNT].vv_nr = vimvars[VV_COUNT].vv_nr;
     vimvars[VV_COUNT].vv_nr = count;
     vimvars[VV_COUNT1].vv_nr = count1;
 }
@@ -18132 +18236 @@
 }
 
 /*
+ * Set List v: variable to "val".
+ */
+    void
+set_vim_var_list(idx, val)
+    int         idx;
+    list_T      *val;
+{
+    list_unref(vimvars[idx].vv_list);
+    vimvars[idx].vv_list = val;
+    if (val != NULL)
+        ++val->lv_refcount;
+}
+
+/*
  * Set v:register if needed.
  */
     void
@@ -18868 +18986 @@
     dictitem_T  *dict_var;
 {
     hash_init(&dict->dv_hashtab);
-    dict->dv_refcount = 99999;
+    dict->dv_refcount = DO_NOT_FREE_CNT;
     dict_var->di_tv.vval.v_dict = dict;
     dict_var->di_tv.v_type = VAR_DICT;
     dict_var->di_tv.v_lock = VAR_FIXED;
@@ -19205 +19323 @@
  * Copy the values from typval_T "from" to typval_T "to".
  * When needed allocates string or increases reference count.
  * Does not make a copy of a list or dict but copies the reference!
+ * It is OK for "from" and "to" to point to the same item.  This is used to
+ * make a copy later.
  */
     static void
 copy_tv(from, to)
@@ -19748 +19868 @@
                 }
             }
             else
-                emsg_funcname("E123: Undefined function: %s", name);
+                emsg_funcname(N_("E123: Undefined function: %s"), name);
         }
         goto ret_free;
     }
@@ -19792 +19912 @@
                                                       : eval_isnamec(arg[j])))
                 ++j;
             if (arg[j] != NUL)
-                emsg_funcname(_(e_invarg2), arg);
+                emsg_funcname((char *)e_invarg2, arg);
         }
     }
 
@@ -20064 +20184 @@
         v = find_var(name, &ht);
         if (v != NULL && v->di_tv.v_type == VAR_FUNC)
         {
-            emsg_funcname("E707: Function name conflicts with variable: %s",
+            emsg_funcname(N_("E707: Function name conflicts with variable: %s"),
                                                                         name);
             goto erret;
         }
@@ -20079 +20199 @@
             }
             if (fp->uf_calls > 0)
             {
-                emsg_funcname("E127: Cannot redefine function %s: It is in use",
+                emsg_funcname(N_("E127: Cannot redefine function %s: It is in use"),
                                                                         name);
                 goto erret;
             }
@@ -20590 +20710 @@
     int         st_len = 0;
 
     todo = (int)func_hashtab.ht_used;
+    if (todo == 0)
+        return;     /* nothing to dump */
+
     sorttab = (ufunc_T **)alloc((unsigned)(sizeof(ufunc_T) * todo));
 
     for (hi = func_hashtab.ht_array; todo > 0; ++hi)
@@ -20638 +20761 @@
                                                               prof_self_cmp);
         prof_sort_list(fd, sorttab, st_len, "SELF", TRUE);
     }
+
+    vim_free(sorttab);
 }
 
     static void
@@ -21012 +21137 @@
     char_u      *save_sourcing_name;
     linenr_T    save_sourcing_lnum;
     scid_T      save_current_SID;
-    funccall_T  fc;
+    funccall_T  *fc;
     int         save_did_emsg;
     static int  depth = 0;
     dictitem_T  *v;
@@ -21038 +21163 @@
 
     line_breakcheck();          /* check for CTRL-C hit */
 
-    fc.caller = current_funccal;
-    current_funccal = &fc;
-    fc.func = fp;
-    fc.rettv = rettv;
+    fc = (funccall_T *)alloc(sizeof(funccall_T));
+    fc->caller = current_funccal;
+    current_funccal = fc;
+    fc->func = fp;
+    fc->rettv = rettv;
     rettv->vval.v_number = 0;
-    fc.linenr = 0;
-    fc.returned = FALSE;
-    fc.level = ex_nesting_level;
+    fc->linenr = 0;
+    fc->returned = FALSE;
+    fc->level = ex_nesting_level;
     /* Check if this function has a breakpoint. */
-    fc.breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
-    fc.dbg_tick = debug_tick;
+    fc->breakpoint = dbg_find_breakpoint(FALSE, fp->uf_name, (linenr_T)0);
+    fc->dbg_tick = debug_tick;
 
     /*
-     * Note about using fc.fixvar[]: This is an array of FIXVAR_CNT variables
+     * Note about using fc->fixvar[]: This is an array of FIXVAR_CNT variables
      * with names up to VAR_SHORT_LEN long.  This avoids having to alloc/free
      * each argument variable and saves a lot of time.
      */
     /*
      * Init l: variables.
      */
-    init_var_dict(&fc.l_vars, &fc.l_vars_var);
+    init_var_dict(&fc->l_vars, &fc->l_vars_var);
     if (selfdict != NULL)
     {
         /* Set l:self to "selfdict".  Use "name" to avoid a warning from
          * some compiler that checks the destination size. */
-        v = &fc.fixvar[fixvar_idx++].var;
+        v = &fc->fixvar[fixvar_idx++].var;
         name = v->di_key;
         STRCPY(name, "self");
         v->di_flags = DI_FLAGS_RO + DI_FLAGS_FIX;
-        hash_add(&fc.l_vars.dv_hashtab, DI2HIKEY(v));
+        hash_add(&fc->l_vars.dv_hashtab, DI2HIKEY(v));
         v->di_tv.v_type = VAR_DICT;
         v->di_tv.v_lock = 0;
         v->di_tv.vval.v_dict = selfdict;
@@ -21079 +21205 @@
      * Set a:0 to "argcount".
      * Set a:000 to a list with room for the "..." arguments.
      */
-    init_var_dict(&fc.l_avars, &fc.l_avars_var);
-    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
+    init_var_dict(&fc->l_avars, &fc->l_avars_var);
+    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "0",
                                 (varnumber_T)(argcount - fp->uf_args.ga_len));
-    v = &fc.fixvar[fixvar_idx++].var;
-    STRCPY(v->di_key, "000");
+    /* Use "name" to avoid a warning from some compiler that checks the
+     * destination size. */
+    v = &fc->fixvar[fixvar_idx++].var;
+    name = v->di_key;
+    STRCPY(name, "000");
     v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
-    hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
+    hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
     v->di_tv.v_type = VAR_LIST;
     v->di_tv.v_lock = VAR_FIXED;
-    v->di_tv.vval.v_list = &fc.l_varlist;
-    vim_memset(&fc.l_varlist, 0, sizeof(list_T));
-    fc.l_varlist.lv_refcount = 99999;
-    fc.l_varlist.lv_lock = VAR_FIXED;
+    v->di_tv.vval.v_list = &fc->l_varlist;
+    vim_memset(&fc->l_varlist, 0, sizeof(list_T));
+    fc->l_varlist.lv_refcount = DO_NOT_FREE_CNT;
+    fc->l_varlist.lv_lock = VAR_FIXED;
 
     /*
      * Set a:firstline to "firstline" and a:lastline to "lastline".
      * Set a:name to named arguments.
      * Set a:N to the "..." arguments.
      */
-    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "firstline",
+    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "firstline",
                                                       (varnumber_T)firstline);
-    add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "lastline",
+    add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "lastline",
                                                        (varnumber_T)lastline);
     for (i = 0; i < argcount; ++i)
     {
@@ -21116 +21245 @@
         }
         if (fixvar_idx < FIXVAR_CNT && STRLEN(name) <= VAR_SHORT_LEN)
         {
-            v = &fc.fixvar[fixvar_idx++].var;
+            v = &fc->fixvar[fixvar_idx++].var;
             v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
         }
         else
@@ -21128 +21257 @@
             v->di_flags = DI_FLAGS_RO;
         }
         STRCPY(v->di_key, name);
-        hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
+        hash_add(&fc->l_avars.dv_hashtab, DI2HIKEY(v));
 
         /* Note: the values are copied directly to avoid alloc/free.
          * "argvars" must have VAR_FIXED for v_lock. */
@@ -21137 +21266 @@
 
         if (ai >= 0 && ai < MAX_FUNC_ARGS)
         {
-            list_append(&fc.l_varlist, &fc.l_listitems[ai]);
-            fc.l_listitems[ai].li_tv = argvars[i];
-            fc.l_listitems[ai].li_tv.v_lock = VAR_FIXED;
+            list_append(&fc->l_varlist, &fc->l_listitems[ai]);
+            fc->l_listitems[ai].li_tv = argvars[i];
+            fc->l_listitems[ai].li_tv.v_lock = VAR_FIXED;
         }
     }
 
@@ -21204 +21333 @@
         if (!fp->uf_profiling && has_profiling(FALSE, fp->uf_name, NULL))
             func_do_profile(fp);
         if (fp->uf_profiling
-                       || (fc.caller != NULL && &fc.caller->func->uf_profiling))
+                    || (fc->caller != NULL && fc->caller->func->uf_profiling))
         {
             ++fp->uf_tm_count;
             profile_start(&call_start);
@@ -21220 +21349 @@
     did_emsg = FALSE;
 
     /* call do_cmdline() to execute the lines */
-    do_cmdline(NULL, get_func_line, (void *)&fc,
+    do_cmdline(NULL, get_func_line, (void *)fc,
                                      DOCMD_NOWAIT|DOCMD_VERBOSE|DOCMD_REPEAT);
 
     --RedrawingDisabled;
@@ -21235 +21364 @@
 
 #ifdef FEAT_PROFILE
     if (do_profiling == PROF_YES && (fp->uf_profiling
-                    || (fc.caller != NULL && &fc.caller->func->uf_profiling)))
+                    || (fc->caller != NULL && fc->caller->func->uf_profiling)))
     {
         profile_end(&call_start);
         profile_sub_wait(&wait_start, &call_start);
         profile_add(&fp->uf_tm_total, &call_start);
         profile_self(&fp->uf_tm_self, &call_start, &fp->uf_tm_children);
-        if (fc.caller != NULL && &fc.caller->func->uf_profiling)
+        if (fc->caller != NULL && fc->caller->func->uf_profiling)
         {
-            profile_add(&fc.caller->func->uf_tm_children, &call_start);
-            profile_add(&fc.caller->func->uf_tml_children, &call_start);
+            profile_add(&fc->caller->func->uf_tm_children, &call_start);
+            profile_add(&fc->caller->func->uf_tml_children, &call_start);
         }
     }
 #endif
@@ -21257 +21386 @@
 
         if (aborting())
             smsg((char_u *)_("%s aborted"), sourcing_name);
-        else if (fc.rettv->v_type == VAR_NUMBER)
+        else if (fc->rettv->v_type == VAR_NUMBER)
             smsg((char_u *)_("%s returning #%ld"), sourcing_name,
-                                               (long)fc.rettv->vval.v_number);
+                                               (long)fc->rettv->vval.v_number);
         else
         {
             char_u      buf[MSG_BUF_LEN];
@@ -21270 +21399 @@
             /* The value may be very long.  Skip the middle part, so that we
              * have some idea how it starts and ends. smsg() would always
              * truncate it at the end. */
-            s = tv2string(fc.rettv, &tofree, numbuf2, 0);
+            s = tv2string(fc->rettv, &tofree, numbuf2, 0);
             if (s != NULL)
             {
                 trunc_string(s, buf, MSG_BUF_CLEN);
@@ -21306 +21435 @@
     }
 
     did_emsg |= save_did_emsg;
-    current_funccal = fc.caller;
+    current_funccal = fc->caller;
+    --depth;
 
-    /* The a: variables typevals were not allocated, only free the allocated
-     * variables. */
-    vars_clear_ext(&fc.l_avars.dv_hashtab, FALSE);
+    /* if the a:000 list and the a: dict are not referenced we can free the
+     * funccall_T and what's in it. */
+    if (fc->l_varlist.lv_refcount == DO_NOT_FREE_CNT
+            && fc->l_vars.dv_refcount == DO_NOT_FREE_CNT
+            && fc->l_avars.dv_refcount == DO_NOT_FREE_CNT)
+    {
+        free_funccal(fc, FALSE);
+    }
+    else
+    {
+        hashitem_T      *hi;
+        listitem_T      *li;
+        int             todo;
 
-    vars_clear(&fc.l_vars.dv_hashtab);          /* free all l: variables */
-    --depth;
+        /* "fc" is still in use.  This can happen when returning "a:000" or
+         * assigning "l:" to a global variable.
+         * Link "fc" in the list for garbage collection later. */
+        fc->caller = previous_funccal;
+        previous_funccal = fc;
+
+        /* Make a copy of the a: variables, since we didn't do that above. */
+        todo = (int)fc->l_avars.dv_hashtab.ht_used;
+        for (hi = fc->l_avars.dv_hashtab.ht_array; todo > 0; ++hi)
+        {
+            if (!HASHITEM_EMPTY(hi))
+            {
+                --todo;
+                v = HI2DI(hi);
+                copy_tv(&v->di_tv, &v->di_tv);
+            }
+        }
+
+        /* Make a copy of the a:000 items, since we didn't do that above. */
+        for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
+            copy_tv(&li->li_tv, &li->li_tv);
+    }
+}
+
+/*
+ * Return TRUE if items in "fc" do not have "copyID".  That means they are not
+ * referenced from anywhere.
+ */
+    static int
+can_free_funccal(fc, copyID)
+    funccall_T  *fc;
+    int         copyID;
+{
+    return (fc->l_varlist.lv_copyID != copyID
+            && fc->l_vars.dv_copyID != copyID
+            && fc->l_avars.dv_copyID != copyID);
+}
+
+/*
+ * Free "fc" and what it contains.
+ */
+   static void
+free_funccal(fc, free_val)
+    funccall_T  *fc;
+    int         free_val;  /* a: vars were allocated */
+{
+    listitem_T  *li;
+
+    /* The a: variables typevals may not have been allocated, only free the
+     * allocated variables. */
+    vars_clear_ext(&fc->l_avars.dv_hashtab, free_val);
+
+    /* free all l: variables */
+    vars_clear(&fc->l_vars.dv_hashtab);
+
+    /* Free the a:000 variables if they were allocated. */
+    if (free_val)
+        for (li = fc->l_varlist.lv_first; li != NULL; li = li->li_next)
+            clear_tv(&li->li_tv);
+
+    vim_free(fc);
 }
 
 /*
@@ -21886 +22085 @@
     }
 }
 
+/*
+ * List v:oldfiles in a nice way.
+ */
+/*ARGSUSED*/
+    void
+ex_oldfiles(eap)
+    exarg_T     *eap;
+{
+    list_T      *l = vimvars[VV_OLDFILES].vv_list;
+    listitem_T  *li;
+    int         nr = 0;
+
+    if (l == NULL)
+        msg((char_u *)_("No old files"));
+    else
+    {
+        msg_start();
+        msg_scroll = TRUE;
+        for (li = l->lv_first; li != NULL && !got_int; li = li->li_next)
+        {
+            msg_outnum((long)++nr);
+            MSG_PUTS(": ");
+            msg_outtrans(get_tv_string(&li->li_tv));
+            msg_putchar('\n');
+            out_flush();            /* output one line at a time */
+            ui_breakcheck();
+        }
+        /* Assume "got_int" was set to truncate the listing. */
+        got_int = FALSE;
+
+#ifdef FEAT_BROWSE_CMD
+        if (cmdmod.browse)
+        {
+            quit_more = FALSE;
+            nr = prompt_for_number(FALSE);
+            msg_starthere();
+            if (nr > 0)
+            {
+                char_u *p = list_find_str(get_vim_var_list(VV_OLDFILES),
+                                                                    (long)nr);
+
+                if (p != NULL)
+                {
+                    p = expand_env_save(p);
+                    eap->arg = p;
+                    eap->cmdidx = CMD_edit;
+                    cmdmod.browse = FALSE;
+                    do_exedit(eap, NULL);
+                    vim_free(p);
+                }
+            }
+        }
+#endif
+    }
+}
+
 #endif /* FEAT_EVAL */
 
 

src/ex_cmds2.c

@@ -2842 +2842 @@
     linenr_T                save_sourcing_lnum;
     char_u                  *p;
     char_u                  *fname_exp;
+    char_u                  *firstline = NULL;
     int                     retval = FAIL;
 #ifdef FEAT_EVAL
     scid_T                  save_current_SID;
@@ -2992 +2993 @@
 
     cookie.level = ex_nesting_level;
 #endif
-#ifdef FEAT_MBYTE
-    cookie.conv.vc_type = CONV_NONE;            /* no conversion */
-
-    /* Try reading the first few bytes to check for a UTF-8 BOM. */
-    {
-        char_u      buf[3];
-
-        if (fread((char *)buf, sizeof(char_u), (size_t)3, cookie.fp)
-                                                                  == (size_t)3
-                && buf[0] == 0xef && buf[1] == 0xbb && buf[2] == 0xbf)
-            /* Found BOM, setup conversion and skip over it. */
-            convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc);
-        else
-            /* No BOM found, rewind. */
-            fseek(cookie.fp, 0L, SEEK_SET);
-    }
-#endif
 
     /*
      * Keep the sourcing name/lnum, for recursive calls.
@@ -3018 +3002 @@
     save_sourcing_lnum = sourcing_lnum;
     sourcing_lnum = 0;
 
+#ifdef FEAT_MBYTE
+    cookie.conv.vc_type = CONV_NONE;            /* no conversion */
+
+    /* Read the first line so we can check for a UTF-8 BOM. */
+    firstline = getsourceline(0, (void *)&cookie, 0);
+    if (firstline != NULL && STRLEN(firstline) >= 3 && firstline[0] == 0xef
+                              && firstline[1] == 0xbb && firstline[2] == 0xbf)
+    {
+        /* Found BOM; setup conversion, skip over BOM and recode the line. */
+        convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc);
+        p = string_convert(&cookie.conv, firstline + 3, NULL);
+        if (p == NULL)
+            p = vim_strsave(firstline + 3);
+        if (p != NULL)
+        {
+            vim_free(firstline);
+            firstline = p;
+        }
+    }
+#endif
+
 #ifdef STARTUPTIME
     time_push(&tv_rel, &tv_start);
 #endif
@@ -3111 +3116 @@
     /*
      * Call do_cmdline, which will call getsourceline() to get the lines.
      */
-    do_cmdline(NULL, getsourceline, (void *)&cookie,
+    do_cmdline(firstline, getsourceline, (void *)&cookie,
                                      DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_REPEAT);
-
     retval = OK;
 
 #ifdef FEAT_PROFILE
@@ -3145 +3149 @@
         verbose_leave();
     }
 #ifdef STARTUPTIME
-    vim_snprintf(IObuff, IOSIZE, "sourcing %s", fname);
-    time_msg(IObuff, &tv_start);
+    vim_snprintf((char *)IObuff, IOSIZE, "sourcing %s", fname);
+    time_msg((char *)IObuff, &tv_start);
     time_pop(&tv_rel);
 #endif
 
@@ -3171 +3175 @@
 #endif
     fclose(cookie.fp);
     vim_free(cookie.nextline);
+    vim_free(firstline);
 #ifdef FEAT_MBYTE
     convert_setup(&cookie.conv, NULL, NULL);
 #endif

src/ex_cmds.c

@@ -24 +24 @@
 static void do_filter __ARGS((linenr_T line1, linenr_T line2, exarg_T *eap, char_u *cmd, int do_in, int do_out));
 #ifdef FEAT_VIMINFO
 static char_u *viminfo_filename __ARGS((char_u  *));
-static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int want_info, int want_marks, int force_read));
+static void do_viminfo __ARGS((FILE *fp_in, FILE *fp_out, int flags));
 static int viminfo_encoding __ARGS((vir_T *virp));
 static int read_viminfo_up_to_marks __ARGS((vir_T *virp, int forceit, int writing));
 #endif
@@ -49 +49 @@
     exarg_T     *eap;
 {
     int         c;
+    int         cval;
     char        buf1[20];
     char        buf2[20];
     char_u      buf3[7];
@@ -75 +76 @@
     {
         if (c == NL)        /* NUL is stored as NL */
             c = NUL;
+        if (c == CAR && get_fileformat(curbuf) == EOL_MAC)
+            cval = NL;      /* NL is stored as CR */
+        else
+            cval = c;
         if (vim_isprintc_strict(c) && (c < ' '
 #ifndef EBCDIC
                     || c > '~'
@@ -94 +99 @@
             buf2[0] = NUL;
         vim_snprintf((char *)IObuff, IOSIZE,
                 _("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
-                                           transchar(c), buf1, buf2, c, c, c);
+                                  transchar(c), buf1, buf2, cval, cval, cval);
 #ifdef FEAT_MBYTE
         if (enc_utf8)
             c = cc[ci++];
@@ -1676 +1681 @@
 
 /*
  * read_viminfo() -- Read the viminfo file.  Registers etc. which are already
- * set are not over-written unless force is TRUE. -- webb
+ * set are not over-written unless "flags" includes VIF_FORCEIT. -- webb
  */
     int
-read_viminfo(file, want_info, want_marks, forceit)
-    char_u      *file;
-    int         want_info;
-    int         want_marks;
-    int         forceit;
+read_viminfo(file, flags)
+    char_u      *file;      /* file name or NULL to use default name */
+    int         flags;      /* VIF_WANT_INFO et al. */
 {
     FILE        *fp;
     char_u      *fname;
@@ -1691 +1694 @@
     if (no_viminfo())
         return FAIL;
 
-    fname = viminfo_filename(file);         /* may set to default if NULL */
+    fname = viminfo_filename(file);     /* get file name in allocated buffer */
     if (fname == NULL)
         return FAIL;
     fp = mch_fopen((char *)fname, READBIN);
@@ -1701 +1704 @@
         verbose_enter();
         smsg((char_u *)_("Reading viminfo file \"%s\"%s%s%s"),
                 fname,
-                want_info ? _(" info") : "",
-                want_marks ? _(" marks") : "",
+                (flags & VIF_WANT_INFO) ? _(" info") : "",
+                (flags & VIF_WANT_MARKS) ? _(" marks") : "",
+                (flags & VIF_GET_OLDFILES) ? _(" oldfiles") : "",
                 fp == NULL ? _(" FAILED") : "");
         verbose_leave();
     }
@@ -1712 +1716 @@
         return FAIL;
 
     viminfo_errcnt = 0;
-    do_viminfo(fp, NULL, want_info, want_marks, forceit);
+    do_viminfo(fp, NULL, flags);
 
     fclose(fp);
-
     return OK;
 }
 
@@ -1943 +1946 @@
              * root.
              */
             if (fp_out != NULL)
-                (void)fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);
+                ignored = fchown(fileno(fp_out), st_old.st_uid, st_old.st_gid);
 #endif
         }
     }
@@ -1968 +1971 @@
     }
 
     viminfo_errcnt = 0;
-    do_viminfo(fp_in, fp_out, !forceit, !forceit, FALSE);
+    do_viminfo(fp_in, fp_out, forceit ? 0 : (VIF_WANT_INFO | VIF_WANT_MARKS));
 
     fclose(fp_out);         /* errors are ignored !? */
     if (fp_in != NULL)
@@ -2041 +2044 @@
  * do_viminfo() -- Should only be called from read_viminfo() & write_viminfo().
  */
     static void
-do_viminfo(fp_in, fp_out, want_info, want_marks, force_read)
+do_viminfo(fp_in, fp_out, flags)
     FILE        *fp_in;
     FILE        *fp_out;
-    int         want_info;
-    int         want_marks;
-    int         force_read;
+    int         flags;
 {
     int         count = 0;
     int         eof = FALSE;
@@ -2061 +2062 @@
 
     if (fp_in != NULL)
     {
-        if (want_info)
-            eof = read_viminfo_up_to_marks(&vir, force_read, fp_out != NULL);
+        if (flags & VIF_WANT_INFO)
+            eof = read_viminfo_up_to_marks(&vir,
+                                         flags & VIF_FORCEIT, fp_out != NULL);
         else
             /* Skip info, find start of marks */
             while (!(eof = viminfo_readline(&vir))
@@ -2092 +2094 @@
         write_viminfo_bufferlist(fp_out);
         count = write_viminfo_marks(fp_out);
     }
-    if (fp_in != NULL && want_marks)
-        copy_viminfo_marks(&vir, fp_out, count, eof);
+    if (fp_in != NULL
+            && (flags & (VIF_WANT_MARKS | VIF_GET_OLDFILES | VIF_FORCEIT)))
+        copy_viminfo_marks(&vir, fp_out, count, eof, flags);
 
     vim_free(vir.vir_line);
 #ifdef FEAT_MBYTE
@@ -2414 +2417 @@
         cursor_on();            /* msg_start() switches it off */
         out_flush();
         silent_mode = save_silent;
-        info_message = FALSE;
     }
+    info_message = FALSE;
 }
 
 /*
@@ -5059 +5062 @@
 
             if (did_sub)
                 ++sub_nlines;
+            vim_free(new_start);        /* for when substitute was cancelled */
             vim_free(sub_firstline);    /* free the copy of the original line */
             sub_firstline = NULL;
         }

src/ex_cmds.h

@@ -278 +278 @@
 EX(CMD_crewind,         "crewind",      ex_cc,
                         RANGE|NOTADR|COUNT|TRLBAR|BANG),
 EX(CMD_cscope,          "cscope",       do_cscope,
-                        EXTRA|NOTRLCOM|SBOXOK|XFILE),
+                        EXTRA|NOTRLCOM|XFILE),
 EX(CMD_cstag,           "cstag",        do_cstag,
                         BANG|TRLBAR|WORD1),
 EX(CMD_cunmap,          "cunmap",       ex_unmap,
@@ -506 +506 @@
 EX(CMD_lclose,          "lclose",       ex_cclose,
                         RANGE|NOTADR|COUNT|TRLBAR),
 EX(CMD_lcscope,         "lcscope",      do_cscope,
-                        EXTRA|NOTRLCOM|SBOXOK|XFILE),
+                        EXTRA|NOTRLCOM|XFILE),
 EX(CMD_left,            "left",         ex_align,
                         TRLBAR|RANGE|WHOLEFOLD|EXTRA|CMDWIN|MODIFY),
 EX(CMD_leftabove,       "leftabove",    ex_wrongmodifier,
@@ -635 +635 @@
                         RANGE|NOTADR|ZEROR|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
 EX(CMD_noremap,         "noremap",      ex_map,
                         BANG|EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
+EX(CMD_noautocmd,       "noautocmd",    ex_wrongmodifier,
+                        NEEDARG|EXTRA|NOTRLCOM),
 EX(CMD_nohlsearch,      "nohlsearch",   ex_nohlsearch,
                         TRLBAR|SBOXOK|CMDWIN),
 EX(CMD_noreabbrev,      "noreabbrev",   ex_abbreviate,
@@ -651 +653 @@
                         EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
 EX(CMD_open,            "open",         ex_open,
                         RANGE|EXTRA),
+EX(CMD_oldfiles,        "oldfiles",     ex_oldfiles,
+                        BANG|TRLBAR|SBOXOK|CMDWIN),
 EX(CMD_omap,            "omap",         ex_map,
                         EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
 EX(CMD_omapclear,       "omapclear",    ex_mapclear,
@@ -802 +806 @@
 EX(CMD_scriptencoding,  "scriptencoding", ex_scriptencoding,
                         WORD1|TRLBAR|CMDWIN),
 EX(CMD_scscope,         "scscope",      do_scscope,
-                        EXTRA|NOTRLCOM|SBOXOK),
+                        EXTRA|NOTRLCOM),
 EX(CMD_set,             "set",          ex_set,
                         TRLBAR|EXTRA|CMDWIN|SBOXOK),
 EX(CMD_setfiletype,     "setfiletype",  ex_setfiletype,

src/ex_docmd.c

@@ -364 +364 @@
 # define ex_function            ex_ni
 # define ex_delfunction         ex_ni
 # define ex_return              ex_ni
+# define ex_oldfiles            ex_ni
 #endif
 static char_u   *arg_all __ARGS((void));
 #ifdef FEAT_SESSION
@@ -1770 +1771 @@
                         }
                         if (checkforcmd(&ea.cmd, "browse", 3))
                         {
-#ifdef FEAT_BROWSE
+#ifdef FEAT_BROWSE_CMD
                             cmdmod.browse = TRUE;
 #endif
                             continue;
@@ -2978 +2979 @@
     {"keepmarks", 3, FALSE},
     {"leftabove", 5, FALSE},
     {"lockmarks", 3, FALSE},
+    {"noautocmd", 3, FALSE},
     {"rightbelow", 6, FALSE},
     {"sandbox", 3, FALSE},
     {"silent", 3, FALSE},
@@ -3608 +3610 @@
             return set_context_in_autocmd(xp, arg, FALSE);
 
         case CMD_doautocmd:
+        case CMD_doautoall:
             return set_context_in_autocmd(xp, arg, TRUE);
 #endif
         case CMD_set:
@@ -5479 +5482 @@
     return OK;
 }
 
+/*
+ * ":command ..."
+ */
     static void
 ex_command(eap)
     exarg_T   *eap;
@@ -5911 +5917 @@
 
     char_u      *start;
     char_u      *end;
+    char_u      *ksp;
     size_t      len, totlen;
 
     size_t      split_len = 0;
@@ -5927 +5934 @@
 
     /*
      * Replace <> in the command by the arguments.
+     * First round: "buf" is NULL, compute length, allocate "buf".
+     * Second round: copy result into "buf".
      */
     buf = NULL;
     for (;;)
     {
-        p = cmd->uc_rep;
-        q = buf;
+        p = cmd->uc_rep;    /* source */
+        q = buf;            /* destinateion */
         totlen = 0;
-        while ((start = vim_strchr(p, '<')) != NULL
-               && (end = vim_strchr(start + 1, '>')) != NULL)
+
+        for (;;)
         {
+            start = vim_strchr(p, '<');
+            if (start != NULL)
+                end = vim_strchr(start + 1, '>');
+            if (buf != NULL)
+            {
+                ksp = vim_strchr(p, K_SPECIAL);
+                if (ksp != NULL && (start == NULL || ksp < start || end == NULL)
+                        && ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER)
+# ifdef FEAT_GUI
+                            || (ksp[1] == KS_EXTRA && ksp[2] == (int)KE_CSI)
+# endif
+                            ))
+                {
+                    /* K_SPECIAL han been put in the buffer as K_SPECIAL
+                     * KS_SPECIAL KE_FILLER, like for mappings, but
+                     * do_cmdline() doesn't handle that, so convert it back.
+                     * Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */
+                    len = ksp - p;
+                    if (len > 0)
+                    {
+                        mch_memmove(q, p, len);
+                        q += len;
+                    }
+                    *q++ = ksp[1] == KS_SPECIAL ? K_SPECIAL : CSI;
+                    p = ksp + 3;
+                    continue;
+                }
+            }
+
+            /* break if there no <item> is found */
+            if (start == NULL || end == NULL)
+                break;
+
             /* Include the '>' */
             ++end;
 
@@ -8749 +8791 @@
                 else if (*dirnow != NUL
                         && (ssop_flags & SSOP_CURDIR) && globaldir != NULL)
                 {
-                    (void)mch_chdir((char *)globaldir);
-                    shorten_fnames(TRUE);
+                    if (mch_chdir((char *)globaldir) == OK)
+                        shorten_fnames(TRUE);
                 }
 
                 failed |= (makeopens(fd, dirnow) == FAIL);
@@ -9506 +9548 @@
                     break;
                 }
                 s = src + 1;
+                if (*s == '<')          /* "#<99" uses v:oldfiles */
+                    ++s;
                 i = (int)getdigits(&s);
                 *usedlen = (int)(s - src); /* length of what we expand */
 
-                buf = buflist_findnr(i);
-                if (buf == NULL)
+                if (src[1] == '<')
                 {
-                    *errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'");
+                    if (*usedlen < 2)
+                    {
+                        /* Should we give an error message for #<text? */
+                        *usedlen = 1;
+                        return NULL;
+                    }
+#ifdef FEAT_EVAL
+                    result = list_find_str(get_vim_var_list(VV_OLDFILES),
+                                                                     (long)i);
+                    if (result == NULL)
+                    {
+                        *errormsg = (char_u *)"";
+                        return NULL;
+                    }
+#else
+                    *errormsg = (char_u *)_("E809: #< is not available without the +eval feature");
                     return NULL;
+#endif
                 }
-                if (lnump != NULL)
-                    *lnump = ECMD_LAST;
-                if (buf->b_fname == NULL)
+                else
                 {
-                    result = (char_u *)"";
-                    valid = 0;      /* Must have ":p:h" to be valid */
+                    buf = buflist_findnr(i);
+                    if (buf == NULL)
+                    {
+                        *errormsg = (char_u *)_("E194: No alternate file name to substitute for '#'");
+                        return NULL;
+                    }
+                    if (lnump != NULL)
+                        *lnump = ECMD_LAST;
+                    if (buf->b_fname == NULL)
+                    {
+                        result = (char_u *)"";
+                        valid = 0;          /* Must have ":p:h" to be valid */
+                    }
+                    else
+                        result = buf->b_fname;
                 }
-                else
-                    result = buf->b_fname;
                 break;
 
 #ifdef FEAT_SEARCHPATH
@@ -9541 +9609 @@
 #ifdef FEAT_AUTOCMD
         case SPEC_AFILE:        /* file name for autocommand */
                 result = autocmd_fname;
+                if (result != NULL && !autocmd_fname_full)
+                {
+                    /* Still need to turn the fname into a full path.  It is
+                     * postponed to avoid a delay when <afile> is not used. */
+                    autocmd_fname_full = TRUE;
+                    result = FullName_save(autocmd_fname, FALSE);
+                    vim_free(autocmd_fname);
+                    autocmd_fname = result;
+                }
                 if (result == NULL)
                 {
                     *errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
@@ -10067 +10144 @@
      */
     if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
             || put_line(fd, "if file_readable(s:sx)") == FAIL
-            || put_line(fd, "  exe \"source \" . s:sx") == FAIL
+            || put_line(fd, "  exe \"source \" . fnameescape(s:sx)") == FAIL
             || put_line(fd, "endif") == FAIL)
         return FAIL;
 
@@ -10689 +10766 @@
         p_viminfo = (char_u *)"'100";
     if (eap->cmdidx == CMD_rviminfo)
     {
-        if (read_viminfo(eap->arg, TRUE, TRUE, eap->forceit) == FAIL)
+        if (read_viminfo(eap->arg, VIF_WANT_INFO | VIF_WANT_MARKS
+                                  | (eap->forceit ? VIF_FORCEIT : 0)) == FAIL)
             EMSG(_("E195: Cannot open viminfo file for reading"));
     }
     else

src/ex_getln.c

@@ -31 +31 @@
     int         cmdattr;        /* attributes for prompt */
     int         overstrike;     /* Typing mode on the command line.  Shared by
                                    getcmdline() and put_on_cmdline(). */
+    expand_T    *xpc;           /* struct being used for expansion, xp_pattern
+                                   may point into cmdbuff */
     int         xp_context;     /* type of expansion */
 # ifdef FEAT_EVAL
     char_u      *xp_arg;        /* user-defined expansion arg */
@@ -38 +40 @@
 # endif
 };
 
-static struct cmdline_info ccline;      /* current cmdline_info */
+/* The current cmdline_info.  It is initialized in getcmdline() and after that
+ * used by other functions.  When invoking getcmdline() recursively it needs
+ * to be saved with save_cmdline() and restored with restore_cmdline().
+ * TODO: make it local to getcmdline() and pass it around. */
+static struct cmdline_info ccline;
 
 static int      cmd_showtail;           /* Only show path tail in lists ? */
 
@@ -238 +244 @@
     }
 
     ExpandInit(&xpc);
+    ccline.xpc = &xpc;
 
 #ifdef FEAT_RIGHTLEFT
     if (curwin->w_p_rl && *curwin->w_p_rlc == 's'
@@ -408 +415 @@
 #endif
 
         /*
-         * <S-Tab> works like CTRL-P (unless 'wc' is <S-Tab>).
+         * When there are matching completions to select <S-Tab> works like
+         * CTRL-P (unless 'wc' is <S-Tab>).
          */
-        if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles != -1)
+        if (c != p_wc && c == K_S_TAB && xpc.xp_numfiles > 0)
             c = Ctrl_P;
 
 #ifdef FEAT_WILDMENU
@@ -1513 +1521 @@
                     int         old_firstc;
 
                     vim_free(ccline.cmdbuff);
+                    xpc.xp_context = EXPAND_NOTHING;
                     if (hiscnt == hislen)
                         p = lookfor;    /* back to the old one */
                     else
@@ -1839 +1848 @@
 #endif
 
     ExpandCleanup(&xpc);
+    ccline.xpc = NULL;
 
 #ifdef FEAT_SEARCH_EXTRA
     if (did_incsearch)
@@ -2508 +2518 @@
     }
     mch_memmove(ccline.cmdbuff, p, (size_t)ccline.cmdlen + 1);
     vim_free(p);
+
+    if (ccline.xpc != NULL
+            && ccline.xpc->xp_pattern != NULL
+            && ccline.xpc->xp_context != EXPAND_NOTHING
+            && ccline.xpc->xp_context != EXPAND_UNSUCCESSFUL)
+    {
+        int i = (int)(ccline.xpc->xp_pattern - p);
+
+        /* If xp_pattern points inside the old cmdbuff it needs to be adjusted
+         * to point into the newly allocated memory. */
+        if (i >= 0 && i <= ccline.cmdlen)
+            ccline.xpc->xp_pattern = ccline.cmdbuff + i;
+    }
+
     return OK;
 }
 
@@ -2875 +2899 @@
     prev_ccline = ccline;
     ccline.cmdbuff = NULL;
     ccline.cmdprompt = NULL;
+    ccline.xpc = NULL;
 }
 
 /*
@@ -3582 +3607 @@
 ExpandInit(xp)
     expand_T    *xp;
 {
+    xp->xp_pattern = NULL;
     xp->xp_backslash = XP_BS_NONE;
 #ifndef BACKSLASH_IN_FILENAME
     xp->xp_shell = FALSE;
@@ -4871 +4897 @@
     if (s == NULL)
         return FAIL;
     sprintf((char *)s, "%s/%s*.vim", dirname, pat);
-    all = globpath(p_rtp, s);
+    all = globpath(p_rtp, s, 0);
     vim_free(s);
     if (all == NULL)
         return FAIL;
@@ -4912 +4938 @@
  * newlines.  Returns NULL for an error or no matches.
  */
     char_u *
-globpath(path, file)
+globpath(path, file, expand_options)
     char_u      *path;
     char_u      *file;
+    int         expand_options;
 {
     expand_T    xpc;
     char_u      *buf;
@@ -4943 +4970 @@
         {
             add_pathsep(buf);
             STRCAT(buf, file);
-            if (ExpandFromContext(&xpc, buf, &num_p, &p, WILD_SILENT) != FAIL
-                                                                 && num_p > 0)
+            if (ExpandFromContext(&xpc, buf, &num_p, &p,
+                             WILD_SILENT|expand_options) != FAIL && num_p > 0)
             {
-                ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT);
+                ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT|expand_options);
                 for (len = 0, i = 0; i < num_p; ++i)
                     len += (int)STRLEN(p[i]) + 1;
 

src/feature.h

@@ -767 +767 @@
 
 /*
  * +browse              ":browse" command.
+ *                      or just the ":browse" command modifier
  */
-#if defined(FEAT_NORMAL) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC))
-# define FEAT_BROWSE
+#if defined(FEAT_NORMAL)
+# define FEAT_BROWSE_CMD
+# if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC)
+#  define FEAT_BROWSE
+# endif
 #endif
 
 /*

src/fileio.c

@@ -932 +932 @@
     else
     {
         if (eap != NULL && eap->force_ff != 0)
+        {
             fileformat = get_fileformat_force(curbuf, eap);
+            try_unix = try_dos = try_mac = FALSE;
+        }
         else if (curbuf->b_p_bin)
             fileformat = EOL_UNIX;              /* binary: use Unix format */
         else if (*p_ffs == NUL)
@@ -2211 +2214 @@
     {
         /* Use stderr for stdin, makes shell commands work. */
         close(0);
-        dup(2);
+        ignored = dup(2);
     }
 #endif
 
@@ -2341 +2344 @@
                 STRCAT(IObuff, _("[CR missing]"));
                 c = TRUE;
             }
-            if (ff_error == EOL_MAC)
-            {
-                STRCAT(IObuff, _("[NL found]"));
-                c = TRUE;
-            }
             if (split)
             {
                 STRCAT(IObuff, _("[long lines split]"));
@@ -2711 +2709 @@
 {
     if (!curbuf->b_marks_read && get_viminfo_parameter('\'') > 0
                                                   && curbuf->b_ffname != NULL)
-        read_viminfo(NULL, FALSE, TRUE, FALSE);
+        read_viminfo(NULL, VIF_WANT_MARKS);
 
     /* Always set b_marks_read; needed when 'viminfo' is changed to include
      * the ' parameter after opening a buffer. */
@@ -3451 +3449 @@
                 {
 # ifdef UNIX
 #  ifdef HAVE_FCHOWN
-                    fchown(fd, st_old.st_uid, st_old.st_gid);
+                    ignored = fchown(fd, st_old.st_uid, st_old.st_gid);
 #  endif
                     if (mch_stat((char *)IObuff, &st) < 0
                             || st.st_uid != st_old.st_uid
@@ -4367 +4365 @@
                 || st.st_uid != st_old.st_uid
                 || st.st_gid != st_old.st_gid)
         {
-            fchown(fd, st_old.st_uid, st_old.st_gid);
+            ignored = fchown(fd, st_old.st_uid, st_old.st_gid);
             if (perm >= 0)      /* set permission again, may have changed */
                 (void)mch_setperm(wfname, perm);
         }
@@ -5550 +5548 @@
             name = "ucs-4le";   /* FF FE 00 00 */
             len = 4;
         }
-        else if (flags == FIO_ALL || flags == (FIO_UCS2 | FIO_ENDIAN_L))
+        else if (flags == (FIO_UCS2 | FIO_ENDIAN_L))
             name = "ucs-2le";   /* FF FE */
-        else if (flags == (FIO_UTF16 | FIO_ENDIAN_L))
+        else if (flags == FIO_ALL || flags == (FIO_UTF16 | FIO_ENDIAN_L))
+            /* utf-16le is preferred, it also works for ucs-2le text */
             name = "utf-16le";  /* FF FE */
     }
     else if (p[0] == 0xfe && p[1] == 0xff
@@ -6031 +6030 @@
         {
             tbuf[FGETS_SIZE - 2] = NUL;
 #ifdef USE_CR
-            fgets_cr((char *)tbuf, FGETS_SIZE, fp);
+            ignoredp = fgets_cr((char *)tbuf, FGETS_SIZE, fp);
 #else
-            fgets((char *)tbuf, FGETS_SIZE, fp);
+            ignoredp = fgets((char *)tbuf, FGETS_SIZE, fp);
 #endif
         } while (tbuf[FGETS_SIZE - 2] != NUL && tbuf[FGETS_SIZE - 2] != '\n');
     }
@@ -6107 +6106 @@
 #ifdef HAVE_ACL
     vim_acl_T   acl;            /* ACL from original file */
 #endif
+#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
+    int         use_tmp_file = FALSE;
+#endif
 
     /*
-     * When the names are identical, there is nothing to do.
+     * When the names are identical, there is nothing to do.  When they refer
+     * to the same file (ignoring case and slash/backslash differences) but
+     * the file name differs we need to go through a temp file.
      */
     if (fnamecmp(from, to) == 0)
-        return 0;
+    {
+#ifdef CASE_INSENSITIVE_FILENAME
+        if (STRCMP(gettail(from), gettail(to)) != 0)
+            use_tmp_file = TRUE;
+        else
+#endif
+            return 0;
+    }
 
     /*
      * Fail if the "from" file doesn't exist.  Avoids that "to" is deleted.
@@ -6120 +6131 @@
     if (mch_stat((char *)from, &st) < 0)
         return -1;
 
+#ifdef UNIX
+    {
+        struct stat     st_to;
+
+        /* It's possible for the source and destination to be the same file.
+         * This happens when "from" and "to" differ in case and are on a FAT32
+         * filesystem.  In that case go through a temp file name. */
+        if (mch_stat((char *)to, &st_to) >= 0
+                && st.st_dev == st_to.st_dev
+                && st.st_ino == st_to.st_ino)
+            use_tmp_file = TRUE;
+    }
+#endif
+
+#if defined(UNIX) || defined(CASE_INSENSITIVE_FILENAME)
+    if (use_tmp_file)
+    {
+        char    tempname[MAXPATHL + 1];
+
+        /*
+         * Find a name that doesn't exist and is in the same directory.
+         * Rename "from" to "tempname" and then rename "tempname" to "to".
+         */
+        if (STRLEN(from) >= MAXPATHL - 5)
+            return -1;
+        STRCPY(tempname, from);
+        for (n = 123; n < 99999; ++n)
+        {
+            sprintf((char *)gettail((char_u *)tempname), "%d", n);
+            if (mch_stat(tempname, &st) < 0)
+            {
+                if (mch_rename((char *)from, tempname) == 0)
+                {
+                    if (mch_rename(tempname, (char *)to) == 0)
+                        return 0;
+                    /* Strange, the second step failed.  Try moving the
+                     * file back and return failure. */
+                    mch_rename(tempname, (char *)from);
+                    return -1;
+                }
+                /* If it fails for one temp name it will most likely fail
+                 * for any temp name, give up. */
+                return -1;
+            }
+        }
+        return -1;
+    }
+#endif
+
     /*
      * Delete the "to" file, this is required on some systems to make the
      * mch_rename() work, on other systems it makes sure that we don't have
@@ -8523 +8583 @@
     char_u      *save_sourcing_name;
     linenr_T    save_sourcing_lnum;
     char_u      *save_autocmd_fname;
+    int         save_autocmd_fname_full;
     int         save_autocmd_bufnr;
     char_u      *save_autocmd_match;
     int         save_autocmd_busy;
@@ -8601 +8662 @@
      * Save the autocmd_* variables and info about the current buffer.
      */
     save_autocmd_fname = autocmd_fname;
+    save_autocmd_fname_full = autocmd_fname_full;
     save_autocmd_bufnr = autocmd_bufnr;
     save_autocmd_match = autocmd_match;
     save_autocmd_busy = autocmd_busy;
@@ -8618 +8680 @@
         if (fname != NULL && *fname != NUL)
             autocmd_fname = fname;
         else if (buf != NULL)
-            autocmd_fname = buf->b_fname;
+            autocmd_fname = buf->b_ffname;
         else
             autocmd_fname = NULL;
     }
     else
         autocmd_fname = fname_io;
     if (autocmd_fname != NULL)
-        autocmd_fname = FullName_save(autocmd_fname, FALSE);
+        autocmd_fname = vim_strsave(autocmd_fname);
+    autocmd_fname_full = FALSE; /* call FullName_save() later */
 
     /*
      * Set the buffer number to be used for <abuf>.
@@ -8810 +8873 @@
     sourcing_lnum = save_sourcing_lnum;
     vim_free(autocmd_fname);
     autocmd_fname = save_autocmd_fname;
+    autocmd_fname_full = save_autocmd_fname_full;
     autocmd_bufnr = save_autocmd_bufnr;
     autocmd_match = save_autocmd_match;
 #ifdef FEAT_EVAL
@@ -8918 +8982 @@
     {
         apc->curpat = NULL;
 
-        /* only use a pattern when it has not been removed, has commands and
+        /* Only use a pattern when it has not been removed, has commands and
          * the group matches. For buffer-local autocommands only check the
          * buffer number. */
         if (ap->pat != NULL && ap->cmds != NULL
@@ -9104 +9168 @@
 set_context_in_autocmd(xp, arg, doautocmd)
     expand_T    *xp;
     char_u      *arg;
-    int         doautocmd;      /* TRUE for :doautocmd, FALSE for :autocmd */
+    int         doautocmd;      /* TRUE for :doauto*, FALSE for :autocmd */
 {
     char_u      *p;
     int         group;

src/fold.c

@@ -48 +48 @@
 static int foldFind __ARGS((garray_T *gap, linenr_T lnum, fold_T **fpp));
 static int foldLevelWin __ARGS((win_T *wp, linenr_T lnum));
 static void checkupdate __ARGS((win_T *wp));
-static void setFoldRepeat __ARGS((linenr_T lnum, long count, int open));
+static void setFoldRepeat __ARGS((linenr_T lnum, long count, int do_open));
 static linenr_T setManualFold __ARGS((linenr_T lnum, int opening, int recurse, int *donep));
 static linenr_T setManualFoldWin __ARGS((win_T *wp, linenr_T lnum, int opening, int recurse, int *donep));
 static void foldOpenNested __ARGS((fold_T *fpr));
@@ -740 +740 @@
     garray_T    *found_ga;
     fold_T      *found_fp = NULL;
     linenr_T    found_off = 0;
-    int         use_level = FALSE;
+    int         use_level;
     int         maybe_small = FALSE;
     int         level = 0;
     linenr_T    lnum = start;
@@ -757 +757 @@
         gap = &curwin->w_folds;
         found_ga = NULL;
         lnum_off = 0;
+        use_level = FALSE;
         for (;;)
         {
             if (!foldFind(gap, lnum - lnum_off, &fp))
@@ -783 +784 @@
         else
         {
             lnum = found_fp->fd_top + found_fp->fd_len + found_off;
-            did_one = TRUE;
 
             if (foldmethodIsManual(curwin))
                 deleteFoldEntry(found_ga,
                     (int)(found_fp - (fold_T *)found_ga->ga_data), recursive);
             else
             {
-                if (found_fp->fd_top + found_off < first_lnum)
-                    first_lnum = found_fp->fd_top;
-                if (lnum > last_lnum)
+                if (first_lnum > found_fp->fd_top + found_off)
+                    first_lnum = found_fp->fd_top + found_off;
+                if (last_lnum < lnum)
                     last_lnum = lnum;
-                parseMarker(curwin);
+                if (!did_one)
+                    parseMarker(curwin);
                 deleteFoldMarkers(found_fp, recursive, found_off);
             }
+            did_one = TRUE;
 
             /* redraw window */
             changed_window_setting();
@@ -811 +813 @@
             redraw_curbuf_later(INVERTED);
 #endif
     }
+    else
+        /* Deleting markers may make cursor column invalid. */
+        check_cursor_col();
+
     if (last_lnum > 0)
         changed_lines(first_lnum, (colnr_T)0, last_lnum, 0L);
 }
@@ -1241 +1247 @@
  * Repeat "count" times.
  */
     static void
-setFoldRepeat(lnum, count, open)
+setFoldRepeat(lnum, count, do_open)
     linenr_T    lnum;
     long        count;
-    int         open;
+    int         do_open;
 {
     int         done;
     long        n;
@@ -1252 +1258 @@
     for (n = 0; n < count; ++n)
     {
         done = DONE_NOTHING;
-        (void)setManualFold(lnum, open, FALSE, &done);
+        (void)setManualFold(lnum, do_open, FALSE, &done);
         if (!(done & DONE_ACTION))
         {
             /* Only give an error message when no fold could be opened. */

src/getchar.c

@@ -4702 +4702 @@
                         return FAIL;
                     if (mp->m_noremap != REMAP_YES && fprintf(fd, "nore") < 0)
                         return FAIL;
-                    if (fprintf(fd, cmd) < 0)
+                    if (fputs(cmd, fd) < 0)
                         return FAIL;
                     if (buf != NULL && fputs(" <buffer>", fd) < 0)
                         return FAIL;
@@ -4801 +4801 @@
             }
             if (IS_SPECIAL(c) || modifiers)     /* special key */
             {
-                if (fprintf(fd, (char *)get_special_key_name(c, modifiers)) < 0)
+                if (fputs((char *)get_special_key_name(c, modifiers), fd) < 0)
                     return FAIL;
                 continue;
             }

src/globals.h

@@ -1022 +1022 @@
 #endif
 #ifdef FEAT_AUTOCMD
 EXTERN char_u   *autocmd_fname INIT(= NULL); /* fname for <afile> on cmdline */
+EXTERN int      autocmd_fname_full;          /* autocmd_fname is full path */
 EXTERN int      autocmd_bufnr INIT(= 0);     /* fnum for <abuf> on cmdline */
 EXTERN char_u   *autocmd_match INIT(= NULL); /* name for <amatch> on cmdline */
 EXTERN int      did_cursorhold INIT(= FALSE); /* set when CursorHold t'gerd */
@@ -1339 +1340 @@
 
 #ifdef FEAT_NETBEANS_INTG
 EXTERN char *netbeansArg INIT(= NULL);  /* the -nb[:host:port:passwd] arg */
-EXTERN int netbeansCloseFile INIT(= 0); /* send killed if != 0 */
 EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */
 EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
 EXTERN int netbeansReadFile INIT(= 1);  /* OK to read from disk if != 0 */
@@ -1548 +1548 @@
 EXTERN time_t starttime;
 
 /*
+ * Some compilers warn for not using a return value, but in some situations we
+ * can't do anything useful with the value.  Assign to this variable to avoid
+ * the warning.
+ */
+EXTERN int ignored;
+EXTERN char *ignoredp;
+
+/*
  * Optional Farsi support.  Include it here, so EXTERN and INIT are defined.
  */
 #ifdef FEAT_FKMAP

src/gui_at_sb.c

@@ -1078 +1078 @@
     Cardinal    *num_params;    /* unused */
 {
     ScrollbarWidget sbw = (ScrollbarWidget)w;
+    /* Use a union to avoid a warning for the weird conversion from float to
+     * XtPointer.  Comes from Xaw/Scrollbar.c. */
+    union {
+        XtPointer xtp;
+        float xtf;
+    } xtpf;
 
     if (LookAhead(w, event))
         return;
@@ -1085 +1091 @@
     /* thumbProc is not pretty, but is necessary for backwards
        compatibility on those architectures for which it work{s,ed};
        the intent is to pass a (truncated) float by value. */
-    XtCallCallbacks(w, XtNthumbProc, *(XtPointer*)&sbw->scrollbar.top);
+    xtpf.xtf = sbw->scrollbar.top;
+    XtCallCallbacks(w, XtNthumbProc, xtpf.xtp);
     XtCallCallbacks(w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
 }
 

src/gui.c

@@ -139 +139 @@
                 /* The read returns when the child closes the pipe (or when
                  * the child dies for some reason). */
                 close(pipefd[1]);
-                (void)read(pipefd[0], &dummy, (size_t)1);
+                ignored = (int)read(pipefd[0], &dummy, (size_t)1);
                 close(pipefd[0]);
             }
 
@@ -3241 +3241 @@
             i = Rows;
             gui_update_tabline();
             Rows = i;
-            need_set_size = RESIZE_VERT;
+            need_set_size |= RESIZE_VERT;
             if (using_tabline)
                 fix_size = TRUE;
             if (!gui_use_tabline())
@@ -3275 +3275 @@
                 if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
                 {
                     if (i == SBAR_BOTTOM)
-                        need_set_size = RESIZE_VERT;
+                        need_set_size |= RESIZE_VERT;
                     else
-                        need_set_size = RESIZE_HOR;
+                        need_set_size |= RESIZE_HOR;
                     if (gui.which_scrollbars[i])
                         fix_size = TRUE;
                 }
@@ -3297 +3297 @@
             gui_mch_enable_menu(gui.menu_is_active);
             Rows = i;
             prev_menu_is_active = gui.menu_is_active;
-            need_set_size = RESIZE_VERT;
+            need_set_size |= RESIZE_VERT;
             if (gui.menu_is_active)
                 fix_size = TRUE;
         }
@@ -3308 +3308 @@
         {
             gui_mch_show_toolbar(using_toolbar);
             prev_toolbar = using_toolbar;
-            need_set_size = RESIZE_VERT;
+            need_set_size |= RESIZE_VERT;
             if (using_toolbar)
                 fix_size = TRUE;
         }
@@ -3318 +3318 @@
         {
             gui_mch_enable_footer(using_footer);
             prev_footer = using_footer;
-            need_set_size = RESIZE_VERT;
+            need_set_size |= RESIZE_VERT;
             if (using_footer)
                 fix_size = TRUE;
         }
@@ -3330 +3330 @@
             prev_tearoff = using_tearoff;
         }
 #endif
-        if (need_set_size)
+        if (need_set_size != 0)
         {
 #ifdef FEAT_GUI_GTK
-            long    c = Columns;
+            long    prev_Columns = Columns;
+            long    prev_Rows = Rows;
 #endif
             /* Adjust the size of the window to make the text area keep the
              * same size and to avoid that part of our window is off-screen
@@ -3349 +3350 @@
              * If you remove this, please test this command for resizing
              * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
              * Don't do this while starting up though.
-             * And don't change Rows, it may have be reduced intentionally
-             * when adding menu/toolbar/tabline. */
-            if (!gui.starting)
+             * Don't change Rows when adding menu/toolbar/tabline.
+             * Don't change Columns when adding vertical toolbar. */
+            if (!gui.starting && need_set_size != (RESIZE_VERT | RESIZE_HOR))
                 (void)char_avail();
-            Columns = c;
+            if ((need_set_size & RESIZE_VERT) == 0)
+                Rows = prev_Rows;
+            if ((need_set_size & RESIZE_HOR) == 0)
+                Columns = prev_Columns;
 #endif
         }
 #ifdef FEAT_WINDOWS

src/gui_gtk_x11.c

@@ -4070 +4070 @@
 
         if (mask & (XValue | YValue))
         {
-            int w, h;
-            gui_mch_get_screen_dimensions(&w, &h);
-            h += p_ghr + get_menu_tool_height();
-            w += get_menu_tool_width();
+            int ww, hh;
+            gui_mch_get_screen_dimensions(&ww, &hh);
+            hh += p_ghr + get_menu_tool_height();
+            ww += get_menu_tool_width();
             if (mask & XNegative)
-                x += w - pixel_width;
+                x += ww - pixel_width;
             if (mask & YNegative)
-                y += h - pixel_height;
+                y += hh - pixel_height;
 #ifdef HAVE_GTK2
             gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);
 #else

src/gui_x11.c

@@ -2450 +2450 @@
         *colorPtr = colortable[closest];
     }
 
-    free(colortable);
+    vim_free(colortable);
     return OK;
 }
 

src/gui_xmdlg.c

@@ -369 +369 @@
     char        buf[TEMP_BUF_SIZE];
     XmString    items[MAX_ENTRIES_IN_LIST];
     int         i;
-    int         index;
+    int         idx;
 
-    for (index = (int)ENCODING; index < (int)NONE; ++index)
-        count[index] = 0;
+    for (idx = (int)ENCODING; idx < (int)NONE; ++idx)
+        count[idx] = 0;
 
     /* First we insert the wild char into every single list. */
     if (fix != ENCODING)
@@ -503 +503 @@
     /*
      * Now loop trough the remaining lists and set them up.
      */
-    for (index = (int)NAME; index < (int)NONE; ++index)
+    for (idx = (int)NAME; idx < (int)NONE; ++idx)
     {
         Widget w;
 
-        if (fix == (enum ListSpecifier)index)
+        if (fix == (enum ListSpecifier)idx)
             continue;
 
-        switch ((enum ListSpecifier)index)
+        switch ((enum ListSpecifier)idx)
         {
             case NAME:
                 w = data->list[NAME];
@@ -525 +525 @@
                 w = (Widget)0;  /* for lint */
         }
 
-        for (i = 0; i < count[index]; ++i)
+        for (i = 0; i < count[idx]; ++i)
         {
-            items[i] = XmStringCreateLocalized(list[index][i]);
-            XtFree(list[index][i]);
+            items[i] = XmStringCreateLocalized(list[idx][i]);
+            XtFree(list[idx][i]);
         }
         XmListDeleteAllItems(w);
-        XmListAddItems(w, items, count[index], 1);
-        if (data->sel[index])
+        XmListAddItems(w, items, count[idx], 1);
+        if (data->sel[idx])
         {
             XmStringFree(items[0]);
-            items[0] = XmStringCreateLocalized(data->sel[index]);
+            items[0] = XmStringCreateLocalized(data->sel[idx]);
             XmListSelectItem(w, items[0], False);
             XmListSetBottomItem(w, items[0]);
         }
-        for (i = 0; i < count[index]; ++i)
+        for (i = 0; i < count[idx]; ++i)
             XmStringFree(items[i]);
     }
 }
@@ -695 +695 @@
         int         n;
         XmString    str;
         Arg         args[4];
-        char        *msg = _("no specific match");
+        char        *nomatch_msg = _("no specific match");
 
         n = 0;
-        str = XmStringCreateLocalized(msg);
+        str = XmStringCreateLocalized(nomatch_msg);
         XtSetArg(args[n], XmNlabelString, str); ++n;
         XtSetValues(data->sample, args, n);
         apply_fontlist(data->sample);
-        XmTextSetString(data->name, msg);
+        XmTextSetString(data->name, nomatch_msg);
         XmStringFree(str);
 
         return False;
@@ -886 +886 @@
     {
         int     i;
         int     max;
-        int     index = 0;
+        int     idx = 0;
         int     size;
-        char    str[128];
+        char    buf[128];
 
         for (i = 0, max = 0; i < data->num; i++)
         {
-            get_part(fn(data, i), 7, str);
-            size = atoi(str);
+            get_part(fn(data, i), 7, buf);
+            size = atoi(buf);
             if ((size > max) && (size < MAX_DISPLAY_SIZE))
             {
-                index = i;
+                idx = i;
                 max = size;
             }
         }
-        strcpy(big_font, fn(data, index));
+        strcpy(big_font, fn(data, idx));
     }
     data->old = XLoadQueryFont(XtDisplay(parent), big_font);
     data->old_list = gui_motif_create_fontlist(data->old);
@@ -1217 +1217 @@
 
         if (i != 0)
         {
-            char name[TEMP_BUF_SIZE];
-            char style[TEMP_BUF_SIZE];
-            char size[TEMP_BUF_SIZE];
-            char encoding[TEMP_BUF_SIZE];
+            char namebuf[TEMP_BUF_SIZE];
+            char stylebuf[TEMP_BUF_SIZE];
+            char sizebuf[TEMP_BUF_SIZE];
+            char encodingbuf[TEMP_BUF_SIZE];
             char *found;
 
             found = names[0];
 
-            name_part(found, name);
-            style_part(found, style);
-            size_part(found, size, data->in_pixels);
-            encoding_part(found, encoding);
-
-            if (strlen(name) > 0
-                    && strlen(style) > 0
-                    && strlen(size) > 0
-                    && strlen(encoding) > 0)
+            name_part(found, namebuf);
+            style_part(found, stylebuf);
+            size_part(found, sizebuf, data->in_pixels);
+            encoding_part(found, encodingbuf);
+
+            if (strlen(namebuf) > 0
+                    && strlen(stylebuf) > 0
+                    && strlen(sizebuf) > 0
+                    && strlen(encodingbuf) > 0)
             {
-                data->sel[NAME] = XtNewString(name);
-                data->sel[STYLE] = XtNewString(style);
-                data->sel[SIZE] = XtNewString(size);
-                data->sel[ENCODING] = XtNewString(encoding);
+                data->sel[NAME] = XtNewString(namebuf);
+                data->sel[STYLE] = XtNewString(stylebuf);
+                data->sel[SIZE] = XtNewString(sizebuf);
+                data->sel[ENCODING] = XtNewString(encodingbuf);
                 data->font_name = XtNewString(names[0]);
                 display_sample(data);
                 XmTextSetString(data->name, data->font_name);

src/gui_xmebw.c

@@ -1256 +1256 @@
     }
     else
     {
-        int adjust = 0;
+        adjust = 0;
 
 #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
         /*
@@ -1268 +1268 @@
         {
             case XmEXTERNAL_HIGHLIGHT:
                 adjust = (eb->primitive.highlight_thickness -
-                        (eb->pushbutton.default_button_shadow_thickness ?
-                         Xm3D_ENHANCE_PIXEL : 0));
+                         (eb->pushbutton.default_button_shadow_thickness
+                          ?  Xm3D_ENHANCE_PIXEL : 0));
                 break;
 
             case XmINTERNAL_HIGHLIGHT:
-                adjust = 0;
                 break;
 
             default:

src/if_cscope.c

@@ -74 +74 @@
     { "add",    cs_add,
                 N_("Add a new database"),     "add file|dir [pre-path] [flags]", 0 },
     { "find",   cs_find,
-                N_("Query for a pattern"),    FIND_USAGE, 1 },
+                N_("Query for a pattern"),    "find c|d|e|f|g|i|s|t name", 1 },
     { "help",   cs_help,
                 N_("Show this message"),      "help", 0 },
     { "kill",   cs_kill,
@@ -1177 +1177 @@
     (void)MSG_PUTS(_("cscope commands:\n"));
     while (cmdp->name != NULL)
     {
-        (void)smsg((char_u *)_("%-5s: %-30s (Usage: %s)"),
-                                      cmdp->name, _(cmdp->help), cmdp->usage);
+        char *help = _(cmdp->help);
+        int  space_cnt = 30 - vim_strsize((char_u *)help);
+
+        /* Use %*s rather than %30s to ensure proper alignment in utf-8 */
+        if (space_cnt < 0)
+            space_cnt = 0;
+        (void)smsg((char_u *)_("%-5s: %s%*s (Usage: %s)"),
+                                      cmdp->name,
+                                      help, space_cnt, " ",
+                                      cmdp->usage);
         if (strcmp(cmdp->name, "find") == 0)
-            MSG_PUTS(FIND_HELP);
+            MSG_PUTS(_("\n"
+                       "       c: Find functions calling this function\n"
+                       "       d: Find functions called by this function\n"
+                       "       e: Find this egrep pattern\n"
+                       "       f: Find this file\n"
+                       "       g: Find this definition\n"
+                       "       i: Find files #including this file\n"
+                       "       s: Find this C symbol\n"
+                       "       t: Find assignments to\n"));
+
         cmdp++;
     }
 

src/if_cscope.h

@@ -42 +42 @@
  * f 7name      Find this file
  * i 8name      Find files #including this file
  */
-#define FIND_USAGE "find c|d|e|f|g|i|s|t name"
-#define FIND_HELP "\n\
-       c: Find functions calling this function\n\
-       d: Find functions called by this function\n\
-       e: Find this egrep pattern\n\
-       f: Find this file\n\
-       g: Find this definition\n\
-       i: Find files #including this file\n\
-       s: Find this C symbol\n\
-       t: Find assignments to\n"
-
 
 typedef struct {
     char *  name;

src/if_perl.xs

@@ -136 +136 @@
 #  define Perl_newXS_flags dll_Perl_newXS_flags
 #endif
 # define Perl_sv_free dll_Perl_sv_free
+# if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
+#  define Perl_sv_free2 dll_Perl_sv_free2
+# endif
 # define Perl_sv_isa dll_Perl_sv_isa
 # define Perl_sv_magic dll_Perl_sv_magic
 # define Perl_sv_setiv dll_Perl_sv_setiv
@@ -163 +166 @@
 # define Perl_Isv_yes_ptr dll_Perl_Isv_yes_ptr
 # define boot_DynaLoader dll_boot_DynaLoader
 
-# define Perl_sys_init3 dll_Perl_sys_init3
+# define Perl_sys_init dll_Perl_sys_init
 # define Perl_sys_term dll_Perl_sys_term
 # define Perl_ISv_ptr dll_Perl_ISv_ptr
 # define Perl_Istack_max_ptr dll_Perl_Istack_max_ptr
@@ -268 +271 @@
 static void (*boot_DynaLoader)_((pTHX_ CV*));
 
 #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
-static void (*Perl_sys_init3)(int* argc, char*** argv, char*** env);
+static void (*Perl_sv_free2)(pTHX_ SV*);
+static void (*Perl_sys_init)(int* argc, char*** argv);
 static void (*Perl_sys_term)(void);
 static SV** (*Perl_ISv_ptr)(register PerlInterpreter*);
 static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*);
@@ -367 +371 @@
     {"Perl_TXpv_ptr", (PERL_PROC*)&Perl_TXpv_ptr},
     {"Perl_Tna_ptr", (PERL_PROC*)&Perl_Tna_ptr},
 #else
-    {"Perl_sys_init3", (PERL_PROC*)&Perl_sys_init3},
+    {"Perl_sv_free2", (PERL_PROC*)&Perl_sv_free2},
+    {"Perl_sys_init", (PERL_PROC*)&Perl_sys_init},
     {"Perl_sys_term", (PERL_PROC*)&Perl_sys_term},
     {"Perl_ISv_ptr", (PERL_PROC*)&Perl_ISv_ptr},
     {"Perl_Istack_sp_ptr", (PERL_PROC*)&Perl_Istack_sp_ptr},
@@ -455 +460 @@
     static char *argv[] = { "", "-e", "" };
 
 #if (PERL_REVISION == 5) && (PERL_VERSION >= 10)
-    Perl_sys_init3(&argc, (char***)&argv, NULL);
+    Perl_sys_init(&argc, (char***)&argv);
 #endif
     perl_interp = perl_alloc();
     perl_construct(perl_interp);

src/if_python.c

@@ -531 +531 @@
         if (PythonMod_Init())
             goto fail;
 
+        /* Remove the element from sys.path that was added because of our
+         * argv[0] value in PythonMod_Init().  Previously we used an empty
+         * string, but dependinding on the OS we then get an empty entry or
+         * the current directory in sys.path. */
+        PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
+
         /* the first python thread is vim's, release the lock */
         Python_SaveThread();
 
@@ -1145 +1151 @@
 
     /* Check if we run into a recursive loop.  The item must be in lookupDict
      * then and we can use it again. */
-    sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U, (long_u)our_tv);
-    result = PyDict_GetItemString(lookupDict, ptrBuf);
-    if (result != NULL)
-        Py_INCREF(result);
-    else if (our_tv->v_type == VAR_STRING)
+    if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL)
+            || (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL))
+    {
+        sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U,
+                our_tv->v_type == VAR_LIST ? (long_u)our_tv->vval.v_list
+                                           : (long_u)our_tv->vval.v_dict);
+        result = PyDict_GetItemString(lookupDict, ptrBuf);
+        if (result != NULL)
+        {
+            Py_INCREF(result);
+            return result;
+        }
+    }
+
+    if (our_tv->v_type == VAR_STRING)
     {
         result = Py_BuildValue("s", our_tv->vval.v_string);
-        PyDict_SetItemString(lookupDict, ptrBuf, result);
     }
     else if (our_tv->v_type == VAR_NUMBER)
     {
@@ -1161 +1176 @@
         /* For backwards compatibility numbers are stored as strings. */
         sprintf(buf, "%ld", (long)our_tv->vval.v_number);
         result = Py_BuildValue("s", buf);
-        PyDict_SetItemString(lookupDict, ptrBuf, result);
     }
 # ifdef FEAT_FLOAT
     else if (our_tv->v_type == VAR_FLOAT)
@@ -1170 +1184 @@
 
         sprintf(buf, "%f", our_tv->vval.v_float);
         result = Py_BuildValue("s", buf);
-        PyDict_SetItemString(lookupDict, ptrBuf, result);
     }
 # endif
     else if (our_tv->v_type == VAR_LIST)
@@ -1179 +1192 @@
         listitem_T      *curr;
 
         result = PyList_New(0);
-        PyDict_SetItemString(lookupDict, ptrBuf, result);
 
         if (list != NULL)
         {
+            PyDict_SetItemString(lookupDict, ptrBuf, result);
+
             for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
             {
                 newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict);
@@ -1194 +1208 @@
     else if (our_tv->v_type == VAR_DICT)
     {
         result = PyDict_New();
-        PyDict_SetItemString(lookupDict, ptrBuf, result);
 
         if (our_tv->vval.v_dict != NULL)
         {
@@ -1203 +1216 @@
             hashitem_T  *hi;
             dictitem_T  *di;
 
+            PyDict_SetItemString(lookupDict, ptrBuf, result);
+
             for (hi = ht->ht_array; todo > 0; ++hi)
             {
                 if (!HASHITEM_EMPTY(hi))
@@ -2345 +2360 @@
 {
     PyObject *mod;
     PyObject *dict;
-    static char *(argv[2]) = {"", NULL};
+    /* The special value is removed from sys.path in Python_Init(). */
+    static char *(argv[2]) = {"/must>not&exist/foo", NULL};
 
     /* Fixups... */
     BufferType.ob_type = &PyType_Type;

src/if_xcmdsrv.c

@@ -736 +736 @@
                 + serverReply.ga_len;
             e.id = w;
             ga_init2(&e.strings, 1, 100);
-            memcpy(p, &e, sizeof(e));
+            mch_memmove(p, &e, sizeof(e));
             serverReply.ga_len++;
         }
     }
@@ -1018 +1018 @@
         p++;
         count = numItems - (p - regProp);
         if (count > 0)
-            memcpy(entry, p, count);
+            mch_memmove(entry, p, count);
         XChangeProperty(dpy, RootWindow(dpy, 0), registryProperty, XA_STRING,
                         8, PropModeReplace, regProp,
                         (int)(numItems - (p - entry)));
@@ -1072 +1072 @@
                 p++;
                 lastHalf = numItems - (p - regProp);
                 if (lastHalf > 0)
-                    memcpy(entry, p, lastHalf);
+                    mch_memmove(entry, p, lastHalf);
                 numItems = (entry - regProp) + lastHalf;
                 p = entry;
                 continue;

src/main.c

@@ -645 +645 @@
 
 #ifdef FEAT_VIMINFO
     /*
-     * Read in registers, history etc, but not marks, from the viminfo file
+     * Read in registers, history etc, but not marks, from the viminfo file.
+     * This is where v:oldfiles gets filled.
      */
     if (*p_viminfo != NUL)
     {
-        read_viminfo(NULL, TRUE, FALSE, FALSE);
+        read_viminfo(NULL, VIF_WANT_INFO | VIF_GET_OLDFILES);
         TIME_MSG("reading viminfo");
     }
 #endif
@@ -1457 +1458 @@
         ++initstr;
     }
 
-    if (TOLOWER_ASC(initstr[0]) == 'g' || initstr[0] == 'k')
+    /* "gvim" starts the GUI.  Also accept "Gvim" for MS-Windows. */
+    if (TOLOWER_ASC(initstr[0]) == 'g')
     {
         main_start_gui();
 #ifdef FEAT_GUI
@@ -1508 +1510 @@
 early_arg_scan(parmp)
     mparm_T     *parmp;
 {
-#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER)
+#if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
+        || !defined(FEAT_NETBEANS_INTG)
     int         argc = parmp->argc;
     char        **argv = parmp->argv;
     int         i;
@@ -1580 +1583 @@
         else if (STRICMP(argv[i], "--echo-wid") == 0)
             echo_wid_arg = TRUE;
 # endif
+# ifndef FEAT_NETBEANS_INTG
+        else if (strncmp(argv[i], "-nb", (size_t)3) == 0)
+        {
+            mch_errmsg(_("'-nb' cannot be used: not enabled at compile time\n"));
+            mch_exit(2);
+        }
+# endif
+
     }
 #endif
 }
@@ -2361 +2372 @@
      * Is there any other system that cannot do this?
      */
     close(0);
-    dup(2);
+    ignored = dup(2);
 #endif
 }
 

src/mark.c

@@ -1627 +1627 @@
 
 /*
  * Handle marks in the viminfo file:
- * fp_out == NULL   read marks for current buffer only
- * fp_out != NULL   copy marks for buffers not in buffer list
+ * fp_out != NULL: copy marks for buffers not in buffer list
+ * fp_out == NULL && (flags & VIF_WANT_MARKS): read marks for curbuf only
+ * fp_out == NULL && (flags & VIF_GET_OLDFILES | VIF_FORCEIT): fill v:oldfiles
  */
     void
-copy_viminfo_marks(virp, fp_out, count, eof)
+copy_viminfo_marks(virp, fp_out, count, eof, flags)
     vir_T       *virp;
     FILE        *fp_out;
     int         count;
     int         eof;
+    int         flags;
 {
     char_u      *line = virp->vir_line;
     buf_T       *buf;
@@ -1647 +1649 @@
     char_u      *p;
     char_u      *name_buf;
     pos_T       pos;
+#ifdef FEAT_EVAL
+    list_T      *list = NULL;
+#endif
 
     if ((name_buf = alloc(LSIZE)) == NULL)
         return;
     *name_buf = NUL;
+
+#ifdef FEAT_EVAL
+    if (fp_out == NULL && (flags & (VIF_GET_OLDFILES | VIF_FORCEIT)))
+    {
+        list = list_alloc();
+        if (list != NULL)
+            set_vim_var_list(VV_OLDFILES, list);
+    }
+#endif
+
     num_marked_files = get_viminfo_parameter('\'');
     while (!eof && (count < num_marked_files || fp_out == NULL))
     {
@@ -1681 +1696 @@
             p++;
         *p = NUL;
 
+#ifdef FEAT_EVAL
+        if (list != NULL)
+            list_append_string(list, str, -1);
+#endif
+
         /*
          * If fp_out == NULL, load marks for current buffer.
          * If fp_out != NULL, copy marks for buffers not in buflist.
@@ -1688 +1708 @@
         load_marks = copy_marks_out = FALSE;
         if (fp_out == NULL)
         {
-            if (curbuf->b_ffname != NULL)
+            if ((flags & VIF_WANT_MARKS) && curbuf->b_ffname != NULL)
             {
                 if (*name_buf == NUL)       /* only need to do this once */
                     home_replace(NULL, curbuf->b_ffname, name_buf, LSIZE, TRUE);

src/mbyte.c

@@ -717 +717 @@
                      * where mblen() returns 0 for invalid character.
                      * Therefore, following condition includes 0.
                      */
-                    (void)mblen(NULL, 0);       /* First reset the state. */
+                    ignored = mblen(NULL, 0);   /* First reset the state. */
                     if (mblen(buf, (size_t)1) <= 0)
                         n = 2;
                     else
@@ -2540 +2540 @@
     return (int)(p - q);
 }
 
-#if defined(FEAT_EVAL) || defined(PROTO)
 /*
  * Copy a character from "*fp" to "*tp" and advance the pointers.
  */
@@ -2555 +2554 @@
     *tp += l;
     *fp += l;
 }
-#endif
 
 /*
  * Return the offset from "p" to the first byte of a character.  When "p" is
@@ -3133 +3131 @@
         else
             s = p + 1;
     }
-    for (i = 0; s[i] != NUL && s + i < buf + sizeof(buf) - 1; ++i)
+    for (i = 0; s[i] != NUL && i < sizeof(buf) - 1; ++i)
     {
         if (s[i] == '_' || s[i] == '-')
             buf[i] = '-';
@@ -5280 +5278 @@
 
 /*ARGSUSED*/
     static void
-preedit_start_cbproc(XIC xic, XPointer client_data, XPointer call_data)
+preedit_start_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
 {
 #ifdef XIM_DEBUG
     xim_log("xim_decide_input_style()\n");
@@ -5314 +5312 @@
 
 /*ARGSUSED*/
     static void
-preedit_draw_cbproc(XIC xic, XPointer client_data, XPointer call_data)
+preedit_draw_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
 {
     XIMPreeditDrawCallbackStruct *draw_data;
     XIMText     *text;
@@ -5386 +5384 @@
                         draw_feedback = (char *)alloc(draw_data->chg_first
                                                               + text->length);
                     else
-                        draw_feedback = realloc(draw_feedback,
+                        draw_feedback = vim_realloc(draw_feedback,
                                          draw_data->chg_first + text->length);
                     if (draw_feedback != NULL)
                     {
@@ -5455 +5453 @@
 
 /*ARGSUSED*/
     static void
-preedit_caret_cbproc(XIC xic, XPointer client_data, XPointer call_data)
+preedit_caret_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
 {
 #ifdef XIM_DEBUG
     xim_log("preedit_caret_cbproc()\n");
@@ -5464 +5462 @@
 
 /*ARGSUSED*/
     static void
-preedit_done_cbproc(XIC xic, XPointer client_data, XPointer call_data)
+preedit_done_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
 {
 #ifdef XIM_DEBUG
     xim_log("preedit_done_cbproc()\n");

src/menu.c

@@ -1120 +1120 @@
         parent = menu;
         menu = menu->children;
     }
+    vim_free(path_name);
 
     /* Now we have found the matching menu, and we list the mappings */
                                                     /* Highlight title */

src/message.c

@@ -4556 +4556 @@
                         remove_trailing_zeroes = TRUE;
                     }
 
-                    if (fmt_spec == 'f' && abs_f > 1.0e307)
+                    if (fmt_spec == 'f' &&
+#ifdef VAX
+                            abs_f > 1.0e38
+#else
+                            abs_f > 1.0e307
+#endif
+                            )
                     {
                         /* Avoid a buffer overflow */
                         strcpy(tmp, "inf");
@@ -4585 +4591 @@
                         if (remove_trailing_zeroes)
                         {
                             int i;
-                            char *p;
+                            char *tp;
 
                             /* Using %g or %G: remove superfluous zeroes. */
                             if (fmt_spec == 'f')
-                                p = tmp + str_arg_l - 1;
+                                tp = tmp + str_arg_l - 1;
                             else
                             {
-                                p = (char *)vim_strchr((char_u *)tmp,
+                                tp = (char *)vim_strchr((char_u *)tmp,
                                                  fmt_spec == 'e' ? 'e' : 'E');
-                                if (p != NULL)
+                                if (tp != NULL)
                                 {
                                     /* Remove superfluous '+' and leading
                                      * zeroes from the exponent. */
-                                    if (p[1] == '+')
+                                    if (tp[1] == '+')
                                     {
                                         /* Change "1.0e+07" to "1.0e07" */
-                                        STRMOVE(p + 1, p + 2);
+                                        STRMOVE(tp + 1, tp + 2);
                                         --str_arg_l;
                                     }
-                                    i = (p[1] == '-') ? 2 : 1;
-                                    while (p[i] == '0')
+                                    i = (tp[1] == '-') ? 2 : 1;
+                                    while (tp[i] == '0')
                                     {
                                         /* Change "1.0e07" to "1.0e7" */
-                                        STRMOVE(p + i, p + i + 1);
+                                        STRMOVE(tp + i, tp + i + 1);
                                         --str_arg_l;
                                     }
-                                    --p;
+                                    --tp;
                                 }
                             }
 
-                            if (p != NULL && !precision_specified)
+                            if (tp != NULL && !precision_specified)
                                 /* Remove trailing zeroes, but keep the one
                                  * just after a dot. */
-                                while (p > tmp + 2 && *p == '0' && p[-1] != '.')
+                                while (tp > tmp + 2 && *tp == '0'
+                                                             && tp[-1] != '.')
                                 {
-                                    STRMOVE(p, p + 1);
-                                    --p;
+                                    STRMOVE(tp, tp + 1);
+                                    --tp;
                                     --str_arg_l;
                                 }
                         }
                         else
                         {
-                            char *p;
+                            char *tp;
 
                             /* Be consistent: some printf("%e") use 1.0e+12
                              * and some 1.0e+012.  Remove one zero in the last
                              * case. */
-                            p = (char *)vim_strchr((char_u *)tmp,
+                            tp = (char *)vim_strchr((char_u *)tmp,
                                                  fmt_spec == 'e' ? 'e' : 'E');
-                            if (p != NULL && (p[1] == '+' || p[1] == '-')
-                                          && p[2] == '0'
-                                          && vim_isdigit(p[3])
-                                          && vim_isdigit(p[4]))
+                            if (tp != NULL && (tp[1] == '+' || tp[1] == '-')
+                                          && tp[2] == '0'
+                                          && vim_isdigit(tp[3])
+                                          && vim_isdigit(tp[4]))
                             {
-                                STRMOVE(p + 2, p + 3);
+                                STRMOVE(tp + 2, tp + 3);
                                 --str_arg_l;
                             }
                         }

src/misc1.c

@@ -3245 +3245 @@
 
     /* When using ":silent" assume that <CR> was entered. */
     if (mouse_used != NULL)
-        MSG_PUTS(_("Type number or click with mouse (<Enter> cancels): "));
+        MSG_PUTS(_("Type number and <Enter> or click with mouse (empty cancels): "));
     else
-        MSG_PUTS(_("Choice number (<Enter> cancels): "));
+        MSG_PUTS(_("Type number and <Enter> (empty cancels): "));
 
     /* Set the state such that text can be selected/copied/pasted and we still
      * get mouse events. */

src/misc2.c

@@ -873 +873 @@
             /* 3. check for available memory: call mch_avail_mem() */
             if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)
             {
-                vim_free((char *)p);    /* System is low... no go! */
+                free((char *)p);        /* System is low... no go! */
                 p = NULL;
             }
             else
@@ -1257 +1257 @@
     return escaped_string;
 }
 
-#if !defined(BACKSLASH_IN_FILENAME) || defined(FEAT_EVAL) || defined(PROTO)
 /*
  * Return TRUE when 'shell' has "csh" in the tail.
  */
@@ -1266 +1265 @@
 {
     return (strstr((char *)gettail(p_sh), "csh") != NULL);
 }
-#endif
 
-#if defined(FEAT_EVAL) || defined(PROTO)
 /*
  * Escape "string" for use as a shell argument with system().
  * This uses single quotes, except when we know we need to use double qoutes
@@ -1391 +1388 @@
 
     return escaped_string;
 }
-#endif
 
 /*
  * Like vim_strsave(), but make all characters uppercase.
@@ -2565 +2561 @@
     int         key;
     int         dlen = 0;
 
-    key = find_special_key(srcp, &modifiers, keycode);
+    key = find_special_key(srcp, &modifiers, keycode, FALSE);
     if (key == 0)
         return 0;
 
@@ -2601 +2597 @@
  * returns 0 if there is no match.
  */
     int
-find_special_key(srcp, modp, keycode)
+find_special_key(srcp, modp, keycode, keep_x_key)
     char_u      **srcp;
     int         *modp;
-    int         keycode; /* prefer key code, e.g. K_DEL instead of DEL */
+    int         keycode;     /* prefer key code, e.g. K_DEL instead of DEL */
+    int         keep_x_key;  /* don't translate xHome to Home key */
 {
     char_u      *last_dash;
     char_u      *end_of_name;
@@ -2672 +2669 @@
             else
             {
                 key = get_special_key_code(last_dash + 1);
-                key = handle_x_keys(key);
+                if (!keep_x_key)
+                    key = handle_x_keys(key);
             }
 
             /*
@@ -4698 +4696 @@
                                 stackp->ffs_filearray_cur = i + 1;
                                 ff_push(search_ctx, stackp);
 
-                                simplify_filename(file_path);
+                                if (!path_with_url(file_path))
+                                    simplify_filename(file_path);
                                 if (mch_dirname(ff_expand_buffer, MAXPATHL)
                                                                         == OK)
                                 {

src/move.c

@@ -280 +280 @@
 
         if (curwin->w_botline <= curbuf->b_ml.ml_line_count)
         {
-            if (curwin->w_cursor.lnum < curwin->w_botline
-                    && ((long)curwin->w_cursor.lnum
+            if (curwin->w_cursor.lnum < curwin->w_botline)
+            {
+              if (((long)curwin->w_cursor.lnum
                                              >= (long)curwin->w_botline - p_so
 #ifdef FEAT_FOLDING
                         || hasAnyFolding(curwin)
 #endif
                         ))
-            {
+              {
                 lineoff_T       loff;
 
-                /* Cursor is above botline, check if there are 'scrolloff'
-                 * window lines below the cursor.  If not, need to scroll. */
+                /* Cursor is (a few lines) above botline, check if there are
+                 * 'scrolloff' window lines below the cursor.  If not, need to
+                 * scroll. */
                 n = curwin->w_empty_rows;
                 loff.lnum = curwin->w_cursor.lnum;
 #ifdef FEAT_FOLDING
@@ -317 +319 @@
                 if (n >= p_so)
                     /* sufficient context, no need to scroll */
                     check_botline = FALSE;
+              }
+              else
+                  /* sufficient context, no need to scroll */
+                  check_botline = FALSE;
             }
             if (check_botline)
             {
@@ -509 +515 @@
     /* Approximate the value of w_botline */
     wp->w_botline += lnum - wp->w_topline;
     wp->w_topline = lnum;
+#ifdef FEAT_AUTOCMD
+    wp->w_topline_was_set = TRUE;
+#endif
 #ifdef FEAT_DIFF
     wp->w_topfill = 0;
 #endif

src/netbeans.c

@@ -1043 +1043 @@
         nbdebug(("EVT: %s", buf));
 /*      nb_send(buf, "netbeans_end");    avoid "write failed" messages */
         if (sd >= 0)
-            sock_write(sd, buf, (int)STRLEN(buf));  /* ignore errors */
+            ignored = sock_write(sd, buf, (int)STRLEN(buf));
     }
 }
 
@@ -2277 +2277 @@
             int serNum;
             int localTypeNum;
             int typeNum;
-# ifdef NBDEBUG
-            int len;
-# endif
             pos_T *pos;
 
             if (buf == NULL || buf->bufp == NULL)
@@ -2303 +2300 @@
             pos = get_off_or_lnum(buf->bufp, &args);
 
             cp = (char *)args;
-# ifdef NBDEBUG
-            len =
-# endif
-                strtol(cp, &cp, 10);
+            ignored = (int)strtol(cp, &cp, 10);
             args = (char_u *)cp;
 # ifdef NBDEBUG
-            if (len != -1)
+            if (ignored != -1)
             {
                 nbdebug(("    partial line annotation -- Not Yet Implemented!\n"));
             }
@@ -2924 +2918 @@
 }
 
 /*
- * Tell netbeans a file was closed.
+ * Tell netbeans that a file was deleted or wiped out.
  */
     void
-netbeans_file_closed(buf_T *bufp)
+netbeans_file_killed(buf_T *bufp)
 {
     int         bufno = nb_getbufno(bufp);
     nbbuf_T     *nbbuf = nb_get_buf(bufno);
     char        buffer[2*MAXPATHL];
 
-    if (!haveConnection || bufno < 0)
-        return;
-
-    if (!netbeansCloseFile)
-    {
-        nbdebug(("Ignoring file_closed for %s. File was closed from IDE\n",
-                    bufp->b_ffname));
+    if (!haveConnection || bufno == -1)
         return;
-    }
-
-    nbdebug(("netbeans_file_closed:\n"));
-    nbdebug(("    Closing bufno: %d", bufno));
-    if (curbuf != NULL && curbuf != bufp)
-    {
-        nbdebug(("    Curbuf bufno:  %d\n", nb_getbufno(curbuf)));
-    }
-    else if (curbuf == bufp)
-    {
-        nbdebug(("    curbuf == bufp\n"));
-    }
 
-    if (bufno <= 0)
-        return;
+    nbdebug(("netbeans_file_killed:\n"));
+    nbdebug(("    Killing bufno: %d", bufno));
 
     sprintf(buffer, "%d:killed=%d\n", bufno, r_cmdno);
 
     nbdebug(("EVT: %s", buffer));
 
-    nb_send(buffer, "netbeans_file_closed");
+    nb_send(buffer, "netbeans_file_killed");
 
     if (nbbuf != NULL)
         nbbuf->bufp = NULL;

src/normal.c

@@ -183 +183 @@
 static void     nv_cursorhold __ARGS((cmdarg_T *cap));
 #endif
 
+static char *e_noident = N_("E349: No identifier under cursor");
+
 /*
  * Function to be called for a Normal or Visual mode command.
  * The argument is a cmdarg_T.
@@ -578 +580 @@
     static int  old_mapped_len = 0;
 #endif
     int         idx;
+#ifdef FEAT_EVAL
+    int         set_prevcount = FALSE;
+#endif
 
     vim_memset(&ca, 0, sizeof(ca));     /* also resets ca.retval */
     ca.oap = oap;
@@ -613 +618 @@
     /* When not finishing an operator and no register name typed, reset the
      * count. */
     if (!finish_op && !oap->regname)
+    {
         ca.opcount = 0;
+#ifdef FEAT_EVAL
+        set_prevcount = TRUE;
+#endif
+    }
 
 #ifdef FEAT_AUTOCMD
     /* Restore counts from before receiving K_CURSORHOLD.  This means after
@@ -717 +727 @@
              * command, so that v:count can be used in an expression mapping
              * right after the count. */
             if (toplevel && stuff_empty())
-                set_vcount(ca.count0, ca.count0 == 0 ? 1 : ca.count0);
+            {
+                long count = ca.count0;
+
+                /* multiply with ca.opcount the same way as below */
+                if (ca.opcount != 0)
+                    count = ca.opcount * (count == 0 ? 1 : count);
+                set_vcount(count, count == 0 ? 1 : count, set_prevcount);
+                set_prevcount = FALSE;  /* only set v:prevcount once */
+            }
 #endif
             if (ctrl_w)
             {
@@ -804 +822 @@
      * Only set v:count when called from main() and not a stuffed command.
      */
     if (toplevel && stuff_empty())
-        set_vcount(ca.count0, ca.count1);
+        set_vcount(ca.count0, ca.count1, set_prevcount);
 #endif
 
     /*
@@ -1132 +1150 @@
         out_flush();
 #endif
 #ifdef FEAT_AUTOCMD
-    did_cursorhold = FALSE;
+    if (ca.cmdchar != K_IGNORE)
+        did_cursorhold = FALSE;
 #endif
 
     State = NORMAL;
@@ -3509 +3528 @@
         if (find_type & FIND_STRING)
             EMSG(_("E348: No string under cursor"));
         else
-            EMSG(_("E349: No identifier under cursor"));
+            EMSG(_(e_noident));
         return 0;
     }
     ptr += col;
@@ -5469 +5488 @@
                 STRCPY(buf, "he! ");
             else
             {
+                /* An external command will probably use an argument starting
+                 * with "-" as an option.  To avoid trouble we skip the "-". */
+                while (*ptr == '-' && n > 0)
+                {
+                    ++ptr;
+                    --n;
+                }
+                if (n == 0)
+                {
+                    EMSG(_(e_noident));  /* found dashes only */
+                    vim_free(buf);
+                    return;
+                }
+
                 /* When a count is given, turn it into a range.  Is this
                  * really what we want? */
                 isman = (STRCMP(kp, "man") == 0);
@@ -5511 +5544 @@
     /*
      * Now grab the chars in the identifier
      */
-    if (cmdchar == '*')
-        aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
-    else if (cmdchar == '#')
-        aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
-    else if (cmdchar == 'K' && !kp_help)
-        aux_ptr = (char_u *)" \t\\\"|!";
-    else
-        /* Don't escape spaces and Tabs in a tag with a backslash */
-        aux_ptr = (char_u *)"\\|\"";
-
-    p = buf + STRLEN(buf);
-    while (n-- > 0)
-    {
-        /* put a backslash before \ and some others */
-        if (vim_strchr(aux_ptr, *ptr) != NULL)
-            *p++ = '\\';
-#ifdef FEAT_MBYTE
-        /* When current byte is a part of multibyte character, copy all bytes
-         * of that character. */
-        if (has_mbyte)
+    if (cmdchar == 'K' && !kp_help)
+    {
+        /* Escape the argument properly for a shell command */
+        ptr = vim_strnsave(ptr, n);
+        p = vim_strsave_shellescape(ptr, TRUE);
+        vim_free(ptr);
+        if (p == NULL)
         {
-            int i;
-            int len = (*mb_ptr2len)(ptr) - 1;
-
-            for (i = 0; i < len && n >= 1; ++i, --n)
-                *p++ = *ptr++;
+            vim_free(buf);
+            return;
         }
+        buf = (char_u *)vim_realloc(buf, STRLEN(buf) + STRLEN(p) + 1);
+        if (buf == NULL)
+        {
+            vim_free(buf);
+            vim_free(p);
+            return;
+        }
+        STRCAT(buf, p);
+        vim_free(p);
+    }
+    else
+    {
+        if (cmdchar == '*')
+            aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\");
+        else if (cmdchar == '#')
+            aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
+        else
+            /* Don't escape spaces and Tabs in a tag with a backslash */
+            aux_ptr = (char_u *)"\\|\"\n*?[";
+
+        p = buf + STRLEN(buf);
+        while (n-- > 0)
+        {
+            /* put a backslash before \ and some others */
+            if (vim_strchr(aux_ptr, *ptr) != NULL)
+                *p++ = '\\';
+#ifdef FEAT_MBYTE
+            /* When current byte is a part of multibyte character, copy all
+             * bytes of that character. */
+            if (has_mbyte)
+            {
+                int i;
+                int len = (*mb_ptr2len)(ptr) - 1;
+
+                for (i = 0; i < len && n >= 1; ++i, --n)
+                    *p++ = *ptr++;
+            }
 #endif
-        *p++ = *ptr++;
+            *p++ = *ptr++;
+        }
+        *p = NUL;
     }
-    *p = NUL;
 
     /*
      * Execute the command.
@@ -6728 +6783 @@
     /* Visual mode "r" */
     if (VIsual_active)
     {
+        if (got_int)
+            reset_VIsual();
         nv_operator(cap);
         return;
     }
@@ -7784 +7841 @@
         else
             i = curwin->w_leftcol;
         /* Go to the middle of the screen line.  When 'number' is on and lines
-         * are wrapping the middle can be more to the left.*/
+         * are wrapping the middle can be more to the left. */
         if (cap->nchar == 'm')
             i += (W_WIDTH(curwin) - curwin_col_off()
                     + ((curwin->w_p_wrap && i > 0)

src/ops.c

@@ -2209 +2209 @@
     {
         for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
         {
+            int one_change;
+
             block_prep(oap, &bd, pos.lnum, FALSE);
             pos.col = bd.textcol;
-            did_change = swapchars(oap->op_type, &pos, bd.textlen);
+            one_change = swapchars(oap->op_type, &pos, bd.textlen);
+            did_change |= one_change;
 
 # ifdef FEAT_NETBEANS_INTG
-            if (usingNetbeans && did_change)
+            if (usingNetbeans && one_change)
             {
                 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
 

src/option.c

@@ -2593 +2593 @@
 #ifdef FEAT_VIMINFO
                             (char_u *)&p_viminfo, PV_NONE,
 #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
-                            {(char_u *)"", (char_u *)"'20,<50,s10,h,rA:,rB:"}
+                            {(char_u *)"", (char_u *)"'100,<50,s10,h,rA:,rB:"}
 #else
 # ifdef AMIGA
                             {(char_u *)"",
-                                 (char_u *)"'20,<50,s10,h,rdf0:,rdf1:,rdf2:"}
+                                 (char_u *)"'100,<50,s10,h,rdf0:,rdf1:,rdf2:"}
 # else
-                            {(char_u *)"", (char_u *)"'20,<50,s10,h"}
+                            {(char_u *)"", (char_u *)"'100,<50,s10,h"}
 # endif
 #endif
 #else
@@ -5407 +5407 @@
     int         did_chartab = FALSE;
     char_u      **gvarp;
     long_u      free_oldval = (options[opt_idx].flags & P_ALLOCED);
+#ifdef FEAT_GUI
+    /* set when changing an option that only requires a redraw in the GUI */
+    int         redraw_gui_only = FALSE;
+#endif
 
     /* Get the global option to compare with, otherwise we would have to check
      * two values for all local options. */
@@ -6055 +6059 @@
                     errmsg = (char_u *)N_("E596: Invalid font(s)");
             }
         }
+        redraw_gui_only = TRUE;
     }
 # ifdef FEAT_XFONTSET
     else if (varp == &p_guifontset)
@@ -6063 +6068 @@
             errmsg = (char_u *)N_("E597: can't select fontset");
         else if (gui.in_use && gui_init_font(p_guifontset, TRUE) != OK)
             errmsg = (char_u *)N_("E598: Invalid fontset");
+        redraw_gui_only = TRUE;
     }
 # endif
 # ifdef FEAT_MBYTE
@@ -6072 +6078 @@
             errmsg = (char_u *)N_("E533: can't select wide font");
         else if (gui_get_wide_font() == FAIL)
             errmsg = (char_u *)N_("E534: Invalid wide font");
+        redraw_gui_only = TRUE;
     }
 # endif
 #endif
@@ -6133 +6140 @@
 #ifdef FEAT_GUI
     /* 'guioptions' */
     else if (varp == &p_go)
+    {
         gui_init_which_components(oldval);
+        redraw_gui_only = TRUE;
+    }
 #endif
 
 #if defined(FEAT_GUI_TABLINE)
     /* 'guitablabel' */
     else if (varp == &p_gtl)
+    {
         redraw_tabline = TRUE;
+        redraw_gui_only = TRUE;
+    }
+    /* 'guitabtooltip' */
+    else if (varp == &p_gtt)
+    {
+        redraw_gui_only = TRUE;
+    }
 #endif
 
 #if defined(FEAT_MOUSE_TTY) && (defined(UNIX) || defined(VMS))
@@ -6717 +6735 @@
 
     if (curwin->w_curswant != MAXCOL)
         curwin->w_set_curswant = TRUE;  /* in case 'showbreak' changed */
-    check_redraw(options[opt_idx].flags);
+#ifdef FEAT_GUI
+    /* check redraw when it's not a GUI option or the GUI is active. */
+    if (!redraw_gui_only || gui.in_use)
+#endif
+        check_redraw(options[opt_idx].flags);
 
     return errmsg;
 }
@@ -7974 +7996 @@
         else /* curwin->w_p_scr > curwin->w_height */
             curwin->w_p_scr = curwin->w_height;
     }
+    if (p_hi < 0)
+    {
+        errmsg = e_positive;
+        p_hi = 0;
+    }
     if (p_report < 0)
     {
         errmsg = e_positive;
@@ -8227 +8254 @@
             {
                 if (number == 0 && string != NULL)
                 {
-                    int index;
+                    int idx;
 
                     /* Either we are given a string or we are setting option
                      * to zero. */
-                    for (index = 0; string[index] == '0'; ++index)
+                    for (idx = 0; string[idx] == '0'; ++idx)
                         ;
-                    if (string[index] != NUL || index == 0)
+                    if (string[idx] != NUL || idx == 0)
                     {
                         /* There's another character after zeros or the string
                          * is empty.  In both cases, we are trying to set a
@@ -8323 +8350 @@
     {
         --arg;                      /* put arg at the '<' */
         modifiers = 0;
-        key = find_special_key(&arg, &modifiers, TRUE);
+        key = find_special_key(&arg, &modifiers, TRUE, TRUE);
         if (modifiers)              /* can't handle modifiers here */
             key = 0;
     }

src/os_unix.c

@@ -315 +315 @@
     {-1,            "Unknown!", FALSE}
 };
 
+/*
+ * Write s[len] to the screen.
+ */
     void
 mch_write(s, len)
     char_u      *s;
     int         len;
 {
-    write(1, (char *)s, len);
+    ignored = (int)write(1, (char *)s, len);
     if (p_wd)           /* Unix is too fast, slow down a bit more */
         RealWaitForChar(read_cmd_fd, p_wd, NULL);
 }
@@ -2905 +2908 @@
      * Ignore any errors.
      */
 #if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK)
-    signal_stack = malloc(SIGSTKSZ);
+    signal_stack = (char *)alloc(SIGSTKSZ);
     init_signal_stack();
 #endif
 }
@@ -2936 +2939 @@
     }
 #  endif
 # endif
-# ifdef FEAT_X11
+    /* Don't close the display for GTK 1, it is done in exit(). */
+# if defined(FEAT_X11) && (!defined(FEAT_GUI_GTK) || defined(HAVE_GTK2))
     if (x11_display != NULL
 #  ifdef FEAT_XCLIPBOARD
             && x11_display != xterm_dpy
@@ -3926 +3930 @@
                  */
                 if (fd >= 0)
                 {
-                    dup(fd); /* To replace stdin  (file descriptor 0) */
-                    dup(fd); /* To replace stdout (file descriptor 1) */
-                    dup(fd); /* To replace stderr (file descriptor 2) */
+                    ignored = dup(fd); /* To replace stdin  (fd 0) */
+                    ignored = dup(fd); /* To replace stdout (fd 1) */
+                    ignored = dup(fd); /* To replace stderr (fd 2) */
 
                     /* Don't need this now that we've duplicated it */
                     close(fd);
@@ -3946 +3950 @@
                  * children can be kill()ed.  Don't do this when using pipes,
                  * because stdin is not a tty, we would lose /dev/tty. */
                 if (p_stmp)
+                {
                     (void)setsid();
+#  if defined(SIGHUP)
+                    /* When doing "!xterm&" and 'shell' is bash: the shell
+                     * will exit and send SIGHUP to all processes in its
+                     * group, killing the just started process.  Ignore SIGHUP
+                     * to avoid that. (suggested by Simon Schubert)
+                     */
+                    signal(SIGHUP, SIG_IGN);
+#  endif
+                }
 # endif
 # ifdef FEAT_GUI
                 if (pty_slave_fd >= 0)
@@ -3996 +4010 @@
 
                     /* set up stdin/stdout/stderr for the child */
                     close(0);
-                    dup(pty_slave_fd);
+                    ignored = dup(pty_slave_fd);
                     close(1);
-                    dup(pty_slave_fd);
+                    ignored = dup(pty_slave_fd);
                     if (gui.in_use)
                     {
                         close(2);
-                        dup(pty_slave_fd);
+                        ignored = dup(pty_slave_fd);
                     }
 
                     close(pty_slave_fd);    /* has been dupped, close it now */
@@ -4013 +4027 @@
                     /* set up stdin for the child */
                     close(fd_toshell[1]);
                     close(0);
-                    dup(fd_toshell[0]);
+                    ignored = dup(fd_toshell[0]);
                     close(fd_toshell[0]);
 
                     /* set up stdout for the child */
                     close(fd_fromshell[0]);
                     close(1);
-                    dup(fd_fromshell[1]);
+                    ignored = dup(fd_fromshell[1]);
                     close(fd_fromshell[1]);
 
 # ifdef FEAT_GUI
@@ -4027 +4041 @@
                     {
                         /* set up stderr for the child */
                         close(2);
-                        dup(1);
+                        ignored = dup(1);
                     }
 # endif
                 }
@@ -4158 +4172 @@
                                             && (lnum !=
                                                     curbuf->b_ml.ml_line_count
                                                     || curbuf->b_p_eol)))
-                                    write(toshell_fd, "\n", (size_t)1);
+                                    ignored = write(toshell_fd, "\n",
+                                                                   (size_t)1);
                                 ++lnum;
                                 if (lnum > curbuf->b_op_end.lnum)
                                 {
@@ -6814 +6829 @@
     if (xsmp_icefd != -1)
     {
         SmcCloseConnection(xsmp.smcconn, 0, NULL);
-        vim_free(xsmp.clientid);
+        if (xsmp.clientid != NULL)
+            free(xsmp.clientid);
         xsmp.clientid = NULL;
         xsmp_icefd = -1;
     }

src/proto/eval.pro

@@ -17 +17 @@
 int eval_to_bool __ARGS((char_u *arg, int *error, char_u **nextcmd, int skip));
 char_u *eval_to_string_skip __ARGS((char_u *arg, char_u **nextcmd, int skip));
 int skip_expr __ARGS((char_u **pp));
-char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int dolist));
+char_u *eval_to_string __ARGS((char_u *arg, char_u **nextcmd, int convert));
 char_u *eval_to_string_safe __ARGS((char_u *arg, char_u **nextcmd, int use_sandbox));
 int eval_to_number __ARGS((char_u *expr));
 list_T *eval_spell_expr __ARGS((char_u *badword, char_u *expr));
@@ -46 +46 @@
 void list_unref __ARGS((list_T *l));
 void list_free __ARGS((list_T *l, int recurse));
 dictitem_T *dict_lookup __ARGS((hashitem_T *hi));
+char_u *list_find_str __ARGS((list_T *l, long idx));
 int list_append_dict __ARGS((list_T *list, dict_T *dict));
+int list_append_string __ARGS((list_T *l, char_u *str, int len));
 int garbage_collect __ARGS((void));
 dict_T *dict_alloc __ARGS((void));
 int dict_add_nr_str __ARGS((dict_T *d, char *key, long nr, char_u *str));
@@ -58 +60 @@
 void set_vim_var_nr __ARGS((int idx, long val));
 long get_vim_var_nr __ARGS((int idx));
 char_u *get_vim_var_str __ARGS((int idx));
-void set_vcount __ARGS((long count, long count1));
+list_T *get_vim_var_list __ARGS((int idx));
+void set_vcount __ARGS((long count, long count1, int set_prevcount));
 void set_vim_var_string __ARGS((int idx, char_u *val, int len));
+void set_vim_var_list __ARGS((int idx, list_T *val));
 void set_reg_var __ARGS((int c));
 char_u *v_exception __ARGS((char_u *oldval));
 char_u *v_throwpoint __ARGS((char_u *oldval));
@@ -94 +98 @@
 void write_viminfo_varlist __ARGS((FILE *fp));
 int store_session_globals __ARGS((FILE *fd));
 void last_set_msg __ARGS((scid_T scriptID));
+void ex_oldfiles __ARGS((exarg_T *eap));
 int modify_fname __ARGS((char_u *src, int *usedlen, char_u **fnamep, char_u **bufp, int *fnamelen));
 char_u *do_string_sub __ARGS((char_u *str, char_u *pat, char_u *sub, char_u *flags));
 /* vim: set ft=c : */

src/proto/ex_cmds.pro

@@ -11 +11 @@
 char_u *make_filter_cmd __ARGS((char_u *cmd, char_u *itmp, char_u *otmp));
 void append_redir __ARGS((char_u *buf, char_u *opt, char_u *fname));
 int viminfo_error __ARGS((char *errnum, char *message, char_u *line));
-int read_viminfo __ARGS((char_u *file, int want_info, int want_marks, int forceit));
+int read_viminfo __ARGS((char_u *file, int flags));
 void write_viminfo __ARGS((char_u *file, int forceit));
 int viminfo_readline __ARGS((vir_T *virp));
 char_u *viminfo_readstring __ARGS((vir_T *virp, int off, int convert));

src/proto/ex_getln.pro

@@ -31 +31 @@
 void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
 int expand_cmdline __ARGS((expand_T *xp, char_u *str, int col, int *matchcount, char_u ***matches));
 int ExpandGeneric __ARGS((expand_T *xp, regmatch_T *regmatch, int *num_file, char_u ***file, char_u *((*func)(expand_T *, int))));
-char_u *globpath __ARGS((char_u *path, char_u *file));
+char_u *globpath __ARGS((char_u *path, char_u *file, int expand_options));
 void init_history __ARGS((void));
 int get_histtype __ARGS((char_u *name));
 void add_to_history __ARGS((int histype, char_u *new_entry, int in_map, int sep));

src/proto/mark.pro

@@ -26 +26 @@
 void write_viminfo_filemarks __ARGS((FILE *fp));
 int removable __ARGS((char_u *name));
 int write_viminfo_marks __ARGS((FILE *fp_out));
-void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof));
+void copy_viminfo_marks __ARGS((vir_T *virp, FILE *fp_out, int count, int eof, int flags));
 /* vim: set ft=c : */

src/proto/misc2.pro

@@ -59 +59 @@
 int handle_x_keys __ARGS((int key));
 char_u *get_special_key_name __ARGS((int c, int modifiers));
 int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode));
-int find_special_key __ARGS((char_u **srcp, int *modp, int keycode));
+int find_special_key __ARGS((char_u **srcp, int *modp, int keycode, int keep_x_key));
 int extract_modifiers __ARGS((int key, int *modp));
 int find_special_key_in_table __ARGS((int c));
 int get_special_key_code __ARGS((char_u *name));

src/proto/netbeans.pro

@@ -11 +11 @@
 void netbeans_frame_moved __ARGS((int new_x, int new_y));
 void netbeans_file_activated __ARGS((buf_T *bufp));
 void netbeans_file_opened __ARGS((buf_T *bufp));
-void netbeans_file_closed __ARGS((buf_T *bufp));
+void netbeans_file_killed __ARGS((buf_T *bufp));
 void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen));
 void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
 void netbeans_unmodified __ARGS((buf_T *bufp));

src/pty.c

@@ -270 +270 @@
 }
 #endif
 
-#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux)
+#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) && !defined(MACOS_X)
 
-/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work! */
+/* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work!
+ * Same for Mac OS X Leopard. */
 #define PTY_DONE
     int
 OpenPTY(ttyn)

src/screen.c

@@ -2439 +2439 @@
 
 #ifdef FEAT_SYN_HL
     /* Show 'cursorcolumn' in the fold line. */
-    if (wp->w_p_cuc && (int)wp->w_virtcol + txtcol < W_WIDTH(wp))
-        ScreenAttrs[off + wp->w_virtcol + txtcol] = hl_combine_attr(
-                 ScreenAttrs[off + wp->w_virtcol + txtcol], hl_attr(HLF_CUC));
+    if (wp->w_p_cuc)
+    {
+        txtcol += wp->w_virtcol;
+        if (wp->w_p_wrap)
+            txtcol -= wp->w_skipcol;
+        else
+            txtcol -= wp->w_leftcol;
+        if (txtcol >= 0 && txtcol < W_WIDTH(wp))
+            ScreenAttrs[off + txtcol] = hl_combine_attr(
+                                 ScreenAttrs[off + txtcol], hl_attr(HLF_CUC));
+    }
 #endif
 
     SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp),

src/spell.c

@@ -77 +77 @@
 
 /*
  * Do the opposite: based on a maximum end score and a known sound score,
- * compute the the maximum word score that can be used.
+ * compute the maximum word score that can be used.
  */
 #define MAXSCORE(word_score, sound_score) ((4 * word_score - sound_score) / 3)
 
@@ -469 +469 @@
     garray_T    sl_comppat;     /* CHECKCOMPOUNDPATTERN items */
     regprog_T   *sl_compprog;   /* COMPOUNDRULE turned into a regexp progrm
                                  * (NULL when no compounding) */
+    char_u      *sl_comprules;  /* all COMPOUNDRULE concatenated (or NULL) */
     char_u      *sl_compstartflags; /* flags for first compound word */
     char_u      *sl_compallflags; /* all flags for compound words */
     char_u      sl_nobreak;     /* When TRUE: no spaces between words */
@@ -625 +626 @@
 /* TRUE if a word appears in the list of banned words.  */
 #define WAS_BANNED(su, word) (!HASHITEM_EMPTY(hash_find(&su->su_banned, word)))
 
-/* Number of suggestions kept when cleaning up.  we need to keep more than
+/* Number of suggestions kept when cleaning up.  We need to keep more than
  * what is displayed, because when rescore_suggestions() is called the score
  * may change and wrong suggestions may be removed later. */
 #define SUG_CLEAN_COUNT(su)    ((su)->su_maxcount < 130 ? 150 : (su)->su_maxcount + 20)
@@ -839 +840 @@
 static void slang_clear __ARGS((slang_T *lp));
 static void slang_clear_sug __ARGS((slang_T *lp));
 static void find_word __ARGS((matchinf_T *mip, int mode));
+static int match_checkcompoundpattern __ARGS((char_u *ptr, int wlen, garray_T *gap));
 static int can_compound __ARGS((slang_T *slang, char_u *word, char_u *flags));
+static int can_be_compound __ARGS((trystate_T *sp, slang_T *slang, char_u *compflags, int flag));
+static int match_compoundrule __ARGS((slang_T *slang, char_u *compflags));
 static int valid_word_prefix __ARGS((int totprefcnt, int arridx, int flags, char_u *word, slang_T *slang, int cond_req));
 static void find_prefix __ARGS((matchinf_T *mip, int mode));
 static int fold_more __ARGS((matchinf_T *mip));
@@ -1519 +1523 @@
                                             ((unsigned)flags >> 24)))
                     continue;
 
+                /* If there is a match with a CHECKCOMPOUNDPATTERN rule
+                 * discard the compound word. */
+                if (match_checkcompoundpattern(ptr, wlen, &slang->sl_comppat))
+                    continue;
+
                 if (mode == FIND_COMPOUND)
                 {
                     int     capflags;
@@ -1577 +1586 @@
                     if (!can_compound(slang, fword, mip->mi_compflags))
                         continue;
                 }
+                else if (slang->sl_comprules != NULL
+                             && !match_compoundrule(slang, mip->mi_compflags))
+                    /* The compound flags collected so far do not match any
+                     * COMPOUNDRULE, discard the compounded word. */
+                    continue;
             }
 
             /* Check NEEDCOMPOUND: can't use word without compounding. */
@@ -1727 +1741 @@
 }
 
 /*
+ * Return TRUE if there is a match between the word ptr[wlen] and
+ * CHECKCOMPOUNDPATTERN rules, assuming that we will concatenate with another
+ * word.
+ * A match means that the first part of CHECKCOMPOUNDPATTERN matches at the
+ * end of ptr[wlen] and the second part matches after it.
+ */
+    static int
+match_checkcompoundpattern(ptr, wlen, gap)
+    char_u      *ptr;
+    int         wlen;
+    garray_T    *gap;  /* &sl_comppat */
+{
+    int         i;
+    char_u      *p;
+    int         len;
+
+    for (i = 0; i + 1 < gap->ga_len; i += 2)
+    {
+        p = ((char_u **)gap->ga_data)[i + 1];
+        if (STRNCMP(ptr + wlen, p, STRLEN(p)) == 0)
+        {
+            /* Second part matches at start of following compound word, now
+             * check if first part matches at end of previous word. */
+            p = ((char_u **)gap->ga_data)[i];
+            len = (int)STRLEN(p);
+            if (len <= wlen && STRNCMP(ptr + wlen - len, p, len) == 0)
+                return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+/*
  * Return TRUE if "flags" is a valid sequence of compound flags and "word"
  * does not have too many syllables.
  */
@@ -1773 +1820 @@
 }
 
 /*
+ * Return TRUE when the sequence of flags in "compflags" plus "flag" can
+ * possibly form a valid compounded word.  This also checks the COMPOUNDRULE
+ * lines if they don't contain wildcards.
+ */
+    static int
+can_be_compound(sp, slang, compflags, flag)
+    trystate_T  *sp;
+    slang_T     *slang;
+    char_u      *compflags;
+    int         flag;
+{
+    /* If the flag doesn't appear in sl_compstartflags or sl_compallflags
+     * then it can't possibly compound. */
+    if (!byte_in_str(sp->ts_complen == sp->ts_compsplit
+                ? slang->sl_compstartflags : slang->sl_compallflags, flag))
+        return FALSE;
+
+    /* If there are no wildcards, we can check if the flags collected so far
+     * possibly can form a match with COMPOUNDRULE patterns.  This only
+     * makes sense when we have two or more words. */
+    if (slang->sl_comprules != NULL && sp->ts_complen > sp->ts_compsplit)
+    {
+        int v;
+
+        compflags[sp->ts_complen] = flag;
+        compflags[sp->ts_complen + 1] = NUL;
+        v = match_compoundrule(slang, compflags + sp->ts_compsplit);
+        compflags[sp->ts_complen] = NUL;
+        return v;
+    }
+
+    return TRUE;
+}
+
+
+/*
+ * Return TRUE if the compound flags in compflags[] match the start of any
+ * compound rule.  This is used to stop trying a compound if the flags
+ * collected so far can't possibly match any compound rule.
+ * Caller must check that slang->sl_comprules is not NULL.
+ */
+    static int
+match_compoundrule(slang, compflags)
+    slang_T     *slang;
+    char_u      *compflags;
+{
+    char_u      *p;
+    int         i;
+    int         c;
+
+    /* loop over all the COMPOUNDRULE entries */
+    for (p = slang->sl_comprules; *p != NUL; ++p)
+    {
+        /* loop over the flags in the compound word we have made, match
+         * them against the current rule entry */
+        for (i = 0; ; ++i)
+        {
+            c = compflags[i];
+            if (c == NUL)
+                /* found a rule that matches for the flags we have so far */
+                return TRUE;
+            if (*p == '/' || *p == NUL)
+                break;  /* end of rule, it's too short */
+            if (*p == '[')
+            {
+                int match = FALSE;
+
+                /* compare against all the flags in [] */
+                ++p;
+                while (*p != ']' && *p != NUL)
+                    if (*p++ == c)
+                        match = TRUE;
+                if (!match)
+                    break;  /* none matches */
+            }
+            else if (*p != c)
+                break;  /* flag of word doesn't match flag in pattern */
+            ++p;
+        }
+
+        /* Skip to the next "/", where the next pattern starts. */
+        p = vim_strchr(p, '/');
+        if (p == NULL)
+            break;
+    }
+
+    /* Checked all the rules and none of them match the flags, so there
+     * can't possibly be a compound starting with these flags. */
+    return FALSE;
+}
+
+/*
  * Return non-zero if the prefix indicated by "arridx" matches with the prefix
  * ID in "flags" for the word "word".
  * The WF_RAREPFX flag is included in the return value for a rare prefix.
@@ -2513 +2652 @@
     lp->sl_midword = NULL;
 
     vim_free(lp->sl_compprog);
+    vim_free(lp->sl_comprules);
     vim_free(lp->sl_compstartflags);
     vim_free(lp->sl_compallflags);
     lp->sl_compprog = NULL;
+    lp->sl_comprules = NULL;
     lp->sl_compstartflags = NULL;
     lp->sl_compallflags = NULL;
 
@@ -3460 +3601 @@
     char_u      *pp;
     char_u      *cp;
     char_u      *ap;
+    char_u      *crp;
     int         cnt;
     garray_T    *gap;
 
@@ -3545 +3687 @@
     slang->sl_compallflags = ap;
     *ap = NUL;
 
+    /* And a list of all patterns in their original form, for checking whether
+     * compounding may work in match_compoundrule().  This is freed when we
+     * encounter a wildcard, the check doesn't work then. */
+    crp = alloc(todo + 1);
+    slang->sl_comprules = crp;
+
     pp = pat;
     *pp++ = '^';
     *pp++ = '\\';
@@ -3587 +3735 @@
                     atstart = 0;
             }
         }
+
+        /* Copy flag to "sl_comprules", unless we run into a wildcard. */
+        if (crp != NULL)
+        {
+            if (c == '+' || c == '*')
+            {
+                vim_free(slang->sl_comprules);
+                slang->sl_comprules = NULL;
+                crp = NULL;
+            }
+            else
+                *crp++ = c;
+        }
+
         if (c == '/')       /* slash separates two items */
         {
             *pp++ = '\\';
@@ -3611 +3773 @@
     *pp++ = '$';
     *pp = NUL;
 
+    if (crp != NULL)
+        *crp = NUL;
+
     slang->sl_compprog = vim_regcomp(pat, RE_MAGIC + RE_STRING + RE_STRICT);
     vim_free(pat);
     if (slang->sl_compprog == NULL)
@@ -4915 +5080 @@
 } spellinfo_T;
 
 static afffile_T *spell_read_aff __ARGS((spellinfo_T *spin, char_u *fname));
+static int is_aff_rule __ARGS((char_u **items, int itemcnt, char *rulename, int  mincount));
 static void aff_process_flags __ARGS((afffile_T *affile, affentry_T *entry));
 static int spell_info_item __ARGS((char_u *s));
 static unsigned affitem2flag __ARGS((int flagtype, char_u *item, char_u *fname, int lnum));
@@ -4950 +5116 @@
 static void put_sugtime __ARGS((spellinfo_T *spin, FILE *fd));
 static int write_vim_spell __ARGS((spellinfo_T *spin, char_u *fname));
 static void clear_node __ARGS((wordnode_T *node));
-static int put_node __ARGS((FILE *fd, wordnode_T *node, int index, int regionmask, int prefixtree));
+static int put_node __ARGS((FILE *fd, wordnode_T *node, int idx, int regionmask, int prefixtree));
 static void spell_make_sugfile __ARGS((spellinfo_T *spin, char_u *wfname));
 static int sug_filltree __ARGS((spellinfo_T *spin, slang_T *slang));
 static int sug_maketable __ARGS((spellinfo_T *spin));
@@ -5223 +5389 @@
         /* Handle non-empty lines. */
         if (itemcnt > 0)
         {
-            if (STRCMP(items[0], "SET") == 0 && itemcnt == 2
-                                                       && aff->af_enc == NULL)
+            if (is_aff_rule(items, itemcnt, "SET", 2) && aff->af_enc == NULL)
             {
 #ifdef FEAT_MBYTE
                 /* Setup for conversion from "ENC" to 'encoding'. */
@@ -5239 +5404 @@
                     smsg((char_u *)_("Conversion in %s not supported"), fname);
 #endif
             }
-            else if (STRCMP(items[0], "FLAG") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "FLAG", 2)
                                               && aff->af_flagtype == AFT_CHAR)
             {
                 if (STRCMP(items[1], "long") == 0)
@@ -5284 +5449 @@
                         spin->si_info = p;
                     }
             }
-            else if (STRCMP(items[0], "MIDWORD") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "MIDWORD", 2)
                                                            && midword == NULL)
             {
                 midword = getroom_save(spin, items[1]);
             }
-            else if (STRCMP(items[0], "TRY") == 0 && itemcnt == 2)
+            else if (is_aff_rule(items, itemcnt, "TRY", 2))
             {
                 /* ignored, we look in the tree for what chars may appear */
             }
             /* TODO: remove "RAR" later */
-            else if ((STRCMP(items[0], "RAR") == 0
-                        || STRCMP(items[0], "RARE") == 0) && itemcnt == 2
-                                                       && aff->af_rare == 0)
+            else if ((is_aff_rule(items, itemcnt, "RAR", 2)
+                        || is_aff_rule(items, itemcnt, "RARE", 2))
+                                                         && aff->af_rare == 0)
             {
                 aff->af_rare = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
             }
             /* TODO: remove "KEP" later */
-            else if ((STRCMP(items[0], "KEP") == 0
-                    || STRCMP(items[0], "KEEPCASE") == 0) && itemcnt == 2
+            else if ((is_aff_rule(items, itemcnt, "KEP", 2)
+                        || is_aff_rule(items, itemcnt, "KEEPCASE", 2))
                                                      && aff->af_keepcase == 0)
             {
                 aff->af_keepcase = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
             }
-            else if (STRCMP(items[0], "BAD") == 0 && itemcnt == 2
-                                                       && aff->af_bad == 0)
+            else if ((is_aff_rule(items, itemcnt, "BAD", 2)
+                        || is_aff_rule(items, itemcnt, "FORBIDDENWORD", 2))
+                                                          && aff->af_bad == 0)
             {
                 aff->af_bad = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
             }
-            else if (STRCMP(items[0], "NEEDAFFIX") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "NEEDAFFIX", 2)
                                                     && aff->af_needaffix == 0)
             {
                 aff->af_needaffix = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
             }
-            else if (STRCMP(items[0], "CIRCUMFIX") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "CIRCUMFIX", 2)
                                                     && aff->af_circumfix == 0)
             {
                 aff->af_circumfix = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
             }
-            else if (STRCMP(items[0], "NOSUGGEST") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "NOSUGGEST", 2)
                                                     && aff->af_nosuggest == 0)
             {
                 aff->af_nosuggest = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
             }
-            else if (STRCMP(items[0], "NEEDCOMPOUND") == 0 && itemcnt == 2
+            else if ((is_aff_rule(items, itemcnt, "NEEDCOMPOUND", 2)
+                        || is_aff_rule(items, itemcnt, "ONLYINCOMPOUND", 2))
                                                      && aff->af_needcomp == 0)
             {
                 aff->af_needcomp = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
             }
-            else if (STRCMP(items[0], "COMPOUNDROOT") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "COMPOUNDROOT", 2)
                                                      && aff->af_comproot == 0)
             {
                 aff->af_comproot = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
             }
-            else if (STRCMP(items[0], "COMPOUNDFORBIDFLAG") == 0
-                                   && itemcnt == 2 && aff->af_compforbid == 0)
+            else if (is_aff_rule(items, itemcnt, "COMPOUNDFORBIDFLAG", 2)
+                                                   && aff->af_compforbid == 0)
             {
                 aff->af_compforbid = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
@@ -5354 +5521 @@
                     smsg((char_u *)_("Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line %d"),
                             fname, lnum);
             }
-            else if (STRCMP(items[0], "COMPOUNDPERMITFLAG") == 0
-                                   && itemcnt == 2 && aff->af_comppermit == 0)
+            else if (is_aff_rule(items, itemcnt, "COMPOUNDPERMITFLAG", 2)
+                                                   && aff->af_comppermit == 0)
             {
                 aff->af_comppermit = affitem2flag(aff->af_flagtype, items[1],
                                                                  fname, lnum);
@@ -5363 +5530 @@
                     smsg((char_u *)_("Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line %d"),
                             fname, lnum);
             }
-            else if (STRCMP(items[0], "COMPOUNDFLAG") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "COMPOUNDFLAG", 2)
                                                          && compflags == NULL)
             {
                 /* Turn flag "c" into COMPOUNDRULE compatible string "c+",
@@ -5376 +5543 @@
                     compflags = p;
                 }
             }
-            else if (STRCMP(items[0], "COMPOUNDRULE") == 0 && itemcnt == 2)
+            else if (is_aff_rule(items, itemcnt, "COMPOUNDRULES", 2))
+            {
+                /* We don't use the count, but do check that it's a number and
+                 * not COMPOUNDRULE mistyped. */
+                if (atoi((char *)items[1]) == 0)
+                    smsg((char_u *)_("Wrong COMPOUNDRULES value in %s line %d: %s"),
+                                                       fname, lnum, items[1]);
+            }
+            else if (is_aff_rule(items, itemcnt, "COMPOUNDRULE", 2))
             {
                 /* Concatenate this string to previously defined ones, using a
                  * slash to separate them. */
@@ -5395 +5570 @@
                     compflags = p;
                 }
             }
-            else if (STRCMP(items[0], "COMPOUNDWORDMAX") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "COMPOUNDWORDMAX", 2)
                                                               && compmax == 0)
             {
                 compmax = atoi((char *)items[1]);
@@ -5403 +5578 @@
                     smsg((char_u *)_("Wrong COMPOUNDWORDMAX value in %s line %d: %s"),
                                                        fname, lnum, items[1]);
             }
-            else if (STRCMP(items[0], "COMPOUNDMIN") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "COMPOUNDMIN", 2)
                                                            && compminlen == 0)
             {
                 compminlen = atoi((char *)items[1]);
@@ -5411 +5586 @@
                     smsg((char_u *)_("Wrong COMPOUNDMIN value in %s line %d: %s"),
                                                        fname, lnum, items[1]);
             }
-            else if (STRCMP(items[0], "COMPOUNDSYLMAX") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "COMPOUNDSYLMAX", 2)
                                                            && compsylmax == 0)
             {
                 compsylmax = atoi((char *)items[1]);
@@ -5419 +5594 @@
                     smsg((char_u *)_("Wrong COMPOUNDSYLMAX value in %s line %d: %s"),
                                                        fname, lnum, items[1]);
             }
-            else if (STRCMP(items[0], "CHECKCOMPOUNDDUP") == 0 && itemcnt == 1)
+            else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDDUP", 1))
             {
                 compoptions |= COMP_CHECKDUP;
             }
-            else if (STRCMP(items[0], "CHECKCOMPOUNDREP") == 0 && itemcnt == 1)
+            else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDREP", 1))
             {
                 compoptions |= COMP_CHECKREP;
             }
-            else if (STRCMP(items[0], "CHECKCOMPOUNDCASE") == 0 && itemcnt == 1)
+            else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDCASE", 1))
             {
                 compoptions |= COMP_CHECKCASE;
             }
-            else if (STRCMP(items[0], "CHECKCOMPOUNDTRIPLE") == 0
-                                                              && itemcnt == 1)
+            else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDTRIPLE", 1))
             {
                 compoptions |= COMP_CHECKTRIPLE;
             }
-            else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0
-                                                              && itemcnt == 2)
+            else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 2))
             {
                 if (atoi((char *)items[1]) == 0)
                     smsg((char_u *)_("Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"),
                                                        fname, lnum, items[1]);
             }
-            else if (STRCMP(items[0], "CHECKCOMPOUNDPATTERN") == 0
-                                                              && itemcnt == 3)
+            else if (is_aff_rule(items, itemcnt, "CHECKCOMPOUNDPATTERN", 3))
             {
                 garray_T    *gap = &spin->si_comppat;
                 int         i;
@@ -5463 +5635 @@
                                                = getroom_save(spin, items[2]);
                 }
             }
-            else if (STRCMP(items[0], "SYLLABLE") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "SYLLABLE", 2)
                                                           && syllable == NULL)
             {
                 syllable = getroom_save(spin, items[1]);
             }
-            else if (STRCMP(items[0], "NOBREAK") == 0 && itemcnt == 1)
+            else if (is_aff_rule(items, itemcnt, "NOBREAK", 1))
             {
                 spin->si_nobreak = TRUE;
             }
-            else if (STRCMP(items[0], "NOSPLITSUGS") == 0 && itemcnt == 1)
+            else if (is_aff_rule(items, itemcnt, "NOSPLITSUGS", 1))
             {
                 spin->si_nosplitsugs = TRUE;
             }
-            else if (STRCMP(items[0], "NOSUGFILE") == 0 && itemcnt == 1)
+            else if (is_aff_rule(items, itemcnt, "NOSUGFILE", 1))
             {
                 spin->si_nosugfile = TRUE;
             }
-            else if (STRCMP(items[0], "PFXPOSTPONE") == 0 && itemcnt == 1)
+            else if (is_aff_rule(items, itemcnt, "PFXPOSTPONE", 1))
             {
                 aff->af_pfxpostpone = TRUE;
             }
@@ -5771 +5943 @@
                     }
                 }
             }
-            else if (STRCMP(items[0], "FOL") == 0 && itemcnt == 2
-                                                               && fol == NULL)
+            else if (is_aff_rule(items, itemcnt, "FOL", 2) && fol == NULL)
             {
                 fol = vim_strsave(items[1]);
             }
-            else if (STRCMP(items[0], "LOW") == 0 && itemcnt == 2
-                                                               && low == NULL)
+            else if (is_aff_rule(items, itemcnt, "LOW", 2) && low == NULL)
             {
                 low = vim_strsave(items[1]);
             }
-            else if (STRCMP(items[0], "UPP") == 0 && itemcnt == 2
-                                                               && upp == NULL)
+            else if (is_aff_rule(items, itemcnt, "UPP", 2) && upp == NULL)
             {
                 upp = vim_strsave(items[1]);
             }
-            else if ((STRCMP(items[0], "REP") == 0
-                        || STRCMP(items[0], "REPSAL") == 0)
-                    && itemcnt == 2)
+            else if (is_aff_rule(items, itemcnt, "REP", 2)
+                     || is_aff_rule(items, itemcnt, "REPSAL", 2))
             {
                 /* Ignore REP/REPSAL count */;
                 if (!isdigit(*items[1]))
@@ -5819 +5987 @@
                                          : &spin->si_rep, items[1], items[2]);
                 }
             }
-            else if (STRCMP(items[0], "MAP") == 0 && itemcnt == 2)
+            else if (is_aff_rule(items, itemcnt, "MAP", 2))
             {
                 /* MAP item or count */
                 if (!found_map)
@@ -5856 +6024 @@
                     ga_append(&spin->si_map, '/');
                 }
             }
-            /* Accept "SAL from to" and "SAL from to # comment". */
-            else if (STRCMP(items[0], "SAL") == 0
-                    && (itemcnt == 3 || (itemcnt > 3 && items[3][0] == '#')))
+            /* Accept "SAL from to" and "SAL from to  #comment". */
+            else if (is_aff_rule(items, itemcnt, "SAL", 3))
             {
                 if (do_sal)
                 {
@@ -5877 +6044 @@
                                                                 : items[2]);
                 }
             }
-            else if (STRCMP(items[0], "SOFOFROM") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "SOFOFROM", 2)
                                                           && sofofrom == NULL)
             {
                 sofofrom = getroom_save(spin, items[1]);
             }
-            else if (STRCMP(items[0], "SOFOTO") == 0 && itemcnt == 2
+            else if (is_aff_rule(items, itemcnt, "SOFOTO", 2)
                                                             && sofoto == NULL)
             {
                 sofoto = getroom_save(spin, items[1]);
@@ -5980 +6147 @@
         else if (spin->si_newprefID == 0 || spin->si_newprefID == 127)
             MSG(_("Too many compound flags"));
         else
-            MSG(_("Too many posponed prefixes and/or compound flags"));
+            MSG(_("Too many postponed prefixes and/or compound flags"));
     }
 
     if (syllable != NULL)
@@ -6017 +6184 @@
 }
 
 /*
+ * Return TRUE when items[0] equals "rulename", there are "mincount" items or
+ * a comment is following after item "mincount".
+ */
+    static int
+is_aff_rule(items, itemcnt, rulename, mincount)
+    char_u      **items;
+    int         itemcnt;
+    char        *rulename;
+    int         mincount;
+{
+    return (STRCMP(items[0], rulename) == 0
+            && (itemcnt == mincount
+                || (itemcnt > mincount && items[mincount][0] == '#')));
+}
+
+/*
  * For affix "entry" move COMPOUNDFORBIDFLAG and COMPOUNDPERMITFLAG from
  * ae_flags to ae_comppermit and ae_compforbid.
  */
@@ -7926 +8109 @@
     char_u      *p;
     int         rr;
     int         retval = OK;
+    size_t      fwv = 1;  /* collect return value of fwrite() to avoid
+                             warnings from picky compiler */
 
     fd = mch_fopen((char *)fname, "w");
     if (fd == NULL)
@@ -7936 +8121 @@
 
     /* <HEADER>: <fileID> <versionnr> */
                                                             /* <fileID> */
-    if (fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd) != 1)
-    {
-        EMSG(_(e_write));
-        retval = FAIL;
-    }
+    fwv &= fwrite(VIMSPELLMAGIC, VIMSPELLMAGICL, (size_t)1, fd);
+    if (fwv != (size_t)1)
+        /* Catch first write error, don't try writing more. */
+        goto theend;
+
     putc(VIMSPELLVERSION, fd);                              /* <versionnr> */
 
     /*
@@ -7955 +8140 @@
 
         i = (int)STRLEN(spin->si_info);
         put_bytes(fd, (long_u)i, 4);                    /* <sectionlen> */
-        fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
+        fwv &= fwrite(spin->si_info, (size_t)i, (size_t)1, fd); /* <infotext> */
     }
 
     /* SN_REGION: <regionname> ...
@@ -7966 +8151 @@
         putc(SNF_REQUIRED, fd);                         /* <sectionflags> */
         l = spin->si_region_count * 2;
         put_bytes(fd, (long_u)l, 4);                    /* <sectionlen> */
-        fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
+        fwv &= fwrite(spin->si_region_name, (size_t)l, (size_t)1, fd);
                                                         /* <regionname> ... */
         regionmask = (1 << spin->si_region_count) - 1;
     }
@@ -8016 +8201 @@
         }
 
         put_bytes(fd, (long_u)l, 2);                    /* <folcharslen> */
-        fwrite(folchars, (size_t)l, (size_t)1, fd);     /* <folchars> */
+        fwv &= fwrite(folchars, (size_t)l, (size_t)1, fd); /* <folchars> */
     }
 
     /* SN_MIDWORD: <midword> */
@@ -8027 +8212 @@
 
         i = (int)STRLEN(spin->si_midword);
         put_bytes(fd, (long_u)i, 4);                    /* <sectionlen> */
-        fwrite(spin->si_midword, (size_t)i, (size_t)1, fd); /* <midword> */
+        fwv &= fwrite(spin->si_midword, (size_t)i, (size_t)1, fd);
+                                                        /* <midword> */
     }
 
     /* SN_PREFCOND: <prefcondcnt> <prefcond> ... */
@@ -8113 +8299 @@
                 p = rr == 1 ? ftp->ft_from : ftp->ft_to;
                 l = (int)STRLEN(p);
                 putc(l, fd);
-                fwrite(p, l, (size_t)1, fd);
+                if (l > 0)
+                    fwv &= fwrite(p, l, (size_t)1, fd);
             }
         }
 
@@ -8131 +8318 @@
                                                         /* <sectionlen> */
 
         put_bytes(fd, (long_u)l, 2);                    /* <sofofromlen> */
-        fwrite(spin->si_sofofr, l, (size_t)1, fd);      /* <sofofrom> */
+        fwv &= fwrite(spin->si_sofofr, l, (size_t)1, fd); /* <sofofrom> */
 
         l = (int)STRLEN(spin->si_sofoto);
         put_bytes(fd, (long_u)l, 2);                    /* <sofotolen> */
-        fwrite(spin->si_sofoto, l, (size_t)1, fd);      /* <sofoto> */
+        fwv &= fwrite(spin->si_sofoto, l, (size_t)1, fd); /* <sofoto> */
     }
 
     /* SN_WORDS: <word> ...
@@ -8160 +8347 @@
                     l = (int)STRLEN(hi->hi_key) + 1;
                     len += l;
                     if (round == 2)                     /* <word> */
-                        fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
+                        fwv &= fwrite(hi->hi_key, (size_t)l, (size_t)1, fd);
                     --todo;
                 }
             if (round == 1)
@@ -8176 +8363 @@
         putc(0, fd);                                    /* <sectionflags> */
         l = spin->si_map.ga_len;
         put_bytes(fd, (long_u)l, 4);                    /* <sectionlen> */
-        fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
+        fwv &= fwrite(spin->si_map.ga_data, (size_t)l, (size_t)1, fd);
                                                         /* <mapstr> */
     }
 
@@ -8232 +8419 @@
         {
             p = ((char_u **)(spin->si_comppat.ga_data))[i];
             putc((int)STRLEN(p), fd);                   /* <comppatlen> */
-            fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);/* <comppattext> */
+            fwv &= fwrite(p, (size_t)STRLEN(p), (size_t)1, fd);
+                                                        /* <comppattext> */
         }
                                                         /* <compflags> */
-        fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
+        fwv &= fwrite(spin->si_compflags, (size_t)STRLEN(spin->si_compflags),
                                                                (size_t)1, fd);
     }
 
@@ -8259 +8447 @@
 
         l = (int)STRLEN(spin->si_syllable);
         put_bytes(fd, (long_u)l, 4);                    /* <sectionlen> */
-        fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd); /* <syllable> */
+        fwv &= fwrite(spin->si_syllable, (size_t)l, (size_t)1, fd);
+                                                        /* <syllable> */
     }
 
     /* end of <SECTIONS> */
@@ -8295 +8484 @@
         (void)put_node(fd, tree, 0, regionmask, round == 3);
     }
 
-    /* Write another byte to check for errors. */
+    /* Write another byte to check for errors (file system full). */
     if (putc(0, fd) == EOF)
         retval = FAIL;
-
+theend:
     if (fclose(fd) == EOF)
         retval = FAIL;
 
+    if (fwv != (size_t)1)
+        retval = FAIL;
+    if (retval == FAIL)
+        EMSG(_(e_write));
+
     return retval;
 }
 
@@ -9890 +10084 @@
     char_u      *p;
     int         len;
     int         totlen;
+    size_t      x = 1;  /* collect return value of fwrite() */
 
     if (fd != NULL)
         put_bytes(fd, (long_u)gap->ga_len, 2);      /* <prefcondcnt> */
@@ -9906 +10101 @@
             if (fd != NULL)
             {
                 fputc(len, fd);
-                fwrite(p, (size_t)len, (size_t)1, fd);
+                x &= fwrite(p, (size_t)len, (size_t)1, fd);
             }
             totlen += len;
         }
@@ -11480 +11675 @@
                     vim_strncpy(preword + sp->ts_prewordlen,
                             tword + sp->ts_splitoff,
                             sp->ts_twordlen - sp->ts_splitoff);
-                    p = preword;
-                    while (*skiptowhite(p) != NUL)
-                        p = skipwhite(skiptowhite(p));
-                    if (fword_ends && !can_compound(slang, p,
-                                                compflags + sp->ts_compsplit))
-                        /* Compound is not allowed.  But it may still be
-                         * possible if we add another (short) word. */
+
+                    /* Verify CHECKCOMPOUNDPATTERN  rules. */
+                    if (match_checkcompoundpattern(preword,  sp->ts_prewordlen,
+                                                          &slang->sl_comppat))
                         compound_ok = FALSE;
 
+                    if (compound_ok)
+                    {
+                        p = preword;
+                        while (*skiptowhite(p) != NUL)
+                            p = skipwhite(skiptowhite(p));
+                        if (fword_ends && !can_compound(slang, p,
+                                                compflags + sp->ts_compsplit))
+                            /* Compound is not allowed.  But it may still be
+                             * possible if we add another (short) word. */
+                            compound_ok = FALSE;
+                    }
+
                     /* Get pointer to last char of previous word. */
                     p = preword + sp->ts_prewordlen;
                     mb_ptr_back(preword, p);
@@ -11685 +11889 @@
                         && (slang->sl_compsylmax < MAXWLEN
                             || sp->ts_complen + 1 - sp->ts_compsplit
                                                           < slang->sl_compmax)
-                        && (byte_in_str(sp->ts_complen == sp->ts_compsplit
-                                            ? slang->sl_compstartflags
-                                            : slang->sl_compallflags,
-                                                    ((unsigned)flags >> 24))))
+                        && (can_be_compound(sp, slang,
+                                         compflags, ((unsigned)flags >> 24))))
+
                 {
                     try_compound = TRUE;
                     compflags[sp->ts_complen] = ((unsigned)flags >> 24);

src/structs.h

@@ -459 +459 @@
 typedef struct
 {
     int         hide;                   /* TRUE when ":hide" was used */
-# ifdef FEAT_BROWSE
+# ifdef FEAT_BROWSE_CMD
     int         browse;                 /* TRUE to invoke file dialog */
 # endif
 # ifdef FEAT_WINDOWS
@@ -1784 +1784 @@
 #endif
 
     /*
-     * The next three specify the offsets for displaying the buffer:
+     * "w_topline", "w_leftcol" and "w_skipcol" specify the offsets for
+     * displaying the buffer.
      */
     linenr_T    w_topline;          /* buffer line number of the line at the
                                        top of the window */
+#ifdef FEAT_AUTOCMD
+    char        w_topline_was_set;  /* flag set to TRUE when topline is set,
+                                       e.g. by winrestview() */
+#endif
 #ifdef FEAT_DIFF
     int         w_topfill;          /* number of filler lines above w_topline */
     int         w_old_topfill;      /* w_topfill at last redraw */

src/tag.c

@@ -515 +515 @@
              * If a count is supplied to the ":tag <name>" command, then
              * jump to count'th matching tag.
              */
-            if (type == DT_TAG && count > 0)
+            if (type == DT_TAG && *tag != NUL && count > 0)
                 cur_match = count - 1;
 
             if (type == DT_SELECT || type == DT_JUMP
@@ -2725 +2725 @@
          */
         p_7f = vim_strchr(lbuf, 0x7f);
         if (p_7f == NULL)
+        {
+etag_fail:
+            if (vim_strchr(lbuf, '\n') == NULL)
+            {
+                /* Truncated line.  Ignore it. */
+                if (p_verbose >= 5)
+                {
+                    verbose_enter();
+                    MSG(_("Ignoring long line in tags file"));
+                    verbose_leave();
+                }
+                tagp->command = lbuf;
+                tagp->tagname = lbuf;
+                tagp->tagname_end = lbuf;
+                return OK;
+            }
             return FAIL;
+        }
 
         /* Find ^A.  If not found the line number is after the 0x7f */
         p = vim_strchr(p_7f, Ctrl_A);
@@ -2735 +2752 @@
             ++p;
 
         if (!VIM_ISDIGIT(*p))       /* check for start of line number */
-            return FAIL;
+            goto etag_fail;
         tagp->command = p;
 
 
@@ -2749 +2766 @@
             /* find end of tagname */
             for (p = p_7f - 1; !vim_iswordc(*p); --p)
                 if (p == lbuf)
-                    return FAIL;
+                    goto etag_fail;
             tagp->tagname_end = p + 1;
             while (p >= lbuf && vim_iswordc(*p))
                 --p;

src/term.c

@@ -4920 +4920 @@
         key_name[0] = KEY2TERMCAP0(key);
         key_name[1] = KEY2TERMCAP1(key);
         if (key_name[0] == KS_KEY)
-            string[new_slen++] = key_name[1];   /* from ":set <M-b>=xx" */
+        {
+            /* from ":set <M-b>=xx" */
+#ifdef FEAT_MBYTE
+            if (has_mbyte)
+                new_slen += (*mb_char2bytes)(key_name[1], string + new_slen);
+            else
+#endif
+                string[new_slen++] = key_name[1];
+        }
         else
         {
             string[new_slen++] = K_SPECIAL;

src/testdir/Makefile

@@ -26 +26 @@
 
 .SUFFIXES: .in .out
 
-nongui: nolog $(SCRIPTS)
-        @echo
-        @cat test.log
-        @echo ALL DONE
+nongui: nolog $(SCRIPTS) report
+
+gui:    nolog $(SCRIPTS) $(SCRIPTS_GUI) report
 
-gui:    nolog $(SCRIPTS) $(SCRIPTS_GUI)
+report:
         @echo
-        @cat test.log
-        @echo ALL DONE
+        @echo 'Test results:'
+        @/bin/sh -c "if test -f test.log; \
+                then cat test.log; echo TEST FAILURE; exit 1; \
+                else echo ALL DONE; \
+                fi"
 
 $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
 
@@ -71 +73 @@
 test60.out: test60.vim
 
 nolog:
-        -echo Test results: >test.log
+        -rm -f test.log

src/testdir/Make_ming.mak

@@ +1 @@
+# Makefile to run tests for Vim, on Dos-like machines
+# with sh.exe or zsh.exe in the path or not.
+#
+# Author: Bill McCarthy
+#
+# Note that test54 has been removed until it is fixed.
+#
+# Requires a set of Unix tools: echo, diff, etc.
+
+ifneq (sh.exe, $(SHELL))
+DEL = rm -f
+MV = mv
+CP = cp
+DIRSLASH = /
+else
+DEL = del
+MV = rename
+CP = copy
+DIRSLASH = \\
+endif
+
+VIMPROG = ..$(DIRSLASH)vim
+
+# Omitted:
+# test2         "\\tmp" doesn't work.
+# test10        'errorformat' is different
+# test12        can't unlink a swap file
+# test25        uses symbolic link
+# test27        can't edit file with "*" in file name
+# test31        16 bit version runs out of memory...
+
+SCRIPTS16 =     test1.out test19.out test20.out test22.out \
+                test23.out test24.out test28.out test29.out \
+                test35.out test36.out test43.out \
+                test44.out test45.out test46.out test47.out \
+                test48.out test51.out test53.out            \
+                test55.out test56.out test57.out test58.out test59.out \
+                test60.out test61.out test62.out test63.out test64.out
+
+# Had to remove test54 which doesn't work yet.
+#                                                test54.out
+
+SCRIPTS =       test3.out test4.out test5.out test6.out test7.out \
+                test8.out test9.out test11.out test13.out test14.out \
+                test15.out test17.out test18.out test21.out test26.out \
+                test30.out test31.out test32.out test33.out test34.out \
+                test37.out test38.out test39.out test40.out test41.out \
+                test42.out test52.out test65.out
+
+SCRIPTS32 =     test50.out
+
+SCRIPTS_GUI = test16.out
+
+.SUFFIXES: .in .out
+
+vimall: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS32)
+        echo ALL DONE
+
+nongui: fixff $(SCRIPTS16) $(SCRIPTS)
+        echo ALL DONE
+
+small:
+        echo ALL DONE
+
+gui:    fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI)
+        echo ALL DONE
+
+win32:  fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
+        echo ALL DONE
+
+fixff:
+        -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
+
+clean:
+        -$(DEL) *.out
+        -$(DEL) test.ok
+        -$(DEL) small.vim
+        -$(DEL) tiny.vim
+        -$(DEL) mbyte.vim
+        -$(DEL) X*
+        -$(DEL) viminfo
+
+.in.out:
+        $(CP) $*.ok test.ok
+        $(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
+        diff test.out $*.ok
+        -$(DEL) $*.out
+        $(MV) test.out $*.out
+        -$(DEL) X*
+        -$(DEL) test.ok
+        -$(DEL) viminfo

src/testdir/test42.ok

@@ -20 +20 @@
 ucs-2
 
 
-  fileencoding=ucs-2le
+  fileencoding=utf-16le
   bomb
 ucs-2le
 

src/ui.c

@@ -1820 +1820 @@
 #ifdef HAVE_DUP
             /* Use stderr for stdin, also works for shell commands. */
             close(0);
-            dup(2);
+            ignored = dup(2);
 #else
             read_cmd_fd = 2;    /* read from stderr instead of stdin */
 #endif
@@ -2020 +2020 @@
 
     if (value == NULL || *length == 0)
     {
-        clip_free_selection(cbd);       /* ???  [what's the query?] */
+        clip_free_selection(cbd);       /* nothing received, clear register */
         *(int *)success = FALSE;
         return;
     }
@@ -2076 +2076 @@
         text_prop.value = (unsigned char *)value;
         text_prop.encoding = *type;
         text_prop.format = *format;
-        text_prop.nitems = STRLEN(value);
+        text_prop.nitems = len;
         status = XmbTextPropertyToTextList(X_DISPLAY, &text_prop,
                                                          &text_list, &n_text);
         if (status != Success || n_text < 1)
@@ -2110 +2110 @@
     int         i;
     int         nbytes = 0;
     char_u      *buffer;
+    time_t      start_time;
+    int         timed_out = FALSE;
 
     for (i =
 #ifdef FEAT_MBYTE
@@ -2129 +2131 @@
             case 3:  type = text_atom;          break;
             default: type = XA_STRING;
         }
+        success = MAYBE;
         XtGetSelectionValue(myShell, cbd->sel_atom, type,
             clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
 
@@ -2141 +2144 @@
          * characters, then they will appear before the one that requested the
          * paste!  Don't worry, we will catch up with any other events later.
          */
-        for (;;)
+        start_time = time(NULL);
+        while (success == MAYBE)
         {
-            if (XCheckTypedEvent(dpy, SelectionNotify, &event))
-                break;
-            if (XCheckTypedEvent(dpy, SelectionRequest, &event))
-                /* We may get a SelectionRequest here and if we don't handle
-                 * it we hang.  KDE klipper does this, for example. */
+            if (XCheckTypedEvent(dpy, SelectionNotify, &event)
+                    || XCheckTypedEvent(dpy, SelectionRequest, &event)
+                    || XCheckTypedEvent(dpy, PropertyNotify, &event))
+            {
+                /* This is where clip_x11_request_selection_cb() should be
+                 * called.  It may actually happen a bit later, so we loop
+                 * until "success" changes.
+                 * We may get a SelectionRequest here and if we don't handle
+                 * it we hang.  KDE klipper does this, for example.
+                 * We need to handle a PropertyNotify for large selections. */
                 XtDispatchEvent(&event);
+                continue;
+            }
+
+            /* Time out after 2 to 3 seconds to avoid that we hang when the
+             * other process doesn't respond.  Note that the SelectionNotify
+             * event may still come later when the selection owner comes back
+             * to life and the text gets inserted unexpectedly.  Don't know
+             * why that happens or how to avoid that :-(. */
+            if (time(NULL) > start_time + 2)
+            {
+                timed_out = TRUE;
+                break;
+            }
 
             /* Do we need this?  Probably not. */
             XSync(dpy, False);
 
-            /* Bernhard Walle solved a slow paste response in an X terminal by
-             * adding: usleep(10000); here. */
+            /* Wait for 1 msec to avoid that we eat up all CPU time. */
+            ui_delay(1L, TRUE);
         }
 
-        /* this is where clip_x11_request_selection_cb() is actually called */
-        XtDispatchEvent(&event);
-
-        if (success)
+        if (success == TRUE)
             return;
+
+        /* don't do a retry with another type after timing out, otherwise we
+         * hang for 15 seconds. */
+        if (timed_out)
+            break;
     }
 
     /* Final fallback position - use the X CUT_BUFFER0 store */

src/version.c

@@ -677 +677 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    102,
+/**/
+    100,
+/**/
+    99,
+/**/
+    98,
+/**/
+    97,
+/**/
+    96,
+/**/
+    95,
+/**/
+    94,
+/**/
+    92,
+/**/
+    91,
+/**/
+    90,
+/**/
+    87,
+/**/
+    86,
+/**/
+    85,
+/**/
+    84,
+/**/
+    83,
+/**/
+    82,
+/**/
+    81,
+/**/
+    80,
+/**/
+    79,
+/**/
+    78,
+/**/
+    77,
+/**/
+    76,
+/**/
+    75,
+/**/
+    73,
+/**/
+    70,
+/**/
+    69,
+/**/
+    68,
+/**/
+    67,
+/**/
+    66,
+/**/
+    65,
+/**/
+    64,
+/**/
+    63,
+/**/
+    62,
+/**/
+    61,
+/**/
+    60,
+/**/
+    59,
+/**/
+    58,
+/**/
+    57,
+/**/
+    56,
+/**/
+    55,
+/**/
+    54,
+/**/
+    53,
+/**/
+    52,
+/**/
+    51,
+/**/
+    50,
+/**/
+    48,
+/**/
+    47,
+/**/
+    46,
+/**/
+    45,
+/**/
+    44,
+/**/
+    43,
+/**/
+    42,
+/**/
+    40,
+/**/
+    39,
+/**/
+    38,
+/**/
+    37,
+/**/
+    35,
+/**/
+    34,
+/**/
+    33,
+/**/
+    32,
+/**/
+    31,
+/**/
+    30,
+/**/
+    29,
+/**/
+    28,
+/**/
+    27,
+/**/
+    26,
+/**/
+    25,
+/**/
+    24,
+/**/
+    23,
+/**/
+    22,
+/**/
+    21,
+/**/
+    20,
+/**/
+    19,
+/**/
+    18,
+/**/
+    17,
+/**/
+    16,
+/**/
+    15,
+/**/
+    14,
+/**/
+    13,
+/**/
+    12,
+/**/
+    11,
+/**/
+    10,
+/**/
+    9,
+/**/
+    8,
+/**/
+    6,
+/**/
+    5,
+/**/
+    4,
+/**/
+    3,
+/**/
+    2,
+/**/
+    1,
+/**/
     0
 };
 
+/*
+ * Place to put a short description when adding a feature with a patch.
+ * Keep it short, e.g.,: "relative numbers", "persistent undo".
+ * Also add a comment marker to separate the lines.
+ * See the official Vim patches for the diff format: It must use a context of
+ * one line only.  Create it by hand or use "diff -C2" and edit the patch.
+ */
+static char *(extra_patches[]) =
+{   /* Add your patch description below this line */
+/**/
+    NULL
+};
+
     int
 highest_patch()
 {
@@ -786 +981 @@
     MSG_PUTS(_("\nRISC OS version"));
 #endif
 #ifdef VMS
-    MSG_PUTS("\nOpenVMS version");
+    MSG_PUTS(_("\nOpenVMS version"));
 # ifdef HAVE_PATHDEF
     if (*compiled_arch != NUL)
     {
@@ -825 +1020 @@
         }
     }
 
+    /* Print the list of extra patch descriptions if there is at least one. */
+    if (extra_patches[0] != NULL)
+    {
+        MSG_PUTS(_("\nExtra patches: "));
+        s = "";
+        for (i = 0; extra_patches[i] != NULL; ++i)
+        {
+            MSG_PUTS(s);
+            s = ", ";
+            MSG_PUTS(extra_patches[i]);
+        }
+    }
+
 #ifdef MODIFIED_BY
     MSG_PUTS("\n");
     MSG_PUTS(_("Modified by "));

src/vim.h

@@ -341 +341 @@
 #ifdef BACKSLASH_IN_FILENAME
 # define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`%#'\"|!<")
 #else
-# define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<")
-# define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&")
+# ifdef VMS
+    /* VMS allows a lot of characters in the file name */
+#  define PATH_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'\"|!")
+#  define SHELL_ESC_CHARS ((char_u *)" \t\n*?{`\\%#'|!()&")
+# else
+#  define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<")
+#  define SHELL_ESC_CHARS ((char_u *)" \t\n*?[{`$\\%#'\"|!<>();&")
+# endif
 #endif
 
 #define NUMBUFLEN 30        /* length of a buffer to store a number in ASCII */
@@ -370 +376 @@
    * Define __w64 as an empty token for everything but MSVC 7.x or later.
    */
 # if !defined(_MSC_VER) || (_MSC_VER < 1300)
-#  define __w64 
+#  define __w64
 # endif
 typedef unsigned long __w64     long_u;
 typedef          long __w64     long_i;
@@ -1728 +1734 @@
 #define VV_MOUSE_COL    51
 #define VV_OP           52
 #define VV_SEARCHFORWARD 53
-#define VV_LEN          54      /* number of v: vars */
+#define VV_OLDFILES     54
+#define VV_LEN          55      /* number of v: vars */
 
 #ifdef FEAT_CLIPBOARD
 
@@ -1979 +1986 @@
 # endif
 #endif
 
+#ifndef FEAT_NETBEANS_INTG
+# undef NBDEBUG
+#endif
 #ifdef NBDEBUG /* Netbeans debugging. */
 # include "nbdebug.h"
 #else
@@ -2054 +2064 @@
 #define DOSO_VIMRC      1       /* loading vimrc file */
 #define DOSO_GVIMRC     2       /* loading gvimrc file */
 
+/* flags for read_viminfo() and children */
+#define VIF_WANT_INFO           1       /* load non-mark info */
+#define VIF_WANT_MARKS          2       /* load file marks */
+#define VIF_FORCEIT             4       /* overwrite info already read */
+#define VIF_GET_OLDFILES        8       /* load v:oldfiles */
+
 #endif /* VIM__H */

src/window.c

@@ -4028 +4028 @@
             if (mch_dirname(cwd, MAXPATHL) == OK)
                 globaldir = vim_strsave(cwd);
         }
-        mch_chdir((char *)curwin->w_localdir);
-        shorten_fnames(TRUE);
+        if (mch_chdir((char *)curwin->w_localdir) == 0)
+            shorten_fnames(TRUE);
     }
     else if (globaldir != NULL)
     {
         /* Window doesn't have a local directory and we are not in the global
          * directory: Change to the global directory. */
-        mch_chdir((char *)globaldir);
+        ignored = mch_chdir((char *)globaldir);
         vim_free(globaldir);
         globaldir = NULL;
         shorten_fnames(TRUE);

src/workshop.c

@@ -1121 +1121 @@
                                       ? (char *)curbuf->b_sfname : "<None>");
 #endif
 
-    strcpy(ffname, (char *) curbuf->b_ffname);
-    *filename = ffname;         /* copy so nobody can change b_ffname */
+    if (curbuf->b_ffname == NULL)
+        ffname[0] = NUL;
+    else
+        /* copy so nobody can change b_ffname */
+        strcpy(ffname, (char *) curbuf->b_ffname);
+    *filename = ffname;
     *curLine = curwin->w_cursor.lnum;
     *curCol = curwin->w_cursor.col;