Changeset 4641a79

Timestamp:

Jul 22, 2012, 4:15:17 AM (12 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

1752595

Parents:

c1c44b9

Message:

Update vim 7.3 to patch level 608.

File:

• patches/vim-7.3-branch-update-5.patch (moved) (moved from patches/vim-7.3-branch_update-4.patch ) (1026 diffs)

patches/vim-7.3-branch-update-5.patch

@@ -1 @@
-Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk)
-Date: 2012-06-03
-Initial Package Version: 7.3
-Origin: Upstream
-Upstream Status: Applied
-Description: Contains all upstream patches up to 7.3.538
-
 diff -Naur vim73.orig/Filelist vim73/Filelist
---- vim73.orig/Filelist 2012-06-03 23:09:52.956007482 +0000
-+++ vim73/Filelist      2012-06-03 23:09:54.868058365 +0000
+--- vim73.orig/Filelist 2010-08-07 11:04:57.000000000 +0000
++++ vim73/Filelist      2012-07-20 20:31:18.230978438 +0000
 @@ -39,6 +39,7 @@
                 src/mark.c \
@@ -62 +55 @@
                 src/toolbar.phi \
  
-@@ -686,6 +683,8 @@
+@@ -466,6 +463,7 @@
+                runtime/macros/hanoi/hanoi.vim \
+                runtime/macros/hanoi/poster \
+                runtime/macros/justify.vim \
++               runtime/macros/less.bat \
+                runtime/macros/less.sh \
+                runtime/macros/less.vim \
+                runtime/macros/life/click.me \
+@@ -669,6 +667,8 @@
+ 
+ # generic language files
+ LANG_GEN = \
++               runtime/doc/*-de.1 \
++               runtime/doc/*-de.UTF-8.1 \
+                runtime/doc/*-fr.1 \
+                runtime/doc/*-fr.UTF-8.1 \
+                runtime/doc/*-it.1 \
+@@ -686,6 +686,8 @@
                 runtime/tutor/tutor.utf-8 \
                 runtime/tutor/tutor.?? \
@@ -72 +82 @@
                 runtime/spell/??/main.aap \
 diff -Naur vim73.orig/Makefile vim73/Makefile
---- vim73.orig/Makefile 2012-06-03 23:09:53.028009398 +0000
-+++ vim73/Makefile      2012-06-03 23:09:53.712027602 +0000
+--- vim73.orig/Makefile 2010-08-15 12:23:34.000000000 +0000
++++ vim73/Makefile      2012-07-20 20:31:09.600972239 +0000
 @@ -23,6 +23,9 @@
  # has run can result in compiling with $(CC) empty.
@@ -95 +105 @@
         cd src && $(MAKE) $@
 diff -Naur vim73.orig/README_extra.txt vim73/README_extra.txt
---- vim73.orig/README_extra.txt 2012-06-03 23:09:52.920006524 +0000
-+++ vim73/README_extra.txt      2012-06-03 23:09:54.124038565 +0000
+--- vim73.orig/README_extra.txt 2010-08-15 12:23:19.000000000 +0000
++++ vim73/README_extra.txt      2012-07-20 20:31:10.880973163 +0000
 @@ -13,9 +13,6 @@
  
@@ -108 +118 @@
  
 diff -Naur vim73.orig/runtime/doc/autocmd.txt vim73/runtime/doc/autocmd.txt
---- vim73.orig/runtime/doc/autocmd.txt  2012-06-03 23:09:53.024009292 +0000
-+++ vim73/runtime/doc/autocmd.txt       2012-06-03 23:09:55.576077206 +0000
+--- vim73.orig/runtime/doc/autocmd.txt  2010-08-15 12:23:19.000000000 +0000
++++ vim73/runtime/doc/autocmd.txt       2012-07-20 20:31:15.250976305 +0000
 @@ -299,6 +299,8 @@
  |InsertEnter|          starting Insert mode
@@ -183 +193 @@
                         the autocommands, not the buffers to which they are
 diff -Naur vim73.orig/runtime/doc/change.txt vim73/runtime/doc/change.txt
---- vim73.orig/runtime/doc/change.txt   2012-06-03 23:09:53.016009080 +0000
-+++ vim73/runtime/doc/change.txt        2012-06-03 23:09:53.976034626 +0000
+--- vim73.orig/runtime/doc/change.txt   2010-08-15 12:23:19.000000000 +0000
++++ vim73/runtime/doc/change.txt        2012-07-20 20:31:16.577643922 +0000
 @@ -916,8 +916,10 @@
  {Visual}["x]Y          Yank the highlighted lines [into register x] (for
@@ -198 +208 @@
  :[range]y[ank] [x] {count}
                         Yank {count} lines, starting with last line number
+@@ -1493,6 +1495,12 @@
+        characters.  Overruled by the 'M' flag.
+ 1      Don't break a line after a one-letter word.  It's broken before it
+        instead (if possible).
++j      Where it makes sense, remove a comment leader when joining lines.  For
++       example, joining:
++               int i;   // the index ~
++                        // in the list ~
++       Becomes:
++               int i;   // the index in the list ~
+ 
+ 
+ With 't' and 'c' you can specify when Vim performs auto-wrapping:
 diff -Naur vim73.orig/runtime/doc/cmdline.txt vim73/runtime/doc/cmdline.txt
---- vim73.orig/runtime/doc/cmdline.txt  2012-06-03 23:09:53.016009080 +0000
-+++ vim73/runtime/doc/cmdline.txt       2012-06-03 23:09:55.820083699 +0000
+--- vim73.orig/runtime/doc/cmdline.txt  2010-08-15 12:23:19.000000000 +0000
++++ vim73/runtime/doc/cmdline.txt       2012-07-20 20:31:16.060976885 +0000
 @@ -330,12 +330,12 @@
  
@@ -221 +244 @@
                 If the numbers {first} and/or {last} are given, the respective
 diff -Naur vim73.orig/runtime/doc/diff.txt vim73/runtime/doc/diff.txt
---- vim73.orig/runtime/doc/diff.txt     2012-06-03 23:09:53.024009292 +0000
-+++ vim73/runtime/doc/diff.txt  2012-06-03 23:09:55.876085191 +0000
+--- vim73.orig/runtime/doc/diff.txt     2010-08-15 12:23:20.000000000 +0000
++++ vim73/runtime/doc/diff.txt  2012-07-20 20:31:16.204310320 +0000
 @@ -178,7 +178,7 @@
  nodiff" before hiding it.
@@ -243 +266 @@
  present in another.  These lines were inserted in another file or deleted in
 diff -Naur vim73.orig/runtime/doc/eval.txt vim73/runtime/doc/eval.txt
---- vim73.orig/runtime/doc/eval.txt     2012-06-03 23:09:53.016009080 +0000
-+++ vim73/runtime/doc/eval.txt  2012-06-03 23:09:55.556076674 +0000
+--- vim73.orig/runtime/doc/eval.txt     2010-08-15 12:23:20.000000000 +0000
++++ vim73/runtime/doc/eval.txt  2012-07-20 20:31:17.304311108 +0000
 @@ -798,11 +798,12 @@
  For |Lists| only "+" is possible and then both expr6 must be a list.  The
@@ -321 +344 @@
  islocked( {expr})              Number  TRUE if {expr} is locked
  items( {dict})                 List    key-value pairs in {dict}
-@@ -1822,7 +1837,7 @@
+@@ -1821,9 +1836,11 @@
+ localtime()                    Number  current time
  log( {expr})                   Float   natural logarithm (base e) of {expr}
  log10( {expr})                 Float   logarithm of Float {expr} to base 10
++luaeval( {expr}[, {expr}])     any     evaluate |Lua| expression
  map( {expr}, {string})         List/Dict  change each item in {expr} to {expr}
 -maparg( {name}[, {mode} [, {abbr}]])
+-                               String  rhs of mapping {name} in mode {mode}
 +maparg( {name}[, {mode} [, {abbr} [, {dict}]]])
-                                String  rhs of mapping {name} in mode {mode}
++                               String or Dict
++                                       rhs of mapping {name} in mode {mode}
  mapcheck( {name}[, {mode} [, {abbr}]])
                                 String  check for mappings matching {name}
-@@ -1846,6 +1861,7 @@
+ match( {expr}, {pat}[, {start}[, {count}]])
+@@ -1846,11 +1863,14 @@
  mzeval( {expr})                        any     evaluate |MzScheme| expression
  nextnonblank( {lnum})          Number  line nr of non-blank line >= {lnum}
@@ -338 +366 @@
  pow( {x}, {y})                 Float   {x} to the power of {y}
  prevnonblank( {lnum})          Number  line nr of non-blank line <= {lnum}
-@@ -1904,7 +1920,8 @@
+ printf( {fmt}, {expr1}...)     String  format text
+ pumvisible()                   Number  whether popup menu is visible
++pyeval( {expr})                        any     evaluate |Python| expression
++py3eval( {expr})               any     evaluate |python3| expression
+ range( {expr} [, {max} [, {stride}]])
+                                List    items from {expr} to {max}
+ readfile( {fname} [, {binary} [, {max}]])
+@@ -1904,7 +1924,8 @@
  simplify( {filename})          String  simplify filename as much as possible
  sin( {expr})                   Float   sine of {expr}
@@ -348 +383 @@
  spellbadword()                 String  badly spelled word at cursor
  spellsuggest( {word} [, {max} [, {capital}]])
-@@ -1967,6 +1984,7 @@
+@@ -1967,6 +1988,7 @@
  winwidth( {nr})                        Number  width of window {nr}
  writefile( {list}, {fname} [, {binary}])
@@ -356 +391 @@
  abs({expr})                                                    *abs()*
                 Return the absolute value of {expr}.  When {expr} evaluates to
-@@ -2006,6 +2024,13 @@
+@@ -2006,6 +2028,13 @@
                 Use |insert()| to add an item at another position.
  
@@ -370 +405 @@
                 When {expr} is a |List|: Append each item of the |List| as a
                 text line below line {lnum} in the current buffer.
-@@ -2708,13 +2733,15 @@
+@@ -2708,13 +2737,15 @@
                 {only available when compiled with the |+float| feature}
  
@@ -391 +426 @@
                 If the expansion fails, the result is an empty string.  A name
                 for a non-existing file is not included.
-@@ -2731,6 +2758,7 @@
+@@ -2731,6 +2762,7 @@
                         <abuf>          autocmd buffer number (as a String!)
                         <amatch>        autocmd matched name
@@ -399 +434 @@
                         <cWORD>         WORD under the cursor
                         <client>        the {clientid} of the last received
-@@ -2767,10 +2795,10 @@
+@@ -2767,10 +2799,10 @@
                 When {expr} does not start with '%', '#' or '<', it is
                 expanded like a file name is expanded on the command line.
@@ -414 +449 @@
  <
                 Expand() can also be used to expand variables and environment
-@@ -3414,17 +3442,23 @@
+@@ -3414,17 +3446,23 @@
                         :let list_is_on = getwinvar(2, '&list')
                         :echo "myvar = " . getwinvar(1, 'myvar')
@@ -444 +479 @@
  
                 For most systems backticks can be used to get files names from
-@@ -3759,6 +3793,11 @@
+@@ -3759,6 +3797,11 @@
                 Note that when {item} is a |List| it is inserted as a single
                 item.  Use |extend()| to concatenate |Lists|.
@@ -456 +491 @@
                 The result is a Number, which is non-zero when a directory
                 with the name {directory} exists.  If {directory} doesn't
-@@ -3966,23 +4005,51 @@
+@@ -3941,6 +3984,20 @@
+ <                      -2.0
+                {only available when compiled with the |+float| feature}
+                
++luaeval({expr}[, {expr}])                                      *luaeval()*
++               Evaluate Lua expression {expr} and return its result converted 
++               to Vim data structures. Second {expr} may hold additional 
++               argument accessible as _A inside first {expr}.
++               Strings are returned as they are.
++               Boolean objects are converted to numbers.
++               Numbers are converted to |Float| values if vim was compiled 
++               with |+float| and to numbers otherwise.
++               Dictionaries and lists obtained by vim.eval() are returned 
++               as-is.
++               Other objects are returned as zero without any errors.
++               See |lua-luaeval| for more details.
++               {only available when compiled with the |+lua| feature}
++
+ map({expr}, {string})                                  *map()*
+                {expr} must be a |List| or a |Dictionary|.
+                Replace each item in {expr} with the result of evaluating
+@@ -3966,23 +4023,51 @@
                 further items in {expr} are processed.
  
@@ -515 +571 @@
                 then the global mappings.
                 This function can be used to map a key even when it's already
-@@ -4295,6 +4362,13 @@
+@@ -4295,6 +4380,13 @@
                         call setpos('.', save_cursor)
  <              Also see |setpos()|.
@@ -529 +585 @@
                 Shorten directory names in the path {expr} and return the
                 result.  The tail, the file name, is kept as-is.  The other
-@@ -5228,7 +5302,7 @@
+@@ -4500,6 +4592,29 @@
+                This can be used to avoid some things that would remove the
+                popup menu.
+ 
++                                                       *E860* *E861*
++py3eval({expr})                                                *py3eval()*
++               Evaluate Python expression {expr} and return its result
++               converted to Vim data structures.
++               Numbers and strings are returned as they are (strings are 
++               copied though, unicode strings are additionally converted to 
++               'encoding').
++               Lists are represented as Vim |List| type.
++               Dictionaries are represented as Vim |Dictionary| type with 
++               keys converted to strings.
++               {only available when compiled with the |+python3| feature}
++
++                                                       *E858* *E859*
++pyeval({expr})                                         *pyeval()*
++               Evaluate Python expression {expr} and return its result
++               converted to Vim data structures.
++               Numbers and strings are returned as they are (strings are 
++               copied though).
++               Lists are represented as Vim |List| type.
++               Dictionaries are represented as Vim |Dictionary| type with 
++               keys converted to strings.
++               {only available when compiled with the |+python| feature}
++
+                                                        *E726* *E727*
+ range({expr} [, {max} [, {stride}]])                           *range()*
+                Returns a |List| with Numbers:
+@@ -4733,6 +4848,10 @@
+                Search for regexp pattern {pattern}.  The search starts at the
+                cursor position (you can use |cursor()| to set it).
+ 
++               If there is no match a 0 is returned and the cursor doesn't
++               move.  No error message is given.
++               When a match has been found its line number is returned.
++
+                {flags} is a String, which can contain these character flags:
+                'b'     search backward instead of forward
+                'c'     accept a match at the cursor position
+@@ -5228,7 +5347,7 @@
                 {only available when compiled with the |+float| feature}
  
@@ -538 +635 @@
                 want a list to remain unmodified make a copy first: >
                         :let sortedlist = sort(copy(mylist))
-@@ -5236,6 +5310,8 @@
+@@ -5236,6 +5355,8 @@
                 Numbers sort after Strings, |Lists| after Numbers.
                 For sorting text in the current buffer use |:sort|.
@@ -547 +644 @@
                 is called to compare items.  The function is invoked with two
                 items as argument and must return zero if they are equal, 1 or
-@@ -6056,7 +6132,15 @@
+@@ -6056,7 +6177,15 @@
                 To copy a file byte for byte: >
                         :let fl = readfile("foo", "b")
@@ -566 +663 @@
 diff -Naur vim73.orig/runtime/doc/eval.txt.orig vim73/runtime/doc/eval.txt.orig
 --- vim73.orig/runtime/doc/eval.txt.orig        1970-01-01 00:00:00.000000000 +0000
-+++ vim73/runtime/doc/eval.txt.orig     2012-06-03 23:09:54.176039949 +0000
++++ vim73/runtime/doc/eval.txt.orig     2012-07-20 20:31:11.084306643 +0000
 @@ -0,0 +1,8362 @@
 +*eval.txt*     For Vim version 7.3.  Last change: 2010 Aug 15
@@ -8931 +9028 @@
 + vim:tw=78:ts=8:ft=help:norl:
 diff -Naur vim73.orig/runtime/doc/if_cscop.txt vim73/runtime/doc/if_cscop.txt
---- vim73.orig/runtime/doc/if_cscop.txt 2012-06-03 23:09:53.020009186 +0000
-+++ vim73/runtime/doc/if_cscop.txt      2012-06-03 23:09:54.252041972 +0000
+--- vim73.orig/runtime/doc/if_cscop.txt 2010-08-15 12:23:20.000000000 +0000
++++ vim73/runtime/doc/if_cscop.txt      2012-07-20 20:31:11.324306815 +0000
 @@ -272,6 +272,15 @@
         :set cst
@@ -9444 +9541 @@
 + vim:tw=78:ts=8:ft=help:norl:
 diff -Naur vim73.orig/runtime/doc/if_lua.txt vim73/runtime/doc/if_lua.txt
---- vim73.orig/runtime/doc/if_lua.txt   2012-06-03 23:09:53.020009186 +0000
-+++ vim73/runtime/doc/if_lua.txt        2012-06-03 23:09:55.696080401 +0000
+--- vim73.orig/runtime/doc/if_lua.txt   2010-08-15 12:23:20.000000000 +0000
++++ vim73/runtime/doc/if_lua.txt        2012-07-20 20:31:15.670976605 +0000
 @@ -1,4 +1,4 @@
 -*if_lua.txt*    For Vim version 7.3.  Last change: 2010 Jul 22
@@ -9643 +9740 @@
 +==============================================================================
 + vim:tw=78:ts=8:noet:ft=help:norl:
+diff -Naur vim73.orig/runtime/doc/if_pyth.txt vim73/runtime/doc/if_pyth.txt
+--- vim73.orig/runtime/doc/if_pyth.txt  2010-08-15 12:23:20.000000000 +0000
++++ vim73/runtime/doc/if_pyth.txt       2012-07-20 20:31:17.307644444 +0000
+@@ -1,4 +1,4 @@
+-*if_pyth.txt*   For Vim version 7.3.  Last change: 2010 Aug 13
++*if_pyth.txt*   For Vim version 7.3.  Last change: 2012 Feb 04
+ 
+ 
+                  VIM REFERENCE MANUAL    by Paul Moore
+@@ -6,13 +6,14 @@
+ 
+ The Python Interface to Vim                            *python* *Python*
+ 
+-1. Commands                    |python-commands|
+-2. The vim module              |python-vim|
+-3. Buffer objects              |python-buffer|
+-4. Range objects               |python-range|
+-5. Window objects              |python-window|
+-6. Dynamic loading             |python-dynamic|
+-7. Python 3                    |python3|
++1. Commands                                    |python-commands|
++2. The vim module                              |python-vim|
++3. Buffer objects                              |python-buffer|
++4. Range objects                               |python-range|
++5. Window objects                              |python-window|
++6. pyeval(), py3eval() Vim functions           |python-pyeval|
++7. Dynamic loading                             |python-dynamic|
++8. Python 3                                    |python3|
+ 
+ {Vi does not have any of these commands}
+ 
+@@ -150,6 +151,22 @@
+        [{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name':
+        'eval_expr', 'kind': 'f', 'filename': './src/eval.c'}]
+ 
++vim.bindeval(str)                                      *python-bindeval*
++       Like |python-eval|, but
++       1. if expression evaluates to |List| or |Dictionary| it is returned as 
++          vimlist or vimdictionary python type that are connected to original 
++          list or dictionary. Thus modifications to these objects imply 
++          modifications of the original.
++       2. if expression evaluates to a function reference, then it returns 
++          callable vimfunction object. Use self keyword argument to assign 
++          |self| object for dictionary functions.
++
++       Note: this function has the same behavior as |lua-eval| (except that 
++             lua does not support running vim functions), |python-eval| is 
++             kept for backwards compatibility in order not to make scripts 
++             relying on outputs of vim.eval() being a copy of original or 
++             vim.eval("1") returning a string.
++
+ 
+ 
+ Error object of the "vim" module
+@@ -222,8 +239,9 @@
+        - from indexing vim.buffers (|python-buffers|)
+        - from the "buffer" attribute of a window (|python-window|)
+ 
+-Buffer objects have one read-only attribute - name - the full file name for
+-the buffer.  They also have three methods (append, mark, and range; see below).
++Buffer objects have two read-only attributes - name - the full file name for
++the buffer, and number - the buffer number.  They also have three methods
++(append, mark, and range; see below).
+ 
+ You can also treat buffer objects as sequence objects.  In this context, they
+ act as if they were lists (yes, they are mutable) of strings, with each
+@@ -318,7 +336,13 @@
+ The width attribute is writable only if the screen is split vertically.
+ 
+ ==============================================================================
+-6. Dynamic loading                                     *python-dynamic*
++6. pyeval() and py3eval() Vim functions                        *python-pyeval*
++
++To facilitate bi-directional interface, you can use |pyeval()| and |py3eval()| 
++functions to evaluate Python expressions and pass their values to VimL.
++
++==============================================================================
++7. Dynamic loading                                     *python-dynamic*
+ 
+ On MS-Windows the Python library can be loaded dynamically.  The |:version|
+ output then includes |+python/dyn|.
+@@ -335,13 +359,14 @@
+ sure edit "gvim.exe" and search for "python\d*.dll\c".
+ 
+ ==============================================================================
+-7. Python 3                                            *python3*
++8. Python 3                                            *python3*
+ 
+                                                        *:py3* *:python3*
+ The |:py3| and |:python3| commands work similar to |:python|.
+                                                        *:py3file*
+ The |:py3file| command works similar to |:pyfile|.
+ 
++
+ Vim can be built in four ways (:version output):
+ 1. No Python support       (-python, -python3)
+ 2. Python 2 support only    (+python or +python/dyn, -python3)
+@@ -355,7 +380,7 @@
+ When doing this on Linux/Unix systems and importing global symbols, this leads
+ to a crash when the second Python version is used.  So either global symbols
+ are loaded but only one Python version is activated, or no global symbols are
+-loaded. The latter makes Python's "import" fail on libaries that expect the
++loaded. The latter makes Python's "import" fail on libraries that expect the
+ symbols to be provided by Vim.
+                                                        *E836* *E837*
+ Vim's configuration script makes a guess for all libraries based on one
+@@ -377,6 +402,18 @@
+ 3. You undefine PY_NO_RTLD_GLOBAL in auto/config.h after configuration.  This
+    may crash Vim though.
+ 
++                                                       *has-python*
++You can test what Python version is available with: >
++       if has('python')
++         echo 'there is Python 2.x'
++       elseif has('python3')
++         echo 'there is Python 3.x'
++       endif
++
++Note however, that when Python 2 and 3 are both available and loaded
++dynamically, these has() calls will try to load them.  If only one can be
++loaded at a time, just checking if Python 2 or 3 are available will prevent
++the other one from being available.
+ 
+ ==============================================================================
+  vim:tw=78:ts=8:ft=help:norl:
 diff -Naur vim73.orig/runtime/doc/indent.txt vim73/runtime/doc/indent.txt
---- vim73.orig/runtime/doc/indent.txt   2012-06-03 23:09:53.024009292 +0000
-+++ vim73/runtime/doc/indent.txt        2012-06-03 23:09:55.712080826 +0000
+--- vim73.orig/runtime/doc/indent.txt   2010-08-15 12:23:20.000000000 +0000
++++ vim73/runtime/doc/indent.txt        2012-07-20 20:31:15.707643298 +0000
 @@ -128,13 +128,20 @@
  used CTRL-T or CTRL-D.
@@ -10787 +11009 @@
 + vim:tw=78:ts=8:ft=help:norl:
 diff -Naur vim73.orig/runtime/doc/map.txt vim73/runtime/doc/map.txt
---- vim73.orig/runtime/doc/map.txt      2012-06-03 23:09:53.020009186 +0000
-+++ vim73/runtime/doc/map.txt   2012-06-03 23:09:55.820083699 +0000
+--- vim73.orig/runtime/doc/map.txt      2010-08-15 12:23:21.000000000 +0000
++++ vim73/runtime/doc/map.txt   2012-07-20 20:31:16.060976885 +0000
 @@ -226,7 +226,7 @@
  
@@ -10828 +11050 @@
         -complete=tag_listfiles tags, file names are shown when CTRL-D is hit
 diff -Naur vim73.orig/runtime/doc/motion.txt vim73/runtime/doc/motion.txt
---- vim73.orig/runtime/doc/motion.txt   2012-06-03 23:09:53.020009186 +0000
-+++ vim73/runtime/doc/motion.txt        2012-06-03 23:09:54.380045379 +0000
+--- vim73.orig/runtime/doc/motion.txt   2010-08-15 12:23:21.000000000 +0000
++++ vim73/runtime/doc/motion.txt        2012-07-20 20:31:11.687640410 +0000
 @@ -269,11 +269,11 @@
                         {char} can be entered like with the |f| command.
@@ -10845 +11067 @@
  3. Up-down motions                                     *up-down-motions*
 diff -Naur vim73.orig/runtime/doc/netbeans.txt vim73/runtime/doc/netbeans.txt
---- vim73.orig/runtime/doc/netbeans.txt 2012-06-03 23:09:53.016009080 +0000
-+++ vim73/runtime/doc/netbeans.txt      2012-06-03 23:09:54.892059004 +0000
+--- vim73.orig/runtime/doc/netbeans.txt 2010-08-15 12:23:21.000000000 +0000
++++ vim73/runtime/doc/netbeans.txt      2012-07-20 20:31:13.184308154 +0000
 @@ -1,4 +1,4 @@
 -*netbeans.txt*  For Vim version 7.3.  Last change: 2010 Jul 20
@@ -10908 +11130 @@
  ==============================================================================
 diff -Naur vim73.orig/runtime/doc/options.txt vim73/runtime/doc/options.txt
---- vim73.orig/runtime/doc/options.txt  2012-06-03 23:09:53.020009186 +0000
-+++ vim73/runtime/doc/options.txt       2012-06-03 23:09:55.460074120 +0000
+--- vim73.orig/runtime/doc/options.txt  2010-08-15 12:23:21.000000000 +0000
++++ vim73/runtime/doc/options.txt       2012-07-20 20:31:18.044311638 +0000
 @@ -150,6 +150,18 @@
  (the ^[ is a real <Esc> here, use CTRL-V <Esc> to enter it)
@@ -10929 +11151 @@
  security reasons.
  
-@@ -1434,6 +1446,15 @@
+@@ -1425,6 +1437,7 @@
+        This option is a list of comma separated names.
+        These names are recognized:
+ 
++                                               *clipboard-unnamed*
+        unnamed         When included, Vim will use the clipboard register '*'
+                        for all yank, delete, change and put operations which
+                        would normally go to the unnamed register.  When a
+@@ -1434,6 +1447,17 @@
                         explicitly accessed using the "* notation.  Also see
                         |gui-clipboard|.
  
++                                               *clipboard-unnamedplus*
 +       unnamedplus     A variant of "unnamed" flag which uses the clipboard
 +                       register '+' (|quoteplus|) instead of register '*' for
@@ -10938 +11169 @@
 +                       into register '+' and also into '*' when "unnamed" is
 +                       included.
-+                       Only available with the |+x11| feature.
++                       Only available with the |+X11| feature.
 +                       Availability can be checked with: >
 +                               if has('unnamedplus')
 +<
++                                               *clipboard-autoselect*
         autoselect      Works like the 'a' flag in 'guioptions': If present,
                         then whenever Visual mode is started, or the Visual
                         area extended, Vim tries to become the owner of the
-@@ -2069,6 +2090,12 @@
+@@ -1445,9 +1469,16 @@
+                        "autoselect" flag is used.
+                        Also applies to the modeless selection.
+ 
++                                               *clipboard-autoselectplus*
++       autoselectplus  Like "autoselect" but using the + register instead of
++                       the * register.  Compare to the 'P' flag in
++                       'guioptions'.
++
++                                               *clipboard-autoselectml*
+        autoselectml    Like "autoselect", but for the modeless selection
+                        only.  Compare to the 'A' flag in 'guioptions'.
+ 
++                                               *clipboard-html*
+        html            When the clipboard contains HTML, use this when
+                        pasting.  When putting text on the clipboard, mark it
+                        as HTML.  This works to copy rendered HTML from
+@@ -1458,6 +1489,7 @@
+                        Only supported for GTK version 2 and later.
+                        Only available with the |+multi_byte| feature.
+ 
++                                               *clipboard-exclude*
+        exclude:{pattern}
+                        Defines a pattern that is matched against the name of
+                        the terminal 'term'.  If there is a match, no
+@@ -2069,6 +2101,12 @@
                                                                 *cpo->*
                 >       When appending to a register, put a line break before
@@ -10958 +11215 @@
         POSIX flags.  These are not included in the Vi default value, except
         when $VIM_POSIX was set on startup. |posix|
-@@ -2161,6 +2188,16 @@
+@@ -2161,6 +2199,16 @@
         Specifies whether to use quickfix window to show cscope results.
         See |cscopequickfix|.
@@ -10975 +11232 @@
  'cscopetag' 'cst'      boolean (default off)
                         global
-@@ -5843,16 +5880,21 @@
+@@ -3510,6 +3558,9 @@
+                windowing system's global selection unless explicitly told to
+                by a yank or delete operation for the "* register.
+                The same applies to the modeless selection.
++                                                               *'go-P'*
++         'P'   Like autoselect but using the "+ register instead of the "*
++               register.
+                                                                *'go-A'*
+          'A'   Autoselect for the modeless selection.  Like 'a', but only
+                applies to the modeless selection.
+@@ -5843,16 +5894,21 @@
         security reasons.
  
@@ -11001 +11268 @@
         security reasons.
  
-@@ -5873,9 +5915,10 @@
+@@ -5873,9 +5929,10 @@
         For Unix the default it "| tee".  The stdout of the compiler is saved
         in a file and echoed to the screen.  If the 'shell' option is "csh" or
@@ -11015 +11282 @@
         and the other initializations, so that when the 'shell' option is set
         there, the 'shellpipe' option changes automatically, unless it was
-@@ -5980,6 +6023,7 @@
+@@ -5980,6 +6037,7 @@
  
                                                 *'shellxquote'* *'sxq'*
@@ -11023 +11290 @@
                                         somewhere: "\""
                                         for Unix, when using system(): "\"")
-@@ -5989,14 +6033,28 @@
+@@ -5989,14 +6047,28 @@
         the "!" and ":!" commands.  Includes the redirection.  See
         'shellquote' to exclude the redirection.  It's probably not useful
@@ -11057 +11324 @@
  'shiftround' 'sr'      boolean (default off)
                         global
-@@ -7530,8 +7588,9 @@
+@@ -7530,8 +7602,9 @@
         !       When included, save and restore global variables that start
                 with an uppercase letter, and don't contain a lowercase
@@ -11069 +11336 @@
                 the '<' item, with the disadvantage that you need to put a
                 backslash before the ", otherwise it will be recognized as the
-@@ -7747,6 +7806,17 @@
+@@ -7747,6 +7820,17 @@
         a pattern from the list.  This avoids problems when a future version
         uses another default.
@@ -11089 +11356 @@
 diff -Naur vim73.orig/runtime/doc/options.txt.orig vim73/runtime/doc/options.txt.orig
 --- vim73.orig/runtime/doc/options.txt.orig     1970-01-01 00:00:00.000000000 +0000
-+++ vim73/runtime/doc/options.txt.orig  2012-06-03 23:09:53.792029731 +0000
++++ vim73/runtime/doc/options.txt.orig  2012-07-20 20:31:09.814305726 +0000
 @@ -0,0 +1,8079 @@
 +*options.txt*  For Vim version 7.3.  Last change: 2010 Aug 15
@@ -19172 +19439 @@
 + vim:tw=78:ts=8:ft=help:norl:
 diff -Naur vim73.orig/runtime/doc/os_risc.txt vim73/runtime/doc/os_risc.txt
---- vim73.orig/runtime/doc/os_risc.txt  2012-06-03 23:09:53.024009292 +0000
-+++ vim73/runtime/doc/os_risc.txt       2012-06-03 23:09:54.112038245 +0000
+--- vim73.orig/runtime/doc/os_risc.txt  2010-08-15 12:23:21.000000000 +0000
++++ vim73/runtime/doc/os_risc.txt       2012-07-20 20:31:10.844306469 +0000
 @@ -1,322 +1,12 @@
 -*os_risc.txt*   For Vim version 7.3.  Last change: 2010 Aug 07
@@ -19501 +19768 @@
   vim:tw=78:ts=8:ft=help:norl:
 diff -Naur vim73.orig/runtime/doc/os_win32.txt vim73/runtime/doc/os_win32.txt
---- vim73.orig/runtime/doc/os_win32.txt 2012-06-03 23:09:53.016009080 +0000
-+++ vim73/runtime/doc/os_win32.txt      2012-06-03 23:09:54.368045058 +0000
+--- vim73.orig/runtime/doc/os_win32.txt 2010-08-15 12:23:21.000000000 +0000
++++ vim73/runtime/doc/os_win32.txt      2012-07-20 20:31:11.650973718 +0000
 @@ -313,6 +313,37 @@
     with :!start do not get passed Vim's open file handles, which means they do
@@ -19542 +19809 @@
     Vim doesn't wait for it to finish!  Help!
 diff -Naur vim73.orig/runtime/doc/pattern.txt vim73/runtime/doc/pattern.txt
---- vim73.orig/runtime/doc/pattern.txt  2012-06-03 23:09:53.020009186 +0000
-+++ vim73/runtime/doc/pattern.txt       2012-06-03 23:09:54.508048784 +0000
+--- vim73.orig/runtime/doc/pattern.txt  2010-08-15 12:23:21.000000000 +0000
++++ vim73/runtime/doc/pattern.txt       2012-07-20 20:31:12.107640712 +0000
 @@ -1027,11 +1027,9 @@
           These items only work for 8-bit characters.
@@ -19558 +19825 @@
         - A collation element.  This currently simply accepts a single
           character in the form:
+diff -Naur vim73.orig/runtime/doc/sign.txt vim73/runtime/doc/sign.txt
+--- vim73.orig/runtime/doc/sign.txt     2010-08-15 12:23:22.000000000 +0000
++++ vim73/runtime/doc/sign.txt  2012-07-20 20:31:18.004311609 +0000
+@@ -150,8 +150,14 @@
+                Remove the previously placed sign {id} from file {fname}.
+                See remark above about {fname} |:sign-fname|.
+ 
++:sign unplace * file={fname}
++               Remove all placed signs in file {fname}.
++
+ :sign unplace {id} buffer={nr}
+-               Same, but use buffer {nr}.
++               Remove the previously placed sign {id} from buffer {nr}.
++
++:sign unplace * buffer={nr}
++               Remove all placed signs in buffer {nr}.
+ 
+ :sign unplace {id}
+                Remove the previously placed sign {id} from all files it
+diff -Naur vim73.orig/runtime/doc/tabpage.txt vim73/runtime/doc/tabpage.txt
+--- vim73.orig/runtime/doc/tabpage.txt  2010-08-15 12:23:22.000000000 +0000
++++ vim73/runtime/doc/tabpage.txt       2012-07-20 20:31:17.920978216 +0000
+@@ -173,10 +173,20 @@
+ REORDERING TAB PAGES:
+ 
+ :tabm[ove] [N]                                         *:tabm* *:tabmove*
++:[N]tabm[ove]
+                Move the current tab page to after tab page N.  Use zero to
+                make the current tab page the first one.  Without N the tab
+                page is made the last one.
+ 
++:tabm[ove] +[N]
++:tabm[ove] -[N]
++               Move the current tab page N places to the right (with +) or to
++               the left (with -).
++
++Note that although it is possible to move a tab behind the N-th one by using
++:Ntabmove, it is impossible to move it by N places by using :+Ntabmove. For
++clarification what +N means in this context see |[range]|.
++
+ 
+ LOOPING OVER TAB PAGES:
+ 
 diff -Naur vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim
---- vim73.orig/runtime/filetype.vim     2012-06-03 23:09:52.976008014 +0000
-+++ vim73/runtime/filetype.vim  2012-06-03 23:09:55.356071352 +0000
+--- vim73.orig/runtime/filetype.vim     2010-08-03 20:44:00.000000000 +0000
++++ vim73/runtime/filetype.vim  2012-07-20 20:31:14.564309144 +0000
 @@ -2475,17 +2475,19 @@
  " detected filetypes.
@@ -22103 +22413 @@
 +unlet s:cpo_save
 diff -Naur vim73.orig/runtime/ftplugof.vim vim73/runtime/ftplugof.vim
---- vim73.orig/runtime/ftplugof.vim     2012-06-03 23:09:53.028009398 +0000
-+++ vim73/runtime/ftplugof.vim  2012-06-03 23:09:54.868058365 +0000
+--- vim73.orig/runtime/ftplugof.vim     2010-05-15 11:03:57.000000000 +0000
++++ vim73/runtime/ftplugof.vim  2012-07-20 20:31:13.030974711 +0000
 @@ -1,11 +1,13 @@
  " Vim support file to switch off loading plugins for file types
@@ -22124 +22434 @@
 diff -Naur vim73.orig/src/GvimExt/Make_cyg.mak vim73/src/GvimExt/Make_cyg.mak
 --- vim73.orig/src/GvimExt/Make_cyg.mak 1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/GvimExt/Make_cyg.mak      2012-06-03 23:09:54.804056662 +0000
++++ vim73/src/GvimExt/Make_cyg.mak      2012-07-20 20:31:12.867641259 +0000
 @@ -0,0 +1,77 @@
 +# Project: gvimext
@@ -22204 +22514 @@
 +       -$(DEL)  $(OBJ) $(RES) $(DLL)
 diff -Naur vim73.orig/src/GvimExt/Make_ming.mak vim73/src/GvimExt/Make_ming.mak
---- vim73.orig/src/GvimExt/Make_ming.mak        2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/GvimExt/Make_ming.mak     2012-06-03 23:09:54.804056662 +0000
+--- vim73.orig/src/GvimExt/Make_ming.mak        2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/GvimExt/Make_ming.mak     2012-07-20 20:31:12.867641259 +0000
 @@ -1,6 +1,6 @@
  # Project: gvimext
@@ -22273 +22583 @@
 -
 diff -Naur vim73.orig/src/GvimExt/gvimext.cpp vim73/src/GvimExt/gvimext.cpp
---- vim73.orig/src/GvimExt/gvimext.cpp  2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/GvimExt/gvimext.cpp       2012-06-03 23:09:54.580050701 +0000
+--- vim73.orig/src/GvimExt/gvimext.cpp  2010-07-10 17:21:34.000000000 +0000
++++ vim73/src/GvimExt/gvimext.cpp       2012-07-20 20:31:12.297640849 +0000
 @@ -142,6 +142,7 @@
  static int dyn_libintl_init(char *dir);
@@ -22359 +22669 @@
                 &pi)            // Pointer to PROCESS_INFORMATION structure.
 diff -Naur vim73.orig/src/GvimExt/gvimext.def vim73/src/GvimExt/gvimext.def
---- vim73.orig/src/GvimExt/gvimext.def  2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/GvimExt/gvimext.def       2012-06-03 23:09:54.328043994 +0000
+--- vim73.orig/src/GvimExt/gvimext.def  2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/GvimExt/gvimext.def       2012-07-20 20:31:11.500973609 +0000
 @@ -1,7 +1,7 @@
  ;gvimdef.def : Declares the module parameters for the DLL.
@@ -22371 +22681 @@
      DllCanUnloadNow private
 diff -Naur vim73.orig/src/GvimExt/gvimext_ming.def vim73/src/GvimExt/gvimext_ming.def
---- vim73.orig/src/GvimExt/gvimext_ming.def     2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/GvimExt/gvimext_ming.def  2012-06-03 23:09:54.328043994 +0000
+--- vim73.orig/src/GvimExt/gvimext_ming.def     2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/GvimExt/gvimext_ming.def  2012-07-20 20:31:11.500973609 +0000
 @@ -3,7 +3,7 @@
  ;Hence this is the same file as gvimext.def with private removed
@@ -22383 +22693 @@
      DllCanUnloadNow = DllCanUnloadNow@0
 diff -Naur vim73.orig/src/INSTALL vim73/src/INSTALL
---- vim73.orig/src/INSTALL      2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/INSTALL   2012-06-03 23:09:54.124038565 +0000
+--- vim73.orig/src/INSTALL      2010-06-26 04:04:51.000000000 +0000
++++ vim73/src/INSTALL   2012-07-20 20:31:10.884306499 +0000
 @@ -6,9 +6,8 @@
  Contents:
@@ -22434 +22744 @@
  [NOTE: this is quite old, it might not work anymore]
 diff -Naur vim73.orig/src/INSTALLpc.txt vim73/src/INSTALLpc.txt
---- vim73.orig/src/INSTALLpc.txt        2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/INSTALLpc.txt     2012-06-03 23:09:55.528075930 +0000
+--- vim73.orig/src/INSTALLpc.txt        2010-05-24 12:58:06.000000000 +0000
++++ vim73/src/INSTALLpc.txt     2012-07-20 20:31:15.140976226 +0000
 @@ -11,9 +11,9 @@
  this, then you will get the default behavior as is documented, which should
@@ -22548 +22858 @@
 +Happy Vimming!
 diff -Naur vim73.orig/src/Make_cyg.mak vim73/src/Make_cyg.mak
---- vim73.orig/src/Make_cyg.mak 2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/Make_cyg.mak      2012-06-03 23:09:54.804056662 +0000
+--- vim73.orig/src/Make_cyg.mak 2010-08-02 19:09:22.000000000 +0000
++++ vim73/src/Make_cyg.mak      2012-07-20 20:31:17.854311501 +0000
 @@ -1,6 +1,6 @@
  #
  # Makefile for VIM on Win32, using Cygnus gcc
 -# Last updated by Dan Sharp.  Last Change: 2010 Feb 24
-+# Last updated by Dan Sharp.  Last Change: 2010 Nov 03
++# Last updated by Dan Sharp.  Last Change: 2012 Jun 30
  #
  # Also read INSTALLpc.txt!
@@ -22566 +22876 @@
  #   LUA_VER        define to version of Lua being used (51)
  #   DYNAMIC_LUA  no or yes: use yes to load the Lua DLL dynamically (yes)
+@@ -47,7 +48,7 @@
+ #              -L/lib/w32api to EXTRA_LIBS.
+ # POSTSCRIPT   no or yes: set to yes for PostScript printing (no)
+ # FEATURES     TINY, SMALL, NORMAL, BIG or HUGE (BIG)
+-# WINVER       Lowest Win32 version to support.  (0x0400)
++# WINVER       Lowest Win32 version to support.  (0x0500)
+ # CSCOPE       no or yes: to include cscope interface support (yes)
+ # OPTIMIZE     SPACE, SPEED, or MAXSPEED: set optimization level (MAXSPEED)
+ # NETBEANS     no or yes: to include netbeans interface support (yes when GUI
+@@ -84,7 +85,7 @@
+ endif
+ 
+ ifndef WINVER
+-WINVER = 0x0400
++WINVER = 0x0500
+ endif
+ 
+ ifndef CSCOPE
 @@ -254,16 +255,22 @@
  MZSCHEME_GENERATE_BASE=no
@@ -22611 +22939 @@
         -$(DEL) obj$(DIRSLASH)*.o
 diff -Naur vim73.orig/src/Make_ming.mak vim73/src/Make_ming.mak
---- vim73.orig/src/Make_ming.mak        2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/Make_ming.mak     2012-06-03 23:09:55.744081677 +0000
+--- vim73.orig/src/Make_ming.mak        2010-08-02 19:09:43.000000000 +0000
++++ vim73/src/Make_ming.mak     2012-07-20 20:31:17.854311501 +0000
 @@ -14,9 +14,11 @@
  # it's just run out of memory or something.  Run again, and it will continue
@@ -22631 +22959 @@
  OLE=no
  # Set the default $(WINVER) to make it work with pre-Win2k
+-WINVER = 0x0400
 +ifndef WINVER
- WINVER = 0x0400
++WINVER = 0x0500
 +endif
  # Set to yes to enable Cscope support
@@ -22778 +23107 @@
  $(OUTDIR)/netbeans.o:  netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC)
 diff -Naur vim73.orig/src/Make_mvc.mak vim73/src/Make_mvc.mak
---- vim73.orig/src/Make_mvc.mak 2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/Make_mvc.mak      2012-06-03 23:09:55.492074972 +0000
+--- vim73.orig/src/Make_mvc.mak 2010-07-18 19:24:20.000000000 +0000
++++ vim73/src/Make_mvc.mak      2012-07-20 20:31:14.987642782 +0000
 @@ -380,9 +380,6 @@
  !if "$(_NMAKE_VER)" == "10.00.30319.01"
@@ -22901 +23230 @@
  
 diff -Naur vim73.orig/src/Make_ro.mak vim73/src/Make_ro.mak
---- vim73.orig/src/Make_ro.mak  2012-06-03 23:09:52.940007057 +0000
+--- vim73.orig/src/Make_ro.mak  2010-05-15 11:04:08.000000000 +0000
 +++ vim73/src/Make_ro.mak       1970-01-01 00:00:00.000000000 +0000
 @@ -1,135 +0,0 @@
@@ -23040 +23369 @@
 -o.window:      c.window
 diff -Naur vim73.orig/src/Makefile vim73/src/Makefile
---- vim73.orig/src/Makefile     2012-06-03 23:09:52.956007482 +0000
-+++ vim73/src/Makefile  2012-06-03 23:09:55.668079655 +0000
+--- vim73.orig/src/Makefile     2010-08-15 12:56:15.000000000 +0000
++++ vim73/src/Makefile  2012-07-20 20:31:17.217644379 +0000
 @@ -29,7 +29,7 @@
  #      - Uncomment the line "CONF_OPT_X = --without-x" if you have X11 but
@@ -23147 +23476 @@
  #CC= gcc -D_POSIX_SOURCE
  #CFLAGS= -O2
-@@ -1047,8 +1052,9 @@
+@@ -870,6 +875,10 @@
+ #CFLAGS = -O -Qtarget=m88110compat
+ #EXTRA_LIBS = -lgen
+ 
++# The value of QUOTESED comes from auto/config.mk.
++# Uncomment the next line to use the default value.
++# QUOTESED = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
++
+ ##################### end of system specific lines ################### }}}
+ 
+ ### Names of the programs and targets  {{{1
+@@ -1047,8 +1056,9 @@
  INSTALL_DATA   = cp
  INSTALL_DATA_R = cp -r
@@ -23158 +23498 @@
  ### Permissions for binaries  {{{1
  BINMOD = 755
-@@ -1321,15 +1327,15 @@
+@@ -1321,15 +1331,15 @@
  .SUFFIXES: .c .o .pro
  
@@ -23173 +23513 @@
  
 -LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) -Dinline= -D__extension__= -Dalloca=alloca
-+LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) $(RUBY_CFLAGS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) -Dinline= -D__extension__= -Dalloca=alloca
++LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) $(RUBY_CFLAGS) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) -Dinline= -D__extension__= -Dalloca=alloca
  
  LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)="
  
-@@ -1352,7 +1358,8 @@
+@@ -1352,7 +1362,8 @@
            $(PYTHON3_LIBS) \
            $(TCL_LIBS) \
@@ -23187 +23527 @@
  # abbreviations
  DEST_BIN = $(DESTDIR)$(BINDIR)
-@@ -1474,8 +1481,15 @@
+@@ -1474,8 +1485,15 @@
             if_python.c if_python3.c if_tcl.c if_ruby.c if_sniff.c \
             gui_beval.c workshop.c wsdebug.c integration.c netbeans.c
@@ -23204 +23544 @@
  # Which files to check with lint.  Select one of these three lines.  ALL_SRC
  # checks more, but may not work well for checking a GUI that wasn't configured.
-@@ -1486,7 +1500,7 @@
+@@ -1486,7 +1504,7 @@
  #LINT_SRC = $(ALL_SRC)
  #LINT_SRC = $(BASIC_SRC)
@@ -23213 +23553 @@
         objects/blowfish.o \
         objects/charset.o \
-@@ -1507,10 +1521,8 @@
+@@ -1507,10 +1525,8 @@
         $(HANGULIN_OBJ) \
         objects/if_cscope.o \
@@ -23225 +23565 @@
         objects/message.o \
         objects/misc1.o \
-@@ -1535,6 +1547,7 @@
+@@ -1535,6 +1551,7 @@
         objects/term.o \
         objects/ui.o \
@@ -23233 +23573 @@
         $(GUI_OBJ) \
         $(LUA_OBJ) \
-@@ -1549,6 +1562,13 @@
+@@ -1549,6 +1566,13 @@
         $(NETBEANS_OBJ) \
         $(WSDEBUG_OBJ)
@@ -23247 +23587 @@
         blowfish.pro \
         buffer.pro \
-@@ -1612,7 +1632,7 @@
+@@ -1612,7 +1636,7 @@
  RSRC_DIR = os_mac_rsrc
  
@@ -23256 +23596 @@
  # Default target is making the executable and tools
  all: $(VIMTARGET) $(TOOLS) languages $(GUI_BUNDLE)
-@@ -1633,7 +1653,8 @@
+@@ -1633,7 +1657,8 @@
                 CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
                 LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
@@ -23266 +23606 @@
                 $(CONF_OPT_CSCOPE) $(CONF_OPT_MULTIBYTE) $(CONF_OPT_INPUT) \
                 $(CONF_OPT_OUTPUT) $(CONF_OPT_GPM) $(CONF_OPT_WORKSHOP) \
-@@ -1694,11 +1715,12 @@
+@@ -1694,11 +1719,12 @@
  $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h
         $(CCC) version.c -o objects/version.o
@@ -23282 +23622 @@
  
  # Build the language specific files if they were unpacked.
-@@ -1818,6 +1840,15 @@
+@@ -1818,6 +1844,15 @@
                 ln -s $(VIMTARGET) vim; \
         fi
@@ -23298 +23638 @@
  testclean:
         cd testdir; $(MAKE) -f Makefile clean
-@@ -1825,6 +1856,17 @@
+@@ -1825,6 +1860,17 @@
                 cd $(PODIR); $(MAKE) checkclean; \
         fi
@@ -23316 +23656 @@
  
  install_normal: installvim installtools $(INSTALL_LANGS) install-icons
-@@ -2258,6 +2300,7 @@
+@@ -2258,6 +2304,7 @@
         -rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
         -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c
@@ -23324 +23664 @@
         -rm -rf $(APPDIR)
         -rm -rf mzscheme_base.c
-@@ -2291,6 +2334,7 @@
+@@ -2291,6 +2338,7 @@
                                  ../../testdir/vimrc.unix \
                                  ../../testdir/*.in \
@@ -23332 +23672 @@
  
  # Link needed for doing "make install" in a shadow directory.
-@@ -2532,7 +2576,7 @@
+@@ -2367,7 +2415,6 @@
+ auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
+        CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
+ 
+-QUOTESED = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
+ auto/pathdef.c: Makefile auto/config.mk
+        -@echo creating $@
+        -@echo '/* pathdef.c */' > $@
+@@ -2532,7 +2579,7 @@
         $(CCC) $(PYTHON3_CFLAGS) $(PYTHON3_CFLAGS_EXTRA) -o $@ if_python3.c
  
@@ -23341 +23689 @@
  objects/if_sniff.o: if_sniff.c
         $(CCC) -o $@ if_sniff.c
-@@ -2552,6 +2596,9 @@
+@@ -2552,6 +2599,9 @@
  objects/memfile.o: memfile.c
         $(CCC) -o $@ memfile.c
@@ -23351 +23699 @@
         $(CCC) -o $@ memline.c
  
-@@ -2870,7 +2917,7 @@
+@@ -2870,7 +2920,7 @@
  objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
   ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
@@ -23360 +23708 @@
   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
-@@ -3009,6 +3056,10 @@
+@@ -3009,6 +3059,10 @@
  objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
   keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \
@@ -23371 +23719 @@
   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
-@@ -3020,7 +3071,7 @@
+@@ -3020,7 +3074,7 @@
  objects/if_mzsch.o: if_mzsch.c vim.h auto/config.h feature.h os_unix.h \
   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
@@ -23380 +23728 @@
   auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
   regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
-@@ -3041,7 +3092,7 @@
+@@ -3041,7 +3095,7 @@
   ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
   gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
@@ -23390 +23738 @@
   arabic.h version.h
 diff -Naur vim73.orig/src/VisVim/Commands.cpp vim73/src/VisVim/Commands.cpp
---- vim73.orig/src/VisVim/Commands.cpp  2012-06-03 23:09:52.932006845 +0000
-+++ vim73/src/VisVim/Commands.cpp       2012-06-03 23:09:54.592051020 +0000
+--- vim73.orig/src/VisVim/Commands.cpp  2010-05-15 11:04:08.000000000 +0000
++++ vim73/src/VisVim/Commands.cpp       2012-07-20 20:31:12.320974199 +0000
 @@ -549,7 +549,7 @@
         if (g_bNewTabs)
@@ -23412 +23760 @@
                 else
 diff -Naur vim73.orig/src/arabic.c vim73/src/arabic.c
---- vim73.orig/src/arabic.c     2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/arabic.c  2012-06-03 23:09:55.924086467 +0000
+--- vim73.orig/src/arabic.c     2010-05-15 11:04:09.000000000 +0000
++++ vim73/src/arabic.c  2012-07-20 20:31:16.377643778 +0000
 @@ -1066,7 +1066,7 @@
  
@@ -23424 +23772 @@
         (*mb_char2bytes)(curr_c, buf);
 diff -Naur vim73.orig/src/ascii.h vim73/src/ascii.h
---- vim73.orig/src/ascii.h      2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/ascii.h   2012-06-03 23:09:55.076063900 +0000
+--- vim73.orig/src/ascii.h      2010-05-15 11:04:07.000000000 +0000
++++ vim73/src/ascii.h   2012-07-20 20:31:13.754308564 +0000
 @@ -123,7 +123,7 @@
  #define DCS            0x90    /* Device Control String */
@@ -23450 +23798 @@
  #endif
 diff -Naur vim73.orig/src/auto/config.mk vim73/src/auto/config.mk
---- vim73.orig/src/auto/config.mk       2012-06-03 23:09:52.948007269 +0000
+--- vim73.orig/src/auto/config.mk       2010-08-15 13:02:25.000000000 +0000
 +++ vim73/src/auto/config.mk    1970-01-01 00:00:00.000000000 +0000
 @@ -1,5 +0,0 @@
@@ -23459 +23807 @@
 -VIEWNAME = view
 diff -Naur vim73.orig/src/auto/configure vim73/src/auto/configure
---- vim73.orig/src/auto/configure       2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/auto/configure    2012-06-03 23:09:55.372071777 +0000
+--- vim73.orig/src/auto/configure       2010-08-13 14:17:15.000000000 +0000
++++ vim73/src/auto/configure    2012-07-20 20:31:17.054310930 +0000
 @@ -593,6 +593,7 @@
  
@@ -23515 +23863 @@
    CFLAGS="-O"
    test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall"
-@@ -4726,6 +4743,9 @@
+@@ -4409,15 +4426,18 @@
+                  echo ""
+                  echo "------------------------------------------"
+                  echo " On z/OS Unix, the environment variable"
+-                 echo " __CC_${ccn}MODE must be set to \"1\"!"
++                 echo " _CC_${ccn}MODE must be set to \"1\"!"
+                  echo " Do:"
+                  echo "    export _CC_${ccn}MODE=1"
+                  echo " and then call configure again."
+                  echo "------------------------------------------"
+                  exit 1
+                fi
+-               CFLAGS="$CFLAGS -D_ALL_SOURCE -Wc,float\\(IEEE\\)";
+-                LDFLAGS="$LDFLAGS -Wl,EDIT=NO"
++               # Set CFLAGS for configure process.
++               # This will be reset later for config.mk.
++               # Use haltonmsg to force error for missing H files.
++               CFLAGS="$CFLAGS -D_ALL_SOURCE -Wc,float(ieee),haltonmsg(3296)";
++               LDFLAGS="$LDFLAGS -Wl,EDIT=NO"
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+                ;;
+@@ -4726,6 +4746,9 @@
        LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua${vi_cv_version_lua}.so$LUA_SONAME\\\" $LUA_CFLAGS"
      fi
@@ -23525 +23895 @@
  
  
-@@ -4862,16 +4882,36 @@
+@@ -4862,16 +4885,36 @@
        else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -23567 +23937 @@
        fi
      fi
-@@ -4883,12 +4923,22 @@
+@@ -4883,12 +4926,22 @@
      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
        MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
@@ -23591 +23961 @@
          MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
        fi
-@@ -4901,10 +4951,20 @@
+@@ -4901,10 +4954,20 @@
      fi
      if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
@@ -23614 +23984 @@
      fi
      MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
-@@ -5099,6 +5159,10 @@
+@@ -5099,6 +5162,10 @@
        PERL_CFLAGS="-DDYNAMIC_PERL_DLL=\\\"$libperl\\\" $PERL_CFLAGS"
      fi
@@ -23625 +23995 @@
  
  
-@@ -5285,9 +5349,9 @@
+@@ -5285,9 +5352,9 @@
  
         PYTHON_LIBS="${vi_cv_path_python_plibs}"
@@ -23637 +24007 @@
         PYTHON_SRC="if_python.c"
                 if test "x$MACOSX" = "xyes"; then
-@@ -5298,7 +5362,7 @@
+@@ -5298,7 +5365,7 @@
         if test "${vi_cv_var_python_version}" = "1.4"; then
            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
@@ -23646 +24016 @@
                                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
  $as_echo_n "checking if -pthread should be used... " >&6; }
-@@ -5388,6 +5452,10 @@
+@@ -5388,6 +5455,10 @@
  $as_echo "too old" >&6; }
      fi
@@ -23657 +24027 @@
  
  
-@@ -5464,6 +5532,23 @@
+@@ -5464,6 +5535,23 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_version" >&5
  $as_echo "$vi_cv_var_python3_version" >&6; }
@@ -23681 +24051 @@
  $as_echo_n "checking Python's install prefix... " >&6; }
  if test "${vi_cv_path_python3_pfx+set}" = set; then :
-@@ -5514,9 +5599,13 @@
+@@ -5514,9 +5602,13 @@
  else
  
@@ -23696 +24066 @@
             vi_cv_path_python3_conf="$d"
           fi
-@@ -5545,13 +5634,12 @@
+@@ -5545,13 +5637,12 @@
         @echo "python3_BASEMODLIBS='$(BASEMODLIBS)'"
         @echo "python3_LIBS='$(LIBS)'"
@@ -23712 +24082 @@
            vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
  
-@@ -5560,9 +5648,9 @@
+@@ -5560,9 +5651,9 @@
  
        PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
@@ -23724 +24094 @@
        PYTHON3_SRC="if_python3.c"
              if test "x$MACOSX" = "xyes"; then
-@@ -5667,12 +5755,12 @@
+@@ -5667,12 +5758,12 @@
  
    $as_echo "#define DYNAMIC_PYTHON3 1" >>confdefs.h
@@ -23741 +24111 @@
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-@@ -5689,15 +5777,17 @@
+@@ -5689,15 +5780,17 @@
       * Only the first pyhton version used will be switched on.
       */
@@ -23760 +24130 @@
            needed = (*simple)("import termios") == -1;
            (*final)();
-@@ -5709,7 +5799,7 @@
+@@ -5709,7 +5802,7 @@
      int main(int argc, char** argv)
      {
@@ -23769 +24139 @@
        return !not_needed;
      }
-@@ -5726,8 +5816,76 @@
+@@ -5726,8 +5819,76 @@
    conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
  
 +
-   CFLAGS=$cflags_save
-   LDFLAGS=$ldflags_save
++  CFLAGS=$cflags_save
++  LDFLAGS=$ldflags_save
 +
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5
@@ -23840 +24210 @@
 +
 +
-+  CFLAGS=$cflags_save
-+  LDFLAGS=$ldflags_save
+   CFLAGS=$cflags_save
+   LDFLAGS=$ldflags_save
 +
    PYTHON_SRC="if_python.c"
    PYTHON_OBJ="objects/if_python.o"
    PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
-@@ -6085,6 +6243,9 @@
+@@ -6085,6 +6246,9 @@
  $as_echo "too old; need Tcl version 8.0 or later" >&6; }
      fi
@@ -23856 +24226 @@
  
  
-@@ -6103,20 +6264,20 @@
+@@ -6103,20 +6267,20 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5
@@ -23880 +24250 @@
  set dummy $RUBY_CMD; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -6181,17 +6342,14 @@
+@@ -6181,17 +6345,14 @@
           RUBY_LIBS="$rubylibs"
         fi
@@ -23906 +24276 @@
  
         if test "X$librubyarg" != "X"; then
-@@ -6209,6 +6367,13 @@
+@@ -6209,6 +6370,13 @@
         RUBY_PRO="if_ruby.pro"
         $as_echo "#define FEAT_RUBY 1" >>confdefs.h
@@ -23920 +24290 @@
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5
  $as_echo "not found; disabling Ruby" >&6; }
-@@ -6218,6 +6383,10 @@
+@@ -6218,6 +6386,10 @@
  $as_echo "too old; need Ruby version 1.6.0 or later" >&6; }
      fi
@@ -23931 +24301 @@
  
  
-@@ -9768,9 +9937,9 @@
+@@ -8528,8 +8700,13 @@
+ if test -z "$SKIP_MOTIF"; then
+   cppflags_save=$CPPFLAGS
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+-  for ac_header in Xm/Xm.h Xm/XpmP.h Xm/JoinSideT.h Xm/TraitP.h Xm/Manager.h \
+-                  Xm/UnhighlightT.h Xm/Notebook.h
++  if test "$zOSUnix" = "yes"; then
++       xmheader="Xm/Xm.h"
++  else
++       xmheader="Xm/Xm.h Xm/XpmP.h Xm/JoinSideT.h Xm/TraitP.h Xm/Manager.h
++          Xm/UnhighlightT.h Xm/Notebook.h"
++  fi
++  for ac_header in $xmheader
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+@@ -8544,7 +8721,7 @@
+ done
+ 
+ 
+-  if test $ac_cv_header_Xm_XpmP_h = yes; then
++  if test "x$ac_cv_header_Xm_XpmP_h" = "xyes"; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmAttributes_21 in Xm/XpmP.h" >&5
+ $as_echo_n "checking for XpmAttributes_21 in Xm/XpmP.h... " >&6; }
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -9768,9 +9945,9 @@
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5
@@ -23944 +24339 @@
    for libname in $tlibs; do
      as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh`
-@@ -11159,7 +11328,47 @@
+@@ -11159,7 +11336,47 @@
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
@@ -23993 +24388 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-@@ -11186,6 +11395,8 @@
+@@ -11186,6 +11403,8 @@
  fi
  rm -f core conftest.err conftest.$ac_objext \
@@ -24002 +24397 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AIX ACL support" >&5
  $as_echo_n "checking for AIX ACL support... " >&6; }
-@@ -11642,7 +11853,8 @@
+@@ -11642,7 +11861,8 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
  $as_echo_n "checking uint32_t is 32 bits... " >&6; }
@@ -24012 +24407 @@
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-@@ -11915,6 +12127,10 @@
+@@ -11915,6 +12135,10 @@
  test -f tags && mv tags tags.save
  if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
@@ -24023 +24418 @@
    TAGPRG="ctags"
    (eval etags     /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags"
-@@ -12344,10 +12560,10 @@
+@@ -12344,10 +12568,10 @@
      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
@@ -24036 +24431 @@
  $as_echo "yes" >&6; }
    else
-@@ -12357,6 +12573,23 @@
+@@ -12357,6 +12581,28 @@
  fi
  
@@ -24057 +24452 @@
 +
 +
++# IBM z/OS reset CFLAGS for config.mk
++if test "$zOSUnix" = "yes"; then
++       CFLAGS="-D_ALL_SOURCE -Wc,float\(ieee\),dll"
++fi
++
  ac_config_files="$ac_config_files auto/config.mk:config.mk.in"
  
  cat >confcache <<\_ACEOF
 diff -Naur vim73.orig/src/blowfish.c vim73/src/blowfish.c
---- vim73.orig/src/blowfish.c   2012-06-03 23:09:52.932006845 +0000
-+++ vim73/src/blowfish.c        2012-06-03 23:09:53.732028133 +0000
+--- vim73.orig/src/blowfish.c   2010-07-14 14:45:39.000000000 +0000
++++ vim73/src/blowfish.c        2012-07-20 20:31:09.647638940 +0000
 @@ -413,6 +413,7 @@
      int    salt_len;
@@ -24083 +24483 @@
      mch_memmove(sbx, sbi, 4 * 4 * 256);
 diff -Naur vim73.orig/src/buffer.c vim73/src/buffer.c
---- vim73.orig/src/buffer.c     2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/buffer.c  2012-06-03 23:09:55.588077525 +0000
-@@ -64,6 +64,9 @@
+--- vim73.orig/src/buffer.c     2010-08-13 09:14:35.000000000 +0000
++++ vim73/src/buffer.c  2012-07-20 20:31:18.240978445 +0000
+@@ -57,13 +57,15 @@
+ 
+ #if defined(FEAT_SIGNS)
+ static void insert_sign __ARGS((buf_T *buf, signlist_T *prev, signlist_T *next, int id, linenr_T lnum, int typenr));
+-static void buf_delete_signs __ARGS((buf_T *buf));
+ #endif
+ 
+ #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
  static char *msg_loclist = N_("[Location List]");
  static char *msg_qflist = N_("[Quickfix List]");
@@ -24095 +24502 @@
  /*
   * Open current buffer, that is: open the memfile and read the file into
-@@ -96,7 +99,7 @@
+@@ -96,7 +98,7 @@
          * There MUST be a memfile, otherwise we can't do anything
          * If we can't create one for the current buffer, take another buffer
@@ -24104 +24511 @@
             if (curbuf->b_ml.ml_mfp != NULL)
                 break;
-@@ -316,12 +319,17 @@
+@@ -316,12 +318,17 @@
   * get a new buffer very soon!
   *
@@ -24123 +24530 @@
  #ifdef FEAT_AUTOCMD
      int                is_curbuf;
-@@ -371,8 +379,12 @@
+@@ -369,19 +376,35 @@
+     /* When the buffer is no longer in a window, trigger BufWinLeave */
+     if (buf->b_nwindows == 1)
      {
++       buf->b_closing = TRUE;
         apply_autocmds(EVENT_BUFWINLEAVE, buf->b_fname, buf->b_fname,
                                                                   FALSE, buf);
 -       if (!buf_valid(buf))        /* autocommands may delete the buffer */
-+       /* Return if autocommands deleted the buffer or made it the only one. */
-+       if (!buf_valid(buf) || (abort_if_last && one_window()))
++       if (!buf_valid(buf))
 +       {
++           /* Autocommands deleted the buffer. */
++aucmd_abort:
 +           EMSG(_(e_auabort));
             return;
 +       }
++       buf->b_closing = FALSE;
++       if (abort_if_last && one_window())
++           /* Autocommands made this the only window. */
++           goto aucmd_abort;
  
         /* When the buffer becomes hidden, but is not unloaded, trigger
          * BufHidden */
-@@ -380,8 +392,13 @@
+        if (!unload_buf)
         {
++           buf->b_closing = TRUE;
             apply_autocmds(EVENT_BUFHIDDEN, buf->b_fname, buf->b_fname,
                                                                   FALSE, buf);
 -           if (!buf_valid(buf))        /* autocmds may delete the buffer */
-+           /* Return if autocommands deleted the buffer or made it the only
-+            * one. */
-+           if (!buf_valid(buf) || (abort_if_last && one_window()))
-+           {
-+               EMSG(_(e_auabort));
-                return;
-+           }
+-               return;
++           if (!buf_valid(buf))
++               /* Autocommands deleted the buffer. */
++               goto aucmd_abort;
++           buf->b_closing = FALSE;
++           if (abort_if_last && one_window())
++               /* Autocommands made this the only window. */
++               goto aucmd_abort;
         }
  # ifdef FEAT_EVAL
         if (aborting())     /* autocmds may abort script processing */
-@@ -416,6 +433,14 @@
+@@ -416,6 +439,14 @@
  #endif
  
@@ -24167 +24584 @@
  #ifdef FEAT_AUTOCMD
      /* Autocommands may have deleted the buffer. */
-@@ -560,6 +585,11 @@
+@@ -527,6 +558,7 @@
+ #ifdef FEAT_AUTOCMD
+     int                is_curbuf = (buf == curbuf);
+ 
++    buf->b_closing = TRUE;
+     apply_autocmds(EVENT_BUFUNLOAD, buf->b_fname, buf->b_fname, FALSE, buf);
+     if (!buf_valid(buf))           /* autocommands may delete the buffer */
+        return;
+@@ -543,6 +575,7 @@
+        if (!buf_valid(buf))        /* autocommands may delete the buffer */
+            return;
+     }
++    buf->b_closing = FALSE;
+ # ifdef FEAT_EVAL
+     if (aborting())        /* autocmds may abort script processing */
+        return;
+@@ -560,6 +593,11 @@
  #ifdef FEAT_DIFF
      diff_buf_delete(buf);          /* Can't use 'diff' for unloaded buffer. */
@@ -24179 +24612 @@
  #ifdef FEAT_FOLDING
      /* No folds in an empty buffer. */
-@@ -639,6 +669,9 @@
+@@ -639,6 +677,9 @@
      {
         clear_wininfo(buf);             /* including window-local options */
@@ -24189 +24622 @@
  #ifdef FEAT_EVAL
      vars_clear(&buf->b_vars.dv_hashtab); /* free all internal variables */
-@@ -661,9 +694,6 @@
+@@ -661,9 +702,6 @@
      vim_free(buf->b_start_fenc);
      buf->b_start_fenc = NULL;
@@ -24199 +24632 @@
  
  /*
-@@ -762,7 +792,7 @@
+@@ -762,7 +800,7 @@
          * open a new, empty buffer. */
         swap_exists_action = SEA_NONE;  /* don't want it again */
@@ -24208 +24641 @@
             old_curbuf = buflist_new(NULL, NULL, 1L, BLN_CURBUF | BLN_LISTED);
         if (old_curbuf != NULL)
-@@ -1109,7 +1139,7 @@
+@@ -1109,7 +1147,7 @@
              * if the buffer still exists.
              */
@@ -24217 +24650 @@
         }
  
-@@ -1133,7 +1163,7 @@
+@@ -1120,6 +1158,9 @@
+         * a window with this buffer.
+         */
+        while (buf == curbuf
++# ifdef FEAT_AUTOCMD
++                  && !(curwin->w_closing || curwin->w_buffer->b_closing)
++# endif
+                   && (firstwin != lastwin || first_tabpage->tp_next != NULL))
+            win_close(curwin, FALSE);
+ #endif
+@@ -1133,7 +1174,7 @@
             close_windows(buf, FALSE);
  #endif
@@ -24226 +24669 @@
         }
  
-@@ -1288,9 +1318,12 @@
+@@ -1288,9 +1329,12 @@
      /* Go to the other buffer. */
      set_curbuf(buf, action);
@@ -24241 +24684 @@
  
  #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
-@@ -1343,6 +1376,10 @@
+@@ -1343,6 +1387,10 @@
  # endif
  #endif
@@ -24252 +24695 @@
         if (unload)
             close_windows(prevbuf, FALSE);
-@@ -1358,7 +1395,7 @@
+@@ -1353,22 +1401,34 @@
+        if (buf_valid(prevbuf))
+ #endif
+        {
++#ifdef FEAT_WINDOWS
++           win_T  *previouswin = curwin;
++#endif
+            if (prevbuf == curbuf)
+                u_sync(FALSE);
             close_buffer(prevbuf == curwin->w_buffer ? curwin : NULL, prevbuf,
                     unload ? action : (action == DOBUF_GOTO
@@ -24258 +24709 @@
 -                       && !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0);
 +                       && !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE);
++#ifdef FEAT_WINDOWS
++           if (curwin != previouswin && win_valid(previouswin))
++             /* autocommands changed curwin, Grr! */
++             curwin = previouswin;
++#endif
         }
      }
  #ifdef FEAT_AUTOCMD
-@@ -1392,10 +1429,6 @@
+     /* An autocommand may have deleted "buf", already entered it (e.g., when
+-     * it did ":bunload") or aborted the script processing! */
++     * it did ":bunload") or aborted the script processing!
++     * If curwin->w_buffer is null, enter_buffer() will make it valid again */
++    if ((buf_valid(buf) && buf != curbuf
+ # ifdef FEAT_EVAL
+-    if (buf_valid(buf) && buf != curbuf && !aborting())
+-# else
+-    if (buf_valid(buf) && buf != curbuf)
++           && !aborting()
++# endif
++# ifdef FEAT_WINDOWS
++        ) || curwin->w_buffer == NULL
+ # endif
++       )
+ #endif
+        enter_buffer(buf);
+ }
+@@ -1392,10 +1452,6 @@
      foldUpdateAll(curwin);     /* update folds (later). */
  #endif
@@ -24272 +24746 @@
      curwin->w_buffer = buf;
      curbuf = buf;
-@@ -1406,6 +1439,10 @@
+@@ -1406,6 +1462,10 @@
         diff_buf_add(curbuf);
  #endif
@@ -24283 +24757 @@
      curwin->w_cursor.lnum = 1;
      curwin->w_cursor.col = 0;
-@@ -1805,9 +1842,6 @@
+@@ -1687,7 +1747,8 @@
+     buf->b_wininfo->wi_win = curwin;
+ 
+ #ifdef FEAT_EVAL
+-    init_var_dict(&buf->b_vars, &buf->b_bufvar);    /* init b: variables */
++    /* init b: variables */
++    init_var_dict(&buf->b_vars, &buf->b_bufvar, VAR_SCOPE);
+ #endif
+ #ifdef FEAT_SYN_HL
+     hash_init(&buf->b_s.b_keywtab);
+@@ -1805,9 +1866,6 @@
  #ifdef FEAT_AUTOCMD
      clear_string_option(&buf->b_p_ft);
@@ -24293 +24777 @@
      clear_string_option(&buf->b_p_cink);
      clear_string_option(&buf->b_p_cino);
-@@ -1917,9 +1951,7 @@
+@@ -1917,9 +1975,7 @@
                 tabpage_new();
             else if (win_split(0, 0) == FAIL)   /* Open in a new window */
@@ -24304 +24788 @@
      }
  #endif
-@@ -2526,6 +2558,9 @@
+@@ -2526,6 +2582,9 @@
      if (p_fdls >= 0)
         curwin->w_p_fdl = p_fdls;
@@ -24314 +24798 @@
  
  /*
-@@ -2690,7 +2725,8 @@
+@@ -2690,7 +2749,8 @@
                 vim_free(ffname);
                 return FAIL;
@@ -24324 +24808 @@
         sfname = vim_strsave(sfname);
         if (ffname == NULL || sfname == NULL)
-@@ -3175,7 +3211,7 @@
+@@ -3175,7 +3235,7 @@
             /* format: "fname + (path) (1 of 2) - VIM" */
  
@@ -24333 +24817 @@
             {
                 p = transstr(gettail(curbuf->b_fname));
-@@ -3231,7 +3267,7 @@
+@@ -3231,7 +3291,7 @@
             if (serverName != NULL)
             {
@@ -24342 +24826 @@
             else
  #endif
-@@ -3240,9 +3276,8 @@
+@@ -3240,9 +3300,8 @@
             if (maxlen > 0)
             {
@@ -24354 +24838 @@
         }
      }
-@@ -3363,7 +3398,8 @@
+@@ -3363,7 +3422,8 @@
   * or truncated if too long, fillchar is used for all whitespace.
   */
@@ -24364 +24848 @@
      char_u     *out;           /* buffer to write into != NameBuff */
      size_t     outlen;         /* length of out[] */
-@@ -3458,6 +3494,18 @@
+@@ -3458,6 +3518,18 @@
      prevchar_isitem = FALSE;
      for (s = usefmt; *s; )
@@ -24383 +24867 @@
             prevchar_isflag = prevchar_isitem = FALSE;
  
-@@ -3473,6 +3521,8 @@
+@@ -3473,6 +3545,8 @@
          * Handle one '%' item.
          */
@@ -24392 +24876 @@
         {
             if (p + 1 >= out + outlen)
-@@ -4355,7 +4405,12 @@
+@@ -4355,7 +4429,12 @@
  {
      int                i;
@@ -24406 +24890 @@
      int                use_firstwin = FALSE;   /* use first window for arglist */
      int                split_ret = OK;
-@@ -4364,6 +4419,8 @@
+@@ -4364,6 +4443,8 @@
      buf_T      *buf;
      tabpage_T  *tpnext;
@@ -24415 +24899 @@
      tabpage_T  *new_curtab = NULL;
  
-@@ -4380,6 +4437,15 @@
+@@ -4380,6 +4461,15 @@
      if (opened == NULL)
         return;
@@ -24431 +24915 @@
      need_mouse_correct = TRUE;
  #endif
-@@ -4401,36 +4467,51 @@
+@@ -4392,7 +4482,7 @@
+      * When the ":tab" modifier was used do this for all tab pages.
+      */
+     if (had_tab > 0)
+-       goto_tabpage_tp(first_tabpage);
++       goto_tabpage_tp(first_tabpage, TRUE);
+     for (;;)
+     {
+        tpnext = curtab->tp_next;
+@@ -4401,36 +4491,51 @@
             wpnext = wp->w_next;
             buf = wp->w_buffer;
@@ -24461 +24954 @@
 +
 +                       if (old_curtab == curtab)
-                        {
--                           opened[i] = TRUE;
++                       {
 +                           ++weight;
 +                           if (old_curwin == wp)
@@ -24469 +24961 @@
 +
 +                       if (weight > (int)opened[i])
-+                       {
+                        {
+-                           opened[i] = TRUE;
 +                           opened[i] = (char_u)weight;
                             if (i == 0)
@@ -24493 +24986 @@
                         }
                         break;
-@@ -4439,7 +4520,7 @@
+@@ -4439,7 +4544,7 @@
             }
             wp->w_arg_idx = i;
@@ -24502 +24995 @@
                 if (P_HID(buf) || forceit || buf->b_nwindows > 1
                                                         || !bufIsChanged(buf))
-@@ -4461,7 +4542,8 @@
+@@ -4461,7 +4566,8 @@
                     }
  #ifdef FEAT_WINDOWS
@@ -24512 +25005 @@
                         use_firstwin = TRUE;
  #ifdef FEAT_WINDOWS
-@@ -4495,20 +4577,16 @@
+@@ -4488,27 +4594,23 @@
+        if (!valid_tabpage(tpnext))
+            tpnext = first_tabpage;     /* start all over...*/
+ # endif
+-       goto_tabpage_tp(tpnext);
++       goto_tabpage_tp(tpnext, TRUE);
+     }
+ 
+     /*
       * Open a window for files in the argument list that don't have one.
       * ARGCOUNT may change while doing this, because of autocommands.
@@ -24537 +25038 @@
  #ifdef FEAT_WINDOWS
      /* ":drop all" should re-use an empty window to avoid "--remote-tab"
-@@ -4518,11 +4596,11 @@
+@@ -4518,11 +4620,11 @@
         use_firstwin = TRUE;
  #endif
@@ -24551 +25052 @@
             /* Move the already present window to below the current window */
             if (curwin->w_arg_idx != i)
-@@ -4531,7 +4609,13 @@
+@@ -4531,7 +4633,13 @@
                 {
                     if (wpnext->w_arg_idx == i)
@@ -24566 +25067 @@
                     }
                 }
-@@ -4586,6 +4670,14 @@
+@@ -4586,9 +4694,17 @@
  #ifdef FEAT_AUTOCMD
      --autocmd_no_enter;
@@ -24574 +25075 @@
 +    {
 +       if (valid_tabpage(last_curtab))
-+           goto_tabpage_tp(last_curtab);
++           goto_tabpage_tp(last_curtab, TRUE);
 +       if (win_valid(last_curwin))
 +           win_enter(last_curwin, FALSE);
@@ -24580 +25081 @@
      /* to window with first arg */
      if (valid_tabpage(new_curtab))
-        goto_tabpage_tp(new_curtab);
-@@ -5465,7 +5557,7 @@
+-       goto_tabpage_tp(new_curtab);
++       goto_tabpage_tp(new_curtab, TRUE);
+     if (win_valid(new_curwin))
+        win_enter(new_curwin, FALSE);
+ 
+@@ -4640,7 +4756,7 @@
+      */
+ #ifdef FEAT_WINDOWS
+     if (had_tab > 0)
+-       goto_tabpage_tp(first_tabpage);
++       goto_tabpage_tp(first_tabpage, TRUE);
+     for (;;)
+     {
+ #endif
+@@ -4658,7 +4774,11 @@
+ #ifdef FEAT_WINDOWS
+                    || (had_tab > 0 && wp != firstwin)
+ #endif
+-                   ) && firstwin != lastwin)
++                   ) && firstwin != lastwin
++#ifdef FEAT_AUTOCMD
++                   && !(wp->w_closing || wp->w_buffer->b_closing)
++#endif
++                   )
+            {
+                win_close(wp, FALSE);
+ #ifdef FEAT_AUTOCMD
+@@ -4676,7 +4796,7 @@
+        /* Without the ":tab" modifier only do the current tab page. */
+        if (had_tab == 0 || tpnext == NULL)
+            break;
+-       goto_tabpage_tp(tpnext);
++       goto_tabpage_tp(tpnext, TRUE);
+     }
+ #endif
+ 
+@@ -5417,7 +5537,7 @@
+ /*
+  * Delete signs in buffer "buf".
+  */
+-    static void
++    void
+ buf_delete_signs(buf)
+     buf_T      *buf;
+ {
+@@ -5465,7 +5585,7 @@
         buf = firstbuf;
      else
@@ -24590 +25135 @@
         if (buf->b_signlist != NULL)
         {
-@@ -5473,7 +5565,7 @@
+@@ -5473,7 +5593,7 @@
             MSG_PUTS_ATTR(lbuf, hl_attr(HLF_D));
             msg_putchar('\n');
@@ -24599 +25144 @@
             vim_snprintf(lbuf, BUFSIZ, _("    line=%ld  id=%d  name=%s"),
                            (long)p->lnum, p->id, sign_typenr2name(p->typenr));
-@@ -5606,7 +5698,7 @@
+@@ -5606,7 +5726,7 @@
      if (!aucmd)                    /* Don't trigger BufDelete autocommands here. */
         block_autocmds();
@@ -24609 +25154 @@
         unblock_autocmds();
 diff -Naur vim73.orig/src/charset.c vim73/src/charset.c
---- vim73.orig/src/charset.c    2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/charset.c 2012-06-03 23:09:55.892085615 +0000
+--- vim73.orig/src/charset.c    2010-08-12 18:16:04.000000000 +0000
++++ vim73/src/charset.c 2012-07-20 20:31:16.277643707 +0000
 @@ -463,41 +463,42 @@
             if (enc_utf8)
@@ -24712 +25257 @@
             }
 diff -Naur vim73.orig/src/config.h.in vim73/src/config.h.in
---- vim73.orig/src/config.h.in  2012-06-03 23:09:52.956007482 +0000
-+++ vim73/src/config.h.in       2012-06-03 23:09:55.372071777 +0000
+--- vim73.orig/src/config.h.in  2010-08-13 13:45:27.000000000 +0000
++++ vim73/src/config.h.in       2012-07-20 20:31:14.604309173 +0000
 @@ -346,9 +346,15 @@
  /* Define if dynamic python does not require RTLD_GLOBAL */
@@ -24739 +25284 @@
  
 diff -Naur vim73.orig/src/config.mk.in vim73/src/config.mk.in
---- vim73.orig/src/config.mk.in 2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/config.mk.in      2012-06-03 23:09:53.304016743 +0000
+--- vim73.orig/src/config.mk.in 2010-07-17 15:28:51.000000000 +0000
++++ vim73/src/config.mk.in      2012-07-20 20:31:08.224304578 +0000
 @@ -30,6 +30,7 @@
  CPP            = @CPP@
@@ -24750 +25295 @@
  X_PRE_LIBS     = @X_PRE_LIBS@
 diff -Naur vim73.orig/src/configure.in vim73/src/configure.in
---- vim73.orig/src/configure.in 2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/configure.in      2012-06-03 23:09:55.368071671 +0000
+--- vim73.orig/src/configure.in 2010-08-13 14:15:17.000000000 +0000
++++ vim73/src/configure.in      2012-07-20 20:31:17.044310922 +0000
 @@ -28,6 +28,16 @@
  AC_HEADER_STDC
@@ -24769 +25314 @@
  if test -z "$CFLAGS"; then
    CFLAGS="-O"
-@@ -491,6 +501,9 @@
+@@ -319,15 +329,18 @@
+                  echo ""
+                  echo "------------------------------------------"
+                  echo " On z/OS Unix, the environment variable"
+-                 echo " __CC_${ccn}MODE must be set to \"1\"!"
++                 echo " _CC_${ccn}MODE must be set to \"1\"!"
+                  echo " Do:"
+                  echo "    export _CC_${ccn}MODE=1"
+                  echo " and then call configure again."
+                  echo "------------------------------------------"
+                  exit 1
+                fi
+-               CFLAGS="$CFLAGS -D_ALL_SOURCE -Wc,float\\(IEEE\\)";
+-                LDFLAGS="$LDFLAGS -Wl,EDIT=NO"
++               # Set CFLAGS for configure process.
++               # This will be reset later for config.mk.
++               # Use haltonmsg to force error for missing H files.
++               CFLAGS="$CFLAGS -D_ALL_SOURCE -Wc,float(ieee),haltonmsg(3296)";
++               LDFLAGS="$LDFLAGS -Wl,EDIT=NO"
+                AC_MSG_RESULT(yes)
+                ;;
+     *)         zOSUnix="no";
+@@ -491,6 +504,9 @@
        LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua${vi_cv_version_lua}.so$LUA_SONAME\\\" $LUA_CFLAGS"
      fi
@@ -24779 +25346 @@
    AC_SUBST(LUA_OBJ)
    AC_SUBST(LUA_PRO)
-@@ -568,13 +581,27 @@
+@@ -568,13 +584,27 @@
         SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
        else
@@ -24811 +25378 @@
        fi
      fi
-@@ -586,13 +613,23 @@
+@@ -586,13 +616,23 @@
      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
        MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
@@ -24836 +25403 @@
          MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
        fi
-@@ -607,10 +644,20 @@
+@@ -607,10 +647,20 @@
      fi
      if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
@@ -24858 +25425 @@
        MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
      fi
-@@ -747,6 +794,10 @@
+@@ -747,6 +797,10 @@
        PERL_CFLAGS="-DDYNAMIC_PERL_DLL=\\\"$libperl\\\" $PERL_CFLAGS"
      fi
@@ -24869 +25436 @@
  AC_SUBST(shrpenv)
  AC_SUBST(PERL_SRC)
-@@ -857,9 +908,9 @@
+@@ -857,9 +911,9 @@
  
         PYTHON_LIBS="${vi_cv_path_python_plibs}"
@@ -24881 +25448 @@
         PYTHON_SRC="if_python.c"
         dnl For Mac OSX 10.2 config.o is included in the Python library.
-@@ -871,7 +922,7 @@
+@@ -871,7 +925,7 @@
         if test "${vi_cv_var_python_version}" = "1.4"; then
            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
@@ -24890 +25457 @@
         dnl On FreeBSD linking with "-pthread" is required to use threads.
         dnl _THREAD_SAFE must be used for compiling then.
-@@ -932,6 +983,10 @@
+@@ -932,6 +986,10 @@
        AC_MSG_RESULT(too old)
      fi
@@ -24901 +25468 @@
  
  AC_SUBST(PYTHON_CONFDIR)
-@@ -958,6 +1013,17 @@
+@@ -958,6 +1016,17 @@
            ${vi_cv_path_python3} -c 'import sys; print(sys.version[:3])'`
      ]])
@@ -24919 +25486 @@
      AC_CACHE_CHECK(Python's install prefix,vi_cv_path_python3_pfx,
      [ vi_cv_path_python3_pfx=`
-@@ -987,9 +1053,13 @@
+@@ -987,9 +1056,13 @@
      AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf,
      [
@@ -24934 +25501 @@
             vi_cv_path_python3_conf="$d"
           fi
-@@ -1014,14 +1084,13 @@
+@@ -1014,14 +1087,13 @@
         @echo "python3_BASEMODLIBS='$(BASEMODLIBS)'"
         @echo "python3_LIBS='$(LIBS)'"
@@ -24951 +25518 @@
            vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
            vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
-@@ -1029,9 +1098,9 @@
+@@ -1029,9 +1101,9 @@
  
        PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
@@ -24963 +25530 @@
        PYTHON3_SRC="if_python3.c"
        dnl For Mac OSX 10.2 config.o is included in the Python library.
-@@ -1109,11 +1178,12 @@
+@@ -1109,11 +1181,12 @@
  if test "$python_ok" = yes && test "$python3_ok" = yes; then
    AC_DEFINE(DYNAMIC_PYTHON)
@@ -24979 +25546 @@
      #include <dlfcn.h>
      /* If this program fails, then RTLD_GLOBAL is needed.
-@@ -1122,15 +1192,17 @@
+@@ -1122,15 +1195,17 @@
       * Only the first pyhton version used will be switched on.
       */
@@ -24998 +25565 @@
            needed = (*simple)("import termios") == -1;
            (*final)();
-@@ -1142,13 +1214,61 @@
+@@ -1142,13 +1217,61 @@
      int main(int argc, char** argv)
      {
@@ -25009 +25576 @@
      [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
 +
-   CFLAGS=$cflags_save
-   LDFLAGS=$ldflags_save
++  CFLAGS=$cflags_save
++  LDFLAGS=$ldflags_save
 +
 +  AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python3)
@@ -25055 +25622 @@
 +    [AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
 +
-+  CFLAGS=$cflags_save
-+  LDFLAGS=$ldflags_save
+   CFLAGS=$cflags_save
+   LDFLAGS=$ldflags_save
 +
    PYTHON_SRC="if_python.c"
    PYTHON_OBJ="objects/if_python.o"
    PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
-@@ -1290,6 +1410,9 @@
+@@ -1290,6 +1413,9 @@
        AC_MSG_RESULT(too old; need Tcl version 8.0 or later)
      fi
@@ -25071 +25638 @@
  AC_SUBST(TCL_SRC)
  AC_SUBST(TCL_OBJ)
-@@ -1299,15 +1422,15 @@
+@@ -1299,15 +1425,15 @@
  
  AC_MSG_CHECKING(--enable-rubyinterp argument)
@@ -25091 +25658 @@
    if test "X$vi_cv_path_ruby" != "X"; then
      AC_MSG_CHECKING(Ruby version)
-@@ -1329,18 +1452,15 @@
+@@ -1329,18 +1455,15 @@
           RUBY_LIBS="$rubylibs"
         fi
@@ -25119 +25686 @@
  
         if test "X$librubyarg" != "X"; then
-@@ -1360,6 +1480,12 @@
+@@ -1360,6 +1483,12 @@
         RUBY_OBJ="objects/if_ruby.o"
         RUBY_PRO="if_ruby.pro"
@@ -25132 +25699 @@
         AC_MSG_RESULT(not found; disabling Ruby)
        fi
-@@ -1367,6 +1493,10 @@
+@@ -1367,6 +1496,10 @@
        AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
      fi
@@ -25143 +25710 @@
  AC_SUBST(RUBY_SRC)
  AC_SUBST(RUBY_OBJ)
-@@ -2529,13 +2659,14 @@
+@@ -2248,10 +2381,15 @@
+ if test -z "$SKIP_MOTIF"; then
+   cppflags_save=$CPPFLAGS
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+-  AC_CHECK_HEADERS(Xm/Xm.h Xm/XpmP.h Xm/JoinSideT.h Xm/TraitP.h Xm/Manager.h \
+-                  Xm/UnhighlightT.h Xm/Notebook.h)
++  if test "$zOSUnix" = "yes"; then
++       xmheader="Xm/Xm.h"
++  else
++       xmheader="Xm/Xm.h Xm/XpmP.h Xm/JoinSideT.h Xm/TraitP.h Xm/Manager.h
++          Xm/UnhighlightT.h Xm/Notebook.h"  
++  fi    
++  AC_CHECK_HEADERS($xmheader)
+ 
+-  if test $ac_cv_header_Xm_XpmP_h = yes; then
++  if test "x$ac_cv_header_Xm_XpmP_h" = "xyes"; then
+     dnl Solaris uses XpmAttributes_21, very annoying.
+     AC_MSG_CHECKING([for XpmAttributes_21 in Xm/XpmP.h])
+     AC_TRY_COMPILE([#include <Xm/XpmP.h>], [XpmAttributes_21 attr;],
+@@ -2529,13 +2667,14 @@
    AC_MSG_RESULT([empty: automatic terminal library selection])
    dnl  On HP-UX 10.10 termcap or termlib should be used instead of
@@ -25161 +25747 @@
    for libname in $tlibs; do
      AC_CHECK_LIB(${libname}, tgetent,,)
-@@ -2975,6 +3106,7 @@
+@@ -2975,6 +3114,7 @@
  
  dnl Link with -lposix1e for ACL stuff; if not found, try -lacl for SGI
@@ -25169 +25755 @@
  AC_ARG_ENABLE(acl,
         [  --disable-acl           Don't check for ACL support.],
-@@ -2997,6 +3129,7 @@
+@@ -2997,6 +3137,7 @@
         AC_MSG_RESULT(yes); AC_DEFINE(HAVE_POSIX_ACL),
         AC_MSG_RESULT(no))
@@ -25177 +25763 @@
  AC_TRY_LINK([
  #ifdef HAVE_SYS_ACL_H
-@@ -3004,7 +3137,7 @@
+@@ -3004,7 +3145,7 @@
  #endif], [acl("foo", GETACLCNT, 0, NULL);
         ],
@@ -25186 +25772 @@
  AC_MSG_CHECKING(for AIX ACL support)
  AC_TRY_LINK([
-@@ -3180,7 +3313,7 @@
+@@ -3180,7 +3321,7 @@
  }],
  AC_MSG_RESULT(ok),
@@ -25195 +25781 @@
  dnl Check for memmove() before bcopy(), makes memmove() be used when both are
  dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.
-@@ -3280,7 +3413,7 @@
+@@ -3280,7 +3421,7 @@
  AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,)
  
@@ -25204 +25790 @@
  dnl -t for typedefs (many ctags have this)
  dnl -s for static functions (Elvis ctags only?)
-@@ -3290,6 +3423,10 @@
+@@ -3290,6 +3431,10 @@
  test -f tags && mv tags tags.save
  if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
@@ -25215 +25801 @@
    TAGPRG="ctags"
    (eval etags     /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags"
-@@ -3477,9 +3614,10 @@
+@@ -3477,9 +3622,10 @@
    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.
@@ -25227 +25813 @@
    else
      AC_MSG_RESULT(no)
-@@ -3487,6 +3625,23 @@
+@@ -3487,6 +3633,28 @@
  fi
  AC_SUBST(DEPEND_CFLAGS_FILTER)
@@ -25248 +25834 @@
 +AC_SUBST(LINK_AS_NEEDED)
 +
++# IBM z/OS reset CFLAGS for config.mk
++if test "$zOSUnix" = "yes"; then
++       CFLAGS="-D_ALL_SOURCE -Wc,float\(ieee\),dll"
++fi
++
  dnl write output files
  AC_OUTPUT(auto/config.mk:config.mk.in)
  
+diff -Naur vim73.orig/src/dehqx.py vim73/src/dehqx.py
+--- vim73.orig/src/dehqx.py     2010-05-15 11:04:12.000000000 +0000
++++ vim73/src/dehqx.py  2012-07-20 20:31:17.260977744 +0000
+@@ -1,7 +1,10 @@
+ # Python script to get both the data and resource fork from a BinHex encoded
+ # file.
+-# Author: Taro Muraoka
+-# Last Change: 2003 Oct 25
++# Author: MURAOKA Taro <koron.kaoriya@gmail.com>
++# Last Change: 2012 Jun 29
++#
++# Copyright (C) 2003,12 MURAOKA Taro <koron.kaoriya@gmail.com>
++# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
+ 
+ import sys
+ import binhex
 diff -Naur vim73.orig/src/diff.c vim73/src/diff.c
---- vim73.orig/src/diff.c       2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/diff.c    2012-06-03 23:09:55.880085297 +0000
+--- vim73.orig/src/diff.c       2010-07-31 13:35:21.000000000 +0000
++++ vim73/src/diff.c    2012-07-20 20:31:16.204310320 +0000
 @@ -783,6 +783,15 @@
         goto theend;
@@ -25299 +25906 @@
             curwin = wp;
 diff -Naur vim73.orig/src/digraph.c vim73/src/digraph.c
---- vim73.orig/src/digraph.c    2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/digraph.c 2012-06-03 23:09:55.156066030 +0000
+--- vim73.orig/src/digraph.c    2010-05-15 11:04:09.000000000 +0000
++++ vim73/src/digraph.c 2012-07-20 20:31:14.044308771 +0000
 @@ -2080,13 +2080,13 @@
  /*
@@ -25349 +25956 @@
  }
 diff -Naur vim73.orig/src/edit.c vim73/src/edit.c
---- vim73.orig/src/edit.c       2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/edit.c    2012-06-03 23:09:55.928086574 +0000
+--- vim73.orig/src/edit.c       2010-08-08 12:55:05.000000000 +0000
++++ vim73/src/edit.c    2012-07-20 20:31:18.157645052 +0000
 @@ -58,6 +58,10 @@
  };
@@ -25489 +26096 @@
  #endif
 -                       c))
-+                       c) && c != Ctrl_RSB))
++                      c) && c != Ctrl_RSB))
             {
                 insert_special(c, FALSE, FALSE);
@@ -25594 +26201 @@
   * Show the popup menu with a different set of matches.
   * May also search for matches again if the previous search was interrupted.
-@@ -3397,14 +3473,20 @@
+@@ -3391,20 +3467,32 @@
+        (*mb_char2bytes)(c, buf);
+        buf[cc] = NUL;
+        ins_char_bytes(buf, cc);
++       if (compl_opt_refresh_always)
++           AppendToRedobuff(buf);
+     }
+     else
+ #endif
++    {
         ins_char(c);
++       if (compl_opt_refresh_always)
++           AppendCharToRedobuff(c);
++    }
  
      /* If we didn't complete finding matches we must search again. */
@@ -25605 +26224 @@
 -    compl_leader = vim_strnsave(ml_get_curline() + compl_col,
 +    /* When 'always' is set, don't reset compl_leader. While completing,
-+     * cursor don't point original position, changing compl_leader would
++     * cursor doesn't point original position, changing compl_leader would
 +     * break redo. */
 +    if (!compl_opt_refresh_always)
@@ -25620 +26239 @@
  
  /*
-@@ -3480,11 +3562,7 @@
+@@ -3480,11 +3568,7 @@
             return;
      }
@@ -25633 +26252 @@
  }
  
-@@ -3653,9 +3731,6 @@
+@@ -3653,9 +3737,6 @@
              * memory that was used, and make sure we can redo the insert. */
             if (compl_curr_match != NULL || compl_leader != NULL || c == Ctrl_E)
@@ -25643 +26262 @@
                  * If any of the original typed text has been changed, eg when
                  * ignorecase is set, we must add back-spaces to the redo
-@@ -3666,25 +3741,9 @@
+@@ -3666,25 +3747,9 @@
                  */
                 if (compl_curr_match != NULL && compl_used_match && c != Ctrl_E)
@@ -25671 +26290 @@
  
  #ifdef FEAT_CINDENT
-@@ -3774,6 +3833,44 @@
+@@ -3759,6 +3824,11 @@
+            if (want_cindent && in_cinkeys(KEY_COMPLETE, ' ', inindent(0)))
+                do_c_expr_indent();
+ #endif
++#ifdef FEAT_AUTOCMD
++           /* Trigger the CompleteDone event to give scripts a chance to act
++            * upon the completion. */
++           apply_autocmds(EVENT_COMPLETEDONE, NULL, NULL, FALSE, curbuf);
++#endif
+        }
+     }
+ 
+@@ -3774,6 +3844,44 @@
  }
  
@@ -25716 +26347 @@
   * (depending on flag) starting from buf and looking for a non-scanned
   * buffer (other than curbuf). curbuf is special, if it is called with
-@@ -3829,10 +3926,14 @@
+@@ -3829,10 +3937,14 @@
      int                type;       /* CTRL_X_OMNI or CTRL_X_FUNCTION */
      char_u     *base;
@@ -25732 +26363 @@
      funcname = (type == CTRL_X_FUNCTION) ? curbuf->b_p_cfu : curbuf->b_p_ofu;
      if (*funcname == NUL)
-@@ -3843,13 +3944,50 @@
+@@ -3843,13 +3955,50 @@
      args[1] = base;
  
@@ -25788 +26419 @@
  #endif /* FEAT_COMPL_FUNC */
  
-@@ -3876,6 +4014,33 @@
+@@ -3876,6 +4025,33 @@
  }
  
@@ -25822 +26453 @@
   * If the given string is already in the list of completions, then return
   * NOTDONE, otherwise add it to the list and return OK.  If there is an error,
-@@ -3889,6 +4054,7 @@
+@@ -3889,6 +4065,7 @@
      char_u     *word;
      int                icase = FALSE;
@@ -25830 +26461 @@
  
      if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
-@@ -3906,13 +4072,15 @@
+@@ -3906,13 +4083,15 @@
             icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");
         if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)
@@ -25847 +26478 @@
      return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, adup);
  }
-@@ -4403,6 +4571,11 @@
+@@ -4403,6 +4582,11 @@
      int            found_end = FALSE;
      int            advance;
@@ -25859 +26490 @@
                         && (compl_shown_match->cp_flags & ORIGINAL_TEXT) == 0)
      {
-@@ -4994,6 +5167,8 @@
+@@ -4994,6 +5178,8 @@
             int         col;
             char_u      *funcname;
@@ -25868 +26499 @@
             /* Call 'completefunc' or 'omnifunc' and get pattern length as a
              * string */
-@@ -5009,8 +5184,40 @@
+@@ -5009,8 +5195,40 @@
             args[0] = (char_u *)"1";
             args[1] = NULL;
@@ -25909 +26540 @@
             if (col < 0)
                 col = curs_col;
-@@ -5089,6 +5296,10 @@
+@@ -5089,6 +5307,10 @@
         else
             edit_submode = (char_u *)_(CTRL_X_MSG(ctrl_x_mode));
@@ -25920 +26551 @@
         vim_free(compl_orig_text);
         compl_orig_text = vim_strnsave(line + compl_col, compl_length);
-@@ -5249,7 +5460,7 @@
+@@ -5249,7 +5471,7 @@
                                 compl_curr_match->cp_number);
                 edit_submode_extra = match_ref;
@@ -25929 +26560 @@
             }
         }
-@@ -5691,6 +5902,8 @@
+@@ -5558,6 +5780,16 @@
+ # define WHITECHAR(cc) vim_iswhite(cc)
+ #endif
+ 
++/*
++ * "flags": INSCHAR_FORMAT - force formatting
++ *         INSCHAR_CTRLV  - char typed just after CTRL-V
++ *         INSCHAR_NO_FEX - don't use 'formatexpr'
++ *
++ *   NOTE: passes the flags value straight through to internal_format() which,
++ *        beside INSCHAR_FORMAT (above), is also looking for these:
++ *         INSCHAR_DO_COM   - format comments
++ *         INSCHAR_COM_LIST - format comments with num list or 2nd line indent
++ */
+     void
+ insertchar(c, flags, second_indent)
+     int                c;                      /* character to insert or NUL */
+@@ -5636,7 +5868,7 @@
+         * Need to remove existing (middle) comment leader and insert end
+         * comment leader.  First, check what comment leader we can find.
+         */
+-       i = get_leader_len(line = ml_get_curline(), &p, FALSE);
++       i = get_leader_len(line = ml_get_curline(), &p, FALSE, TRUE);
+        if (i > 0 && vim_strchr(p, COM_MIDDLE) != NULL) /* Just checking */
+        {
+            /* Skip middle-comment string */
+@@ -5691,6 +5923,8 @@
       * Don't do this when 'cindent' or 'indentexpr' is set, because we might
       * need to re-indent at a ':', or any other character (but not what
@@ -25938 +26595 @@
  #ifdef USE_ON_FLY_SCROLL
      dont_scroll = FALSE;               /* allow scrolling here */
-@@ -5708,6 +5921,9 @@
+@@ -5708,6 +5942,9 @@
  #ifdef FEAT_RIGHTLEFT
             && !p_ri
@@ -25948 +26605 @@
      {
  #define INPUT_BUFLEN 100
-@@ -5902,6 +6118,7 @@
+@@ -5795,6 +6032,9 @@
+ 
+ /*
+  * Format text at the current insert position.
++ *
++ * If the INSCHAR_COM_LIST flag is present, then the value of second_indent
++ * will be the comment leader length sent to open_line().
+  */
+     static void
+ internal_format(textwidth, second_indent, flags, format_only, c)
+@@ -5869,7 +6109,7 @@
+ 
+        /* Don't break until after the comment leader */
+        if (do_comments)
+-           leader_len = get_leader_len(ml_get_curline(), NULL, FALSE);
++           leader_len = get_leader_len(ml_get_curline(), NULL, FALSE, TRUE);
+        else
+            leader_len = 0;
+ 
+@@ -5902,6 +6142,7 @@
          * Stop at first entered white when 'formatoptions' has 'v'
          */
@@ -25956 +26632 @@
                     || curwin->w_cursor.col >= Insstart.col)
         {
-@@ -6598,11 +6815,7 @@
+@@ -6072,23 +6313,59 @@
+                + (fo_white_par ? OPENLINE_KEEPTRAIL : 0)
+ #ifdef FEAT_COMMENTS
+                + (do_comments ? OPENLINE_DO_COM : 0)
++               + ((flags & INSCHAR_COM_LIST) ? OPENLINE_COM_LIST : 0)
+ #endif
+-               , old_indent);
+-       old_indent = 0;
++               , ((flags & INSCHAR_COM_LIST) ? second_indent : old_indent));
++       if (!(flags & INSCHAR_COM_LIST))
++           old_indent = 0;
+ 
+        replace_offset = 0;
+        if (first_line)
+        {
+-           if (second_indent < 0 && has_format_option(FO_Q_NUMBER))
+-               second_indent = get_number_indent(curwin->w_cursor.lnum -1);
+-           if (second_indent >= 0)
++           if (!(flags & INSCHAR_COM_LIST))
+            {
++               /*
++                * This section is for auto-wrap of numeric lists.  When not
++                * in insert mode (i.e. format_lines()), the INSCHAR_COM_LIST
++                * flag will be set and open_line() will handle it (as seen
++                * above).  The code here (and in get_number_indent()) will
++                * recognize comments if needed...
++                */
++               if (second_indent < 0 && has_format_option(FO_Q_NUMBER))
++                   second_indent =
++                                get_number_indent(curwin->w_cursor.lnum - 1);
++               if (second_indent >= 0)
++               {
+ #ifdef FEAT_VREPLACE
+-               if (State & VREPLACE_FLAG)
+-                   change_indent(INDENT_SET, second_indent, FALSE, NUL, TRUE);
+-               else
++                   if (State & VREPLACE_FLAG)
++                       change_indent(INDENT_SET, second_indent,
++                                                           FALSE, NUL, TRUE);
++                   else
++#endif
++#ifdef FEAT_COMMENTS
++                       if (leader_len > 0 && second_indent - leader_len > 0)
++                   {
++                       int i;
++                       int padding = second_indent - leader_len;
++
++                       /* We started at the first_line of a numbered list
++                        * that has a comment.  the open_line() function has
++                        * inserted the proper comment leader and positioned
++                        * the cursor at the end of the split line.  Now we
++                        * add the additional whitespace needed after the
++                        * comment leader for the numbered list.  */
++                       for (i = 0; i < padding; i++)
++                           ins_str((char_u *)" ");
++                       changed_bytes(curwin->w_cursor.lnum, leader_len);
++                   }
++                   else
++                   {
+ #endif
+-                   (void)set_indent(second_indent, SIN_CHANGED);
++                       (void)set_indent(second_indent, SIN_CHANGED);
++#ifdef FEAT_COMMENTS
++                   }
++#endif
++               }
+            }
+            first_line = FALSE;
+        }
+@@ -6194,7 +6471,7 @@
+     /* With the 'c' flag in 'formatoptions' and 't' missing: only format
+      * comments. */
+     if (has_format_option(FO_WRAP_COMS) && !has_format_option(FO_WRAP)
+-                                    && get_leader_len(old, NULL, FALSE) == 0)
++                                    && get_leader_len(old, NULL, FALSE, TRUE) == 0)
+        return;
+ #endif
+ 
+@@ -6598,11 +6875,7 @@
      char_u     *s;
  
@@ -25968 +26722 @@
      {
         s = last_insert;
-@@ -6640,7 +6853,7 @@
+@@ -6640,7 +6913,7 @@
      char_u     *s;
  {
@@ -25977 +26731 @@
      int                len;
  
-@@ -7202,7 +7415,7 @@
+@@ -7202,7 +7475,7 @@
      int                cc;
  {
@@ -25986 +26740 @@
      int                c;
  
-@@ -8768,7 +8981,7 @@
+@@ -8352,7 +8625,7 @@
+     {
+        temp = curwin->w_cursor.col;
+        if (!can_bs(BS_EOL)             /* only if "eol" included */
+-               || do_join(2, FALSE, TRUE) == FAIL)
++               || do_join(2, FALSE, TRUE, FALSE) == FAIL)
+            vim_beep();
+        else
+            curwin->w_cursor.col = temp;
+@@ -8533,7 +8806,7 @@
+                        ptr[len - 1] = NUL;
+                }
+ 
+-               (void)do_join(2, FALSE, FALSE);
++               (void)do_join(2, FALSE, FALSE, FALSE);
+                if (temp == NUL && gchar_cursor() != NUL)
+                    inc_cursor();
+            }
+@@ -8768,7 +9041,7 @@
       * We can emulate the vi behaviour by pretending there is a dollar
       * displayed even when there isn't.
@@ -25995 +26767 @@
  
  #ifdef FEAT_FOLDING
-@@ -9598,6 +9811,7 @@
+@@ -9598,6 +9871,7 @@
  {
      int            c;
@@ -26003 +26775 @@
      pc_status = PC_STATUS_UNSET;
      if (redrawing() && !char_avail())
-@@ -9606,6 +9820,7 @@
+@@ -9606,6 +9880,7 @@
         ins_redraw(FALSE);
  
@@ -26011 +26783 @@
         add_to_showcmd_c(Ctrl_K);
  #endif
-@@ -9622,8 +9837,10 @@
+@@ -9622,8 +9897,10 @@
      c = plain_vgetc();
      --no_mapping;
@@ -26024 +26796 @@
      if (IS_SPECIAL(c) || mod_mask)         /* special key */
      {
-@@ -9635,6 +9852,7 @@
+@@ -9635,6 +9912,7 @@
      }
      if (c != ESC)
@@ -26032 +26804 @@
         {
             /* may need to redraw when no more chars available now */
-@@ -9642,11 +9860,9 @@
+@@ -9642,11 +9920,9 @@
  
             if (char2cells(c) == 1)
@@ -26045 +26817 @@
  #ifdef FEAT_CMDL_INFO
             add_to_showcmd_c(c);
-@@ -9657,8 +9873,10 @@
+@@ -9657,8 +9933,10 @@
         cc = plain_vgetc();
         --no_mapping;
@@ -26058 +26830 @@
         {
             AppendToRedobuff((char_u *)CTRL_V_STR);
-@@ -9680,7 +9898,7 @@
+@@ -9680,7 +9958,7 @@
   * Handle CTRL-E and CTRL-Y in Insert mode: copy char from other line.
   * Returns the char to be inserted, or NUL if none found.
@@ -26067 +26839 @@
      linenr_T   lnum;
  {
-@@ -9870,3 +10088,52 @@
+@@ -9870,3 +10148,52 @@
      validate_virtcol();
      return curwin->w_virtcol;
@@ -26121 +26893 @@
 +#endif
 diff -Naur vim73.orig/src/eval.c vim73/src/eval.c
---- vim73.orig/src/eval.c       2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/eval.c    2012-06-03 23:09:55.932086681 +0000
+--- vim73.orig/src/eval.c       2010-08-09 20:12:14.000000000 +0000
++++ vim73/src/eval.c    2012-07-20 20:31:18.337645181 +0000
 @@ -10,9 +10,6 @@
  /*
@@ -26159 +26931 @@
  static char_u *skip_var_list __ARGS((char_u *arg, int *var_count, int *semicolon));
  static char_u *skip_var_one __ARGS((char_u *arg));
-@@ -433,9 +428,9 @@
+@@ -429,31 +424,22 @@
+ static int get_lit_string_tv __ARGS((char_u **arg, typval_T *rettv, int evaluate));
+ static int get_list_tv __ARGS((char_u **arg, typval_T *rettv, int evaluate));
+ static int rettv_list_alloc __ARGS((typval_T *rettv));
+-static listitem_T *listitem_alloc __ARGS((void));
  static void listitem_free __ARGS((listitem_T *item));
- static void listitem_remove __ARGS((list_T *l, listitem_T *item));
+-static void listitem_remove __ARGS((list_T *l, listitem_T *item));
  static long list_len __ARGS((list_T *l));
 -static int list_equal __ARGS((list_T *l1, list_T *l2, int ic));
 -static int dict_equal __ARGS((dict_T *d1, dict_T *d2, int ic));
 -static int tv_equal __ARGS((typval_T *tv1, typval_T *tv2, int ic));
+-static listitem_T *list_find __ARGS((list_T *l, long n));
 +static int list_equal __ARGS((list_T *l1, list_T *l2, int ic, int recursive));
 +static int dict_equal __ARGS((dict_T *d1, dict_T *d2, int ic, int recursive));
 +static int tv_equal __ARGS((typval_T *tv1, typval_T *tv2, int ic, int recursive));
- static listitem_T *list_find __ARGS((list_T *l, long n));
  static long list_find_nr __ARGS((list_T *l, long idx, int *errorp));
  static long list_idx_of_item __ARGS((list_T *l, listitem_T *item));
-@@ -447,13 +442,13 @@
+-static void list_append __ARGS((list_T *l, listitem_T *item));
+ 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));
+ static int list_concat __ARGS((list_T *l1, list_T *l2, typval_T *tv));
  static list_T *list_copy __ARGS((list_T *orig, int deep, int copyID));
- static void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
+-static void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
  static char_u *list2string __ARGS((typval_T *tv, int copyID));
 +static int list_join_inner __ARGS((garray_T *gap, list_T *l, char_u *sep, int echo_style, int copyID, garray_T *join_gap));
  static int list_join __ARGS((garray_T *gap, list_T *l, char_u *sep, int echo, int copyID));
  static int free_unref_items __ARGS((int copyID));
- static void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));
- static void set_ref_in_list __ARGS((list_T *l, int copyID));
- static void set_ref_in_item __ARGS((typval_T *tv, int copyID));
+-static void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));
+-static void set_ref_in_list __ARGS((list_T *l, int copyID));
+-static void set_ref_in_item __ARGS((typval_T *tv, int copyID));
  static int rettv_dict_alloc __ARGS((typval_T *rettv));
 -static void dict_unref __ARGS((dict_T *d));
@@ -26187 +26967 @@
  static dictitem_T *dictitem_copy __ARGS((dictitem_T *org));
  static void dictitem_remove __ARGS((dict_T *dict, dictitem_T *item));
-@@ -480,6 +475,7 @@
+@@ -480,6 +466,7 @@
  static void f_acos __ARGS((typval_T *argvars, typval_T *rettv));
  #endif
@@ -26195 +26975 @@
  static void f_argc __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_argidx __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -608,6 +604,7 @@
+@@ -608,6 +595,7 @@
  static void f_inputsave __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_inputsecret __ARGS((typval_T *argvars, typval_T *rettv));
@@ -26203 +26983 @@
  static void f_islocked __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_items __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -625,6 +622,9 @@
+@@ -625,6 +613,9 @@
  static void f_log __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_log10 __ARGS((typval_T *argvars, typval_T *rettv));
@@ -26213 +26993 @@
  static void f_maparg __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_mapcheck __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -646,6 +646,7 @@
+@@ -646,6 +637,7 @@
  #endif
  static void f_nextnonblank __ARGS((typval_T *argvars, typval_T *rettv));
@@ -26221 +27001 @@
  #ifdef FEAT_FLOAT
  static void f_pow __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -757,6 +758,7 @@
+@@ -653,6 +645,12 @@
+ static void f_prevnonblank __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_printf __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_pumvisible __ARGS((typval_T *argvars, typval_T *rettv));
++#ifdef FEAT_PYTHON3
++static void f_py3eval __ARGS((typval_T *argvars, typval_T *rettv));
++#endif
++#ifdef FEAT_PYTHON
++static void f_pyeval __ARGS((typval_T *argvars, typval_T *rettv));
++#endif
+ static void f_range __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_readfile __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_reltime __ARGS((typval_T *argvars, typval_T *rettv));
+@@ -757,6 +755,7 @@
  static void f_winsaveview __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_winwidth __ARGS((typval_T *argvars, typval_T *rettv));
@@ -26229 +27022 @@
  static int list2fpos __ARGS((typval_T *arg, pos_T *posp, int *fnump));
  static pos_T *var2fpos __ARGS((typval_T *varp, int dollar_lnum, int *fnum));
-@@ -791,6 +793,8 @@
+@@ -791,6 +790,8 @@
  static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
  static int var_check_ro __ARGS((int flags, char_u *name));
@@ -26238 +27031 @@
  static int item_copy __ARGS((typval_T *from, typval_T *to, int deep, int copyID));
  static char_u *find_option_end __ARGS((char_u **arg, int *opt_flags));
-@@ -853,6 +857,7 @@
- 
-     init_var_dict(&globvardict, &globvars_var);
-     init_var_dict(&vimvardict, &vimvars_var);
+@@ -820,8 +821,6 @@
+ static char_u *autoload_name __ARGS((char_u *name));
+ static void cat_func_name __ARGS((char_u *buf, ufunc_T *fp));
+ static void func_free __ARGS((ufunc_T *fp));
+-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));
+@@ -851,8 +850,9 @@
+     int                    i;
+     struct vimvar   *p;
+ 
+-    init_var_dict(&globvardict, &globvars_var);
+-    init_var_dict(&vimvardict, &vimvars_var);
++    init_var_dict(&globvardict, &globvars_var, VAR_DEF_SCOPE);
++    init_var_dict(&vimvardict, &vimvars_var, VAR_SCOPE);
 +    vimvardict.dv_lock = VAR_FIXED;
      hash_init(&compat_hashtab);
      hash_init(&func_hashtab);
  
-@@ -875,10 +880,11 @@
+@@ -875,10 +875,11 @@
             hash_add(&compat_hashtab, p->vv_di.di_key);
      }
@@ -26259 +27065 @@
      sortFunctions();
  #endif
-@@ -910,6 +916,7 @@
+@@ -910,6 +911,7 @@
      hash_clear(&compat_hashtab);
  
@@ -26267 +27073 @@
      /* global variables */
      vars_clear(&globvarht);
-@@ -1355,7 +1362,11 @@
+@@ -1355,7 +1357,11 @@
         {
             ga_init2(&ga, (int)sizeof(char), 80);
@@ -26279 +27085 @@
             retval = (char_u *)ga.ga_data;
         }
-@@ -1557,7 +1568,7 @@
+@@ -1557,7 +1563,7 @@
   * arguments are currently supported.
   * Returns OK or FAIL.
@@ -26288 +27094 @@
      char_u      *func;
      int                argc;
-@@ -2325,7 +2336,7 @@
+@@ -2325,7 +2331,7 @@
             else if (endchars != NULL
                              && vim_strchr(endchars, *skipwhite(arg)) == NULL)
@@ -26297 +27103 @@
                 c1 = name[len];
                 name[len] = NUL;
-@@ -2718,8 +2729,27 @@
+@@ -2718,8 +2724,39 @@
             lp->ll_list = NULL;
             lp->ll_dict = lp->ll_tv->vval.v_dict;
             lp->ll_di = dict_find(lp->ll_dict, key, len);
 +
-+           /* When assigning to g: check that a function and variable name is
-+            * valid. */
-+           if (rettv != NULL && lp->ll_dict == &globvardict)
++           /* When assigning to a scope dictionary check that a function and
++            * variable name is valid (only variable name unless it is l: or
++            * g: dictionary). Disallow overwriting a builtin function. */
++           if (rettv != NULL && lp->ll_dict->dv_scope != 0)
 +           {
-+               if (rettv->v_type == VAR_FUNC
++               int prevval;
++               int wrong;
++
++               if (len != -1)
++               {
++                   prevval = key[len];
++                   key[len] = NUL;
++               }
++               wrong = (lp->ll_dict->dv_scope == VAR_DEF_SCOPE
++                              && rettv->v_type == VAR_FUNC
 +                              && var_check_func_name(key, lp->ll_di == NULL))
-+                   return NULL;
-+               if (!valid_varname(key))
++                       || !valid_varname(key);
++               if (len != -1)
++                   key[len] = prevval;
++               if (wrong)
 +                   return NULL;
 +           }
@@ -26325 +27143 @@
                 if (*p == '[' || *p == '.' || unlet)
                 {
-@@ -2739,6 +2769,10 @@
+@@ -2739,6 +2776,10 @@
                     p = NULL;
                 break;
@@ -26336 +27154 @@
                 clear_tv(&var1);
             lp->ll_tv = &lp->ll_di->di_tv;
-@@ -2770,6 +2804,8 @@
+@@ -2770,6 +2811,8 @@
             {
                 if (lp->ll_range && !lp->ll_empty2)
@@ -26345 +27163 @@
             }
  
-@@ -2787,7 +2823,11 @@
+@@ -2787,7 +2830,11 @@
                 {
                     ni = list_find(lp->ll_list, lp->ll_n2);
@@ -26357 +27175 @@
                 }
  
-@@ -2795,7 +2835,11 @@
+@@ -2795,7 +2842,11 @@
                 if (lp->ll_n1 < 0)
                     lp->ll_n1 = list_idx_of_item(lp->ll_list, lp->ll_li);
@@ -26369 +27187 @@
  
             lp->ll_tv = &lp->ll_li->li_tv;
-@@ -3337,6 +3381,18 @@
+@@ -3337,6 +3388,18 @@
      int                failed = FALSE;
      funcdict_T fudi;
@@ -26388 +27206 @@
      if (fudi.fd_newkey != NULL)
      {
-@@ -3386,6 +3442,9 @@
+@@ -3386,6 +3449,9 @@
         {
             curwin->w_cursor.lnum = lnum;
@@ -26398 +27216 @@
         arg = startarg;
         if (get_func_tv(name, (int)STRLEN(name), &rettv, &arg,
-@@ -4349,7 +4408,8 @@
+@@ -4349,7 +4415,8 @@
                 else
                 {
@@ -26408 +27226 @@
                         n1 = !n1;
                 }
-@@ -4378,7 +4438,8 @@
+@@ -4378,7 +4445,8 @@
                 else
                 {
@@ -26418 +27236 @@
                         n1 = !n1;
                 }
-@@ -5097,9 +5158,7 @@
+@@ -5097,9 +5165,7 @@
             else
                 ret = OK;
@@ -26429 +27247 @@
  
      *arg = skipwhite(*arg);
-@@ -5913,10 +5972,11 @@
+@@ -5868,7 +5934,7 @@
+ /*
+  * Allocate a list item.
+  */
+-    static listitem_T *
++    listitem_T *
+ listitem_alloc()
+ {
+     return (listitem_T *)alloc(sizeof(listitem_T));
+@@ -5888,7 +5954,7 @@
+ /*
+  * Remove a list item from a List and free it.  Also clears the value.
+  */
+-    static void
++    void
+ listitem_remove(l, item)
+     list_T  *l;
+     listitem_T *item;
+@@ -5913,10 +5979,11 @@
   * Return TRUE when two lists have exactly the same values.
   */
@@ -26442 +27278 @@
      listitem_T *item1, *item2;
  
-@@ -5930,7 +5990,7 @@
+@@ -5930,7 +5997,7 @@
      for (item1 = l1->lv_first, item2 = l2->lv_first;
             item1 != NULL && item2 != NULL;
@@ -26451 +27287 @@
      return item1 == NULL && item2 == NULL;
  }
-@@ -5952,10 +6012,11 @@
+@@ -5952,10 +6019,11 @@
   * Return TRUE when two dictionaries have exactly the same key/values.
   */
@@ -26464 +27300 @@
      hashitem_T *hi;
      dictitem_T *item2;
-@@ -5976,7 +6037,7 @@
+@@ -5976,7 +6044,7 @@
             item2 = dict_find(d2, hi->hi_key, -1);
             if (item2 == NULL)
@@ -26473 +27309 @@
             --todo;
         }
-@@ -5984,41 +6045,54 @@
+@@ -5984,41 +6052,54 @@
      return TRUE;
  }
@@ -26539 +27375 @@
  
         case VAR_FUNC:
-@@ -6502,47 +6576,119 @@
+@@ -6049,7 +6130,7 @@
+  * A negative index is counted from the end; -1 is the last item.
+  * Returns NULL when "n" is out of range.
+  */
+-    static listitem_T *
++    listitem_T *
+ list_find(l, n)
+     list_T     *l;
+     long       n;
+@@ -6191,7 +6272,7 @@
+ /*
+  * Append item "item" to the end of list "l".
+  */
+-    static void
++    void
+ list_append(l, item)
+     list_T     *l;
+     listitem_T *item;
+@@ -6304,7 +6385,7 @@
+  * If "item" is NULL append at the end.
+  * Return FAIL when out of memory.
+  */
+-    static int
++    int
+ list_insert_tv(l, tv, item)
+     list_T     *l;
+     typval_T   *tv;
+@@ -6449,7 +6530,7 @@
+  * Remove items "item" to "item2" from list "l".
+  * Does not free the listitem or the value!
+  */
+-    static void
++    void
+ list_remove(l, item, item2)
+     list_T     *l;
+     listitem_T *item;
+@@ -6502,47 +6583,119 @@
      return (char_u *)ga.ga_data;
  }
@@ -26676 +27548 @@
   *
   * We use reference counts to be able to free most items right away when they
-@@ -6635,6 +6781,10 @@
+@@ -6635,6 +6788,18 @@
      /* v: vars */
      set_ref_in_ht(&vimvarht, copyID);
@@ -26684 +27556 @@
 +#endif
 +
++#ifdef FEAT_PYTHON
++    set_ref_in_python(copyID);
++#endif
++
++#ifdef FEAT_PYTHON3
++    set_ref_in_python3(copyID);
++#endif
++
      /*
       * 2. Free lists and dictionaries that are not referenced.
       */
-@@ -6837,7 +6987,7 @@
+@@ -6720,7 +6885,7 @@
+ /*
+  * Mark all lists and dicts referenced through hashtab "ht" with "copyID".
+  */
+-    static void
++    void
+ set_ref_in_ht(ht, copyID)
+     hashtab_T  *ht;
+     int                copyID;
+@@ -6740,7 +6905,7 @@
+ /*
+  * Mark all lists and dicts referenced through list "l" with "copyID".
+  */
+-    static void
++    void
+ set_ref_in_list(l, copyID)
+     list_T     *l;
+     int                copyID;
+@@ -6754,7 +6919,7 @@
+ /*
+  * Mark all lists and dicts referenced through typval "tv" with "copyID".
+  */
+-    static void
++    void
+ set_ref_in_item(tv, copyID)
+     typval_T   *tv;
+     int                copyID;
+@@ -6798,7 +6963,7 @@
+     d = (dict_T *)alloc(sizeof(dict_T));
+     if (d != NULL)
+     {
+-       /* Add the list to the list of dicts for garbage collection. */
++       /* Add the dict to the list of dicts for garbage collection. */
+        if (first_dict != NULL)
+            first_dict->dv_used_prev = d;
+        d->dv_used_next = first_dict;
+@@ -6807,6 +6972,7 @@
+ 
+        hash_init(&d->dv_hashtab);
+        d->dv_lock = 0;
++       d->dv_scope = 0;
+        d->dv_refcount = 0;
+        d->dv_copyID = 0;
+     }
+@@ -6837,7 +7003,7 @@
   * Unreference a Dictionary: decrement the reference count and free it when it
   * becomes zero.
@@ -26696 +27620 @@
      dict_T *d;
  {
-@@ -7075,7 +7225,7 @@
+@@ -7075,7 +7241,7 @@
  }
  
@@ -26705 +27629 @@
   */
      int
-@@ -7097,6 +7247,7 @@
+@@ -7097,6 +7263,7 @@
         dictitem_free(item);
         return FAIL;
@@ -26713 +27637 @@
  }
  
-@@ -7649,6 +7800,7 @@
+@@ -7649,6 +7816,7 @@
      {"acos",           1, 1, f_acos},  /* WJMc */
  #endif
@@ -26721 +27645 @@
      {"argc",           0, 0, f_argc},
      {"argidx",         0, 0, f_argidx},
-@@ -7708,7 +7860,7 @@
+@@ -7708,7 +7876,7 @@
  #ifdef FEAT_FLOAT
      {"exp",            1, 1, f_exp},
@@ -26730 +27654 @@
      {"feedkeys",       1, 2, f_feedkeys},
      {"file_readable",  1, 1, f_filereadable},  /* obsolete */
-@@ -7759,7 +7911,7 @@
+@@ -7759,7 +7927,7 @@
      {"getwinposx",     0, 0, f_getwinposx},
      {"getwinposy",     0, 0, f_getwinposy},
@@ -26739 +27663 @@
      {"has",            1, 1, f_has},
      {"has_key",                2, 2, f_has_key},
-@@ -7784,6 +7936,7 @@
+@@ -7784,6 +7952,7 @@
      {"inputsave",      0, 0, f_inputsave},
      {"inputsecret",    1, 2, f_inputsecret},
@@ -26747 +27671 @@
      {"islocked",       1, 1, f_islocked},
      {"items",          1, 1, f_items},
-@@ -7801,8 +7954,11 @@
+@@ -7801,8 +7970,11 @@
      {"log",            1, 1, f_log},
      {"log10",          1, 1, f_log10},
@@ -26760 +27684 @@
      {"match",          2, 4, f_match},
      {"matchadd",       2, 4, f_matchadd},
-@@ -7822,6 +7978,7 @@
+@@ -7822,6 +7994,7 @@
  #endif
      {"nextnonblank",   1, 1, f_nextnonblank},
@@ -26768 +27692 @@
  #ifdef FEAT_FLOAT
      {"pow",            2, 2, f_pow},
-@@ -7870,7 +8027,7 @@
+@@ -7829,6 +8002,12 @@
+     {"prevnonblank",   1, 1, f_prevnonblank},
+     {"printf",         2, 19, f_printf},
+     {"pumvisible",     0, 0, f_pumvisible},
++#ifdef FEAT_PYTHON3
++    {"py3eval",                1, 1, f_py3eval},
++#endif
++#ifdef FEAT_PYTHON
++    {"pyeval",         1, 1, f_pyeval},
++#endif
+     {"range",          1, 3, f_range},
+     {"readfile",       1, 3, f_readfile},
+     {"reltime",                0, 2, f_reltime},
+@@ -7870,7 +8049,7 @@
      {"sin",            1, 1, f_sin},
      {"sinh",           1, 1, f_sinh},
@@ -26777 +27714 @@
      {"spellbadword",   0, 1, f_spellbadword},
      {"spellsuggest",   1, 3, f_spellsuggest},
-@@ -7933,6 +8090,7 @@
+@@ -7933,6 +8112,7 @@
      {"winsaveview",    0, 0, f_winsaveview},
      {"winwidth",       1, 1, f_winwidth},
@@ -26785 +27722 @@
  
  #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
-@@ -8497,7 +8655,7 @@
+@@ -8497,7 +8677,7 @@
      if (argvars[0].v_type == VAR_LIST)
      {
@@ -26794 +27731 @@
             copy_tv(&argvars[0], rettv);
      }
-@@ -8506,6 +8664,18 @@
+@@ -8506,6 +8686,18 @@
  }
  
@@ -26813 +27750 @@
   */
      static void
-@@ -9298,7 +9468,7 @@
+@@ -8980,6 +9172,45 @@
+ #endif
+ }
+ 
++    int
++func_call(name, args, selfdict, rettv)
++    char_u     *name;
++    typval_T   *args;
++    dict_T     *selfdict;
++    typval_T   *rettv;
++{
++    listitem_T *item;
++    typval_T   argv[MAX_FUNC_ARGS + 1];
++    int                argc = 0;
++    int                dummy;
++    int                r = 0;
++
++    for (item = args->vval.v_list->lv_first; item != NULL;
++                                                        item = item->li_next)
++    {
++       if (argc == MAX_FUNC_ARGS)
++       {
++           EMSG(_("E699: Too many arguments"));
++           break;
++       }
++       /* Make a copy of each argument.  This is needed to be able to set
++        * v_lock to VAR_FIXED in the copy without changing the original list.
++        */
++       copy_tv(&item->li_tv, &argv[argc++]);
++    }
++
++    if (item == NULL)
++       r = call_func(name, (int)STRLEN(name), rettv, argc, argv,
++                                curwin->w_cursor.lnum, curwin->w_cursor.lnum,
++                                                     &dummy, TRUE, selfdict);
++
++    /* Free the arguments. */
++    while (argc > 0)
++       clear_tv(&argv[--argc]);
++
++    return r;
++}
++
+ /*
+  * "call(func, arglist)" function
+  */
+@@ -8989,10 +9220,6 @@
+     typval_T   *rettv;
+ {
+     char_u     *func;
+-    typval_T   argv[MAX_FUNC_ARGS + 1];
+-    int                argc = 0;
+-    listitem_T *item;
+-    int                dummy;
+     dict_T     *selfdict = NULL;
+ 
+     if (argvars[1].v_type != VAR_LIST)
+@@ -9020,28 +9247,7 @@
+        selfdict = argvars[2].vval.v_dict;
+     }
+ 
+-    for (item = argvars[1].vval.v_list->lv_first; item != NULL;
+-                                                        item = item->li_next)
+-    {
+-       if (argc == MAX_FUNC_ARGS)
+-       {
+-           EMSG(_("E699: Too many arguments"));
+-           break;
+-       }
+-       /* Make a copy of each argument.  This is needed to be able to set
+-        * v_lock to VAR_FIXED in the copy without changing the original list.
+-        */
+-       copy_tv(&item->li_tv, &argv[argc++]);
+-    }
+-
+-    if (item == NULL)
+-       (void)call_func(func, (int)STRLEN(func), rettv, argc, argv,
+-                                curwin->w_cursor.lnum, curwin->w_cursor.lnum,
+-                                                     &dummy, TRUE, selfdict);
+-
+-    /* Free the arguments. */
+-    while (argc > 0)
+-       clear_tv(&argv[--argc]);
++    (void)func_call(func, &argvars[1], selfdict, rettv);
+ }
+ 
+ #ifdef FEAT_FLOAT
+@@ -9298,7 +9504,7 @@
  
      if (!error)
@@ -26822 +27846 @@
  }
  
-@@ -9389,7 +9559,7 @@
+@@ -9389,7 +9595,7 @@
             }
  
@@ -26831 +27855 @@
         }
      }
-@@ -9416,7 +9586,7 @@
+@@ -9416,7 +9622,7 @@
                 if (!HASHITEM_EMPTY(hi))
                 {
@@ -26840 +27864 @@
                 }
             }
-@@ -9857,17 +10027,36 @@
+@@ -9857,17 +10063,36 @@
      char_u     *s;
      int                len;
@@ -26879 +27903 @@
      else
      {
-@@ -9875,12 +10064,25 @@
+@@ -9875,12 +10100,25 @@
          * for 'wildignore' and don't put matches for 'suffixes' at the end. */
         if (argvars[1].v_type != VAR_UNKNOWN
@@ -26907 +27931 @@
         else
             rettv->vval.v_string = NULL;
-@@ -9896,6 +10098,8 @@
+@@ -9896,6 +10134,8 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -26916 +27940 @@
      {
         list_T          *l1, *l2;
-@@ -9905,7 +10109,7 @@
+@@ -9905,7 +10145,7 @@
  
         l1 = argvars[0].vval.v_list;
@@ -26925 +27949 @@
         {
             if (argvars[2].v_type != VAR_UNKNOWN)
-@@ -9944,7 +10148,7 @@
+@@ -9944,7 +10184,7 @@
  
         d1 = argvars[0].vval.v_dict;
@@ -26934 +27958 @@
         {
             /* Check the third argument. */
-@@ -9987,7 +10191,7 @@
+@@ -9976,6 +10216,19 @@
+                {
+                    --todo;
+                    di1 = dict_find(d1, hi2->hi_key, -1);
++                   if (d1->dv_scope != 0)
++                   {
++                       /* Disallow replacing a builtin function in l: and g:.
++                        * Check the key to be valid when adding to any
++                        * scope. */
++                       if (d1->dv_scope == VAR_DEF_SCOPE
++                               && HI2DI(hi2)->di_tv.v_type == VAR_FUNC
++                               && var_check_func_name(hi2->hi_key,
++                                                                di1 == NULL))
++                           break;
++                       if (!valid_varname(hi2->hi_key))
++                           break;
++                   }
+                    if (di1 == NULL)
+                    {
+                        di1 = dictitem_copy(HI2DI(hi2));
+@@ -9987,7 +10240,7 @@
                         EMSG2(_("E737: Key already exists: %s"), hi2->hi_key);
                         break;
@@ -26943 +27987 @@
                         clear_tv(&di1->di_tv);
                         copy_tv(&HI2DI(hi2)->di_tv, &di1->di_tv);
-@@ -10186,20 +10390,22 @@
+@@ -10186,20 +10439,22 @@
      typval_T   save_key;
      int                rem;
@@ -26969 +28013 @@
      }
      else
-@@ -10236,7 +10442,8 @@
+@@ -10236,7 +10491,8 @@
                 {
                     --todo;
@@ -26979 +28023 @@
                     vimvars[VV_KEY].vv_str = vim_strsave(di->di_key);
                     if (filter_map_one(&di->di_tv, expr, map, &rem) == FAIL
-@@ -10255,7 +10462,7 @@
+@@ -10255,7 +10511,7 @@
  
             for (li = l->lv_first; li != NULL; li = nli)
@@ -26988 +28032 @@
                 nli = li->li_next;
                 vimvars[VV_KEY].vv_nr = idx;
-@@ -10839,6 +11046,11 @@
+@@ -10839,6 +11095,11 @@
  
         if (*varname == '&')    /* buffer-local-option */
@@ -27000 +28044 @@
         {
             if (*varname == NUL)
-@@ -11039,18 +11251,22 @@
+@@ -11039,18 +11300,22 @@
      typval_T   *argvars UNUSED;
      typval_T   *rettv;
@@ -27030 +28074 @@
  }
  
-@@ -11653,22 +11869,44 @@
+@@ -11653,22 +11918,44 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -27082 +28126 @@
      else
         rettv->vval.v_string = NULL;
-@@ -11741,9 +11979,6 @@
+@@ -11741,9 +12028,6 @@
  #ifdef __QNX__
         "qnx",
@@ -27092 +28136 @@
         "unix",
  #endif
-@@ -11856,7 +12091,7 @@
+@@ -11786,6 +12070,11 @@
+        "all_builtin_terms",
+ # endif
+ #endif
++#if defined(FEAT_BROWSE) && (defined(USE_FILE_CHOOSER) \
++       || defined(FEAT_GUI_W32) \
++       || defined(FEAT_GUI_MOTIF))
++       "browsefilter",
++#endif
+ #ifdef FEAT_BYTEOFF
+        "byte_offset",
+ #endif
+@@ -11856,7 +12145,7 @@
  #ifdef FEAT_SEARCHPATH
         "file_in_path",
@@ -27101 +28157 @@
  #endif
  #ifdef FEAT_FIND_ID
-@@ -12002,9 +12237,6 @@
+@@ -12002,9 +12291,6 @@
  #ifdef FEAT_OLE
         "ole",
@@ -27111 +28167 @@
         "path_extra",
  #endif
-@@ -12116,6 +12348,9 @@
+@@ -12116,6 +12402,9 @@
  #ifdef FEAT_TOOLBAR
         "toolbar",
@@ -27121 +28177 @@
         "user-commands",    /* was accidentally included in 5.4 */
         "user_commands",
-@@ -12159,6 +12394,9 @@
+@@ -12159,6 +12448,9 @@
  #ifdef FEAT_XFONTSET
         "xfontset",
@@ -27131 +28187 @@
         "xsmp",
  #endif
-@@ -12572,7 +12810,7 @@
+@@ -12572,7 +12864,7 @@
         }
  
@@ -27140 +28196 @@
                 rettv->vval.v_number = idx;
                 break;
-@@ -12712,7 +12950,7 @@
+@@ -12648,6 +12940,7 @@
+                int     xp_namelen;
+                long    argt;
+ 
++               /* input() with a third argument: completion */
+                rettv->vval.v_string = NULL;
+ 
+                xp_name = get_tv_string_buf_chk(&argvars[2], buf);
+@@ -12666,6 +12959,11 @@
+            rettv->vval.v_string =
+                getcmdline_prompt(inputsecret_flag ? NUL : '@', p, echo_attr,
+                                  xp_type, xp_arg);
++       if (rettv->vval.v_string == NULL
++               && argvars[1].v_type != VAR_UNKNOWN
++               && argvars[2].v_type != VAR_UNKNOWN)
++           rettv->vval.v_string = vim_strsave(get_tv_string_buf(
++                                                          &argvars[2], buf));
+ 
+        vim_free(xp_arg);
+ 
+@@ -12712,7 +13010,7 @@
             IObuff[0] = NUL;
         if (message != NULL && defstr != NULL
@@ -27149 +28225 @@
         else
         {
-@@ -12850,7 +13088,7 @@
+@@ -12850,7 +13148,7 @@
      if (argvars[0].v_type != VAR_LIST)
         EMSG2(_(e_listarg), "insert()");
@@ -27158 +28234 @@
         if (argvars[2].v_type != VAR_UNKNOWN)
             before = get_tv_number_chk(&argvars[2], &error);
-@@ -12877,6 +13115,17 @@
+@@ -12877,6 +13175,17 @@
  }
  
@@ -27176 +28252 @@
   */
      static void
-@@ -13290,8 +13539,10 @@
+@@ -13290,8 +13599,10 @@
      char_u     *keys_buf = NULL;
      char_u     *rhs;
@@ -27188 +28264 @@
      /* return empty string for failure */
      rettv->v_type = VAR_STRING;
-@@ -13305,7 +13556,11 @@
+@@ -13305,7 +13616,11 @@
      {
         which = get_tv_string_buf_chk(&argvars[1], buf);
@@ -27200 +28276 @@
      else
         which = (char_u *)"";
-@@ -13315,19 +13570,34 @@
+@@ -13315,19 +13630,34 @@
      mode = get_map_mode(&which, 0);
  
@@ -27245 +28321 @@
  }
  
-@@ -13367,6 +13637,23 @@
+@@ -13367,6 +13697,23 @@
  }
  #endif
@@ -27269 +28345 @@
   * "map()" function
   */
-@@ -14006,6 +14293,18 @@
+@@ -14006,6 +14353,18 @@
  }
  
@@ -27288 +28364 @@
   */
      static void
-@@ -14177,22 +14476,19 @@
+@@ -14125,6 +14484,40 @@
+ #endif
+ }
+ 
++#ifdef FEAT_PYTHON3
++/*
++ * "py3eval()" function
++ */
++    static void
++f_py3eval(argvars, rettv)
++    typval_T   *argvars;
++    typval_T   *rettv;
++{
++    char_u     *str;
++    char_u     buf[NUMBUFLEN];
++
++    str = get_tv_string_buf(&argvars[0], buf);
++    do_py3eval(str, rettv);
++}
++#endif
++
++#ifdef FEAT_PYTHON
++/*
++ * "pyeval()" function
++ */
++    static void
++f_pyeval(argvars, rettv)
++    typval_T   *argvars;
++    typval_T   *rettv;
++{
++    char_u     *str;
++    char_u     buf[NUMBUFLEN];
++
++    str = get_tv_string_buf(&argvars[0], buf);
++    do_pyeval(str, rettv);
++}
++#endif
++
+ /*
+  * "range()" function
+  */
+@@ -14177,22 +14570,19 @@
      typval_T   *rettv;
  {
@@ -27322 +28439 @@
      if (argvars[1].v_type != VAR_UNKNOWN)
      {
-@@ -14214,49 +14510,61 @@
+@@ -14214,49 +14604,61 @@
         return;
      }
@@ -27415 +28532 @@
                 }
                 li->li_tv.v_type = VAR_STRING;
-@@ -14264,71 +14572,111 @@
+@@ -14264,71 +14666,111 @@
                 li->li_tv.vval.v_string = s;
                 list_append(rettv->vval.v_list, li);
@@ -27514 +28631 @@
 +                   prevsize = (long)(p - start);
 +               else
-+               {
+                {
+-                   mch_memmove(s, prev, prevlen);
+-                   mch_memmove(s + prevlen, buf, buflen);
+-                   vim_free(prev);
+-                   prev = s;
+-                   prevlen += buflen;
 +                   long grow50pc = (prevsize * 3) / 2;
 +                   long growmin  = (long)((p - start) * 2 + prevlen);
@@ -27522 +28644 @@
 +                                               : vim_realloc(prev, prevsize);
 +               if (newprev == NULL)
-                {
--                   mch_memmove(s, prev, prevlen);
--                   mch_memmove(s + prevlen, buf, buflen);
--                   vim_free(prev);
--                   prev = s;
--                   prevlen += buflen;
++               {
 +                   do_outofmem_msg((long_u)prevsize);
 +                   failed = TRUE;
@@ -27569 +28686 @@
      fclose(fd);
  }
-@@ -14691,13 +15039,14 @@
+@@ -14691,13 +15133,14 @@
      char_u     *key;
      dict_T     *d;
@@ -27585 +28702 @@
             key = get_tv_string_chk(&argvars[1]);
             if (key != NULL)
-@@ -14717,7 +15066,7 @@
+@@ -14717,7 +15160,7 @@
      else if (argvars[0].v_type != VAR_LIST)
         EMSG2(_(e_listdictarg), "remove()");
@@ -27594 +28711 @@
         int         error = FALSE;
  
-@@ -14847,6 +15196,9 @@
+@@ -14847,6 +15290,9 @@
      typval_T   *rettv;
  {
@@ -27604 +28721 @@
      p = get_tv_string(&argvars[0]);
  #ifdef FEAT_SHORTCUT
-@@ -14862,7 +15214,6 @@
+@@ -14862,7 +15308,6 @@
  #else
  # ifdef HAVE_READLINK
@@ -27612 +28729 @@
         int     len;
         char_u  *remain = NULL;
-@@ -14879,7 +15230,10 @@
+@@ -14879,7 +15324,10 @@
  
         len = STRLEN(p);
@@ -27623 +28740 @@
         q = getnextcomp(p);
         if (*q != NUL)
-@@ -14890,6 +15244,10 @@
+@@ -14890,6 +15338,10 @@
             q[-1] = NUL;
         }
@@ -27634 +28751 @@
         {
             for (;;)
-@@ -15033,6 +15391,7 @@
+@@ -15033,6 +15485,7 @@
  
  #ifdef HAVE_READLINK
@@ -27642 +28759 @@
      rettv->v_type = VAR_STRING;
  }
-@@ -15051,7 +15410,7 @@
+@@ -15051,7 +15504,7 @@
      if (argvars[0].v_type != VAR_LIST)
         EMSG2(_(e_listarg), "reverse()");
@@ -27651 +28768 @@
         li = l->lv_last;
         l->lv_first = l->lv_last = NULL;
-@@ -16256,6 +16615,7 @@
+@@ -16056,7 +16509,7 @@
+     if (tp != NULL && varname != NULL && varp != NULL)
+     {
+        save_curtab = curtab;
+-       goto_tabpage_tp(tp);
++       goto_tabpage_tp(tp, TRUE);
+ 
+        tabvarname = alloc((unsigned)STRLEN(varname) + 3);
+        if (tabvarname != NULL)
+@@ -16069,7 +16522,7 @@
+ 
+        /* Restore current tabpage */
+        if (valid_tabpage(save_curtab))
+-           goto_tabpage_tp(save_curtab);
++           goto_tabpage_tp(save_curtab, TRUE);
+     }
+ }
+ 
+@@ -16133,7 +16586,7 @@
+        /* set curwin to be our win, temporarily */
+        save_curwin = curwin;
+        save_curtab = curtab;
+-       goto_tabpage_tp(tp);
++       goto_tabpage_tp(tp, TRUE);
+        if (!win_valid(win))
+            return;
+        curwin = win;
+@@ -16168,7 +16621,7 @@
+        /* Restore current tabpage and window, if still valid (autocomands can
+         * make them invalid). */
+        if (valid_tabpage(save_curtab))
+-           goto_tabpage_tp(save_curtab);
++           goto_tabpage_tp(save_curtab, TRUE);
+        if (win_valid(save_curwin))
+        {
+            curwin = save_curwin;
+@@ -16256,6 +16709,7 @@
  
  static int     item_compare_ic;
@@ -27659 +28812 @@
  #define ITEM_COMPARE_FAIL 999
  
-@@ -16315,7 +16675,8 @@
+@@ -16315,7 +16769,8 @@
  
      rettv.v_type = VAR_UNKNOWN;                /* clear_tv() uses this */
@@ -27669 +28822 @@
      clear_tv(&argv[1]);
  
-@@ -16348,7 +16709,8 @@
+@@ -16348,7 +16803,8 @@
      else
      {
@@ -27679 +28832 @@
         rettv->vval.v_list = l;
         rettv->v_type = VAR_LIST;
-@@ -16360,8 +16722,10 @@
+@@ -16360,8 +16816,10 @@
  
         item_compare_ic = FALSE;
@@ -27690 +28843 @@
                 item_compare_func = argvars[1].vval.v_string;
             else
-@@ -16376,6 +16740,17 @@
+@@ -16376,6 +16834,17 @@
                 else
                     item_compare_func = get_tv_string(&argvars[1]);
@@ -27708 +28861 @@
  
         /* Make an array with each entry pointing to an item in the List. */
-@@ -17512,18 +17887,22 @@
+@@ -17512,18 +17981,22 @@
      typval_T   *argvars UNUSED;
      typval_T   *rettv;
@@ -27732 +28885 @@
  
  /*
-@@ -17711,7 +18090,7 @@
+@@ -17711,7 +18184,7 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -27741 +28894 @@
      char_u     *tostr;
      char_u     *p;
-@@ -17728,7 +18107,7 @@
+@@ -17728,7 +18201,7 @@
      char_u     buf2[NUMBUFLEN];
      garray_T   ga;
@@ -27750 +28903 @@
      tostr = get_tv_string_buf_chk(&argvars[2], buf2);
  
-@@ -17754,19 +18133,19 @@
+@@ -17754,19 +18227,19 @@
         }
  
@@ -27774 +28927 @@
                     for (p = tostr; *p != NUL; p += tolen)
                     {
-@@ -17785,11 +18164,11 @@
+@@ -17785,11 +18258,11 @@
                 ++idx;
             }
@@ -27788 +28941 @@
                 for (p = tostr; *p != NUL; p += tolen)
                 {
-@@ -17804,18 +18183,18 @@
+@@ -17804,18 +18277,18 @@
             mch_memmove((char *)ga.ga_data + ga.ga_len, cpstr, (size_t)cplen);
             ga.ga_len += cplen;
@@ -27811 +28964 @@
      }
  
-@@ -17882,11 +18261,21 @@
+@@ -17882,11 +18355,21 @@
      rettv->v_type = VAR_STRING;
  #ifdef FEAT_PERSISTENT_UNDO
@@ -27817 +28970 @@
 -       char_u *ffname = FullName_save(get_tv_string(&argvars[0]), FALSE);
 +       char_u *fname = get_tv_string(&argvars[0]);
-+
+ 
+-       if (ffname != NULL)
+-           rettv->vval.v_string = u_get_undo_file_name(ffname, FALSE);
+-       vim_free(ffname);
 +       if (*fname == NUL)
 +       {
@@ -27826 +28982 @@
 +       {
 +           char_u *ffname = FullName_save(fname, FALSE);
- 
--       if (ffname != NULL)
--           rettv->vval.v_string = u_get_undo_file_name(ffname, FALSE);
--       vim_free(ffname);
++
 +           if (ffname != NULL)
 +               rettv->vval.v_string = u_get_undo_file_name(ffname, FALSE);
@@ -27837 +28990 @@
  #else
      rettv->vval.v_string = NULL;
-@@ -18258,6 +18647,19 @@
+@@ -18118,9 +18601,11 @@
+        curwin->w_skipcol = get_dict_number(dict, (char_u *)"skipcol");
+ 
+        check_cursor();
+-       changed_cline_bef_curs();
+-       invalidate_botline();
+-       redraw_later(VALID);
++       win_new_height(curwin, curwin->w_height);
++# ifdef FEAT_VERTSPLIT
++       win_new_width(curwin, W_WIDTH(curwin));
++# endif
++       changed_window_setting();
+ 
+        if (curwin->w_topline == 0)
+            curwin->w_topline = 1;
+@@ -18258,6 +18743,19 @@
  }
  
@@ -27857 +29025 @@
   * Returns NULL when there is an error.
   */
-@@ -18768,11 +19170,7 @@
+@@ -18768,11 +19266,7 @@
  set_vim_var_char(c)
      int c;
@@ -27870 +29038 @@
  #ifdef FEAT_MBYTE
      if (has_mbyte)
-@@ -19453,9 +19851,14 @@
+@@ -19453,9 +19947,14 @@
          * worked find the variable again.  Don't auto-load a script if it was
          * loaded already, otherwise it would be loaded every time when
@@ -27887 +29055 @@
             return NULL;
      }
-@@ -19730,7 +20133,6 @@
+@@ -19564,7 +20063,7 @@
+        {
+            sv = SCRIPT_SV(ga_scripts.ga_len + 1) =
+                (scriptvar_T *)alloc_clear(sizeof(scriptvar_T));
+-           init_var_dict(&sv->sv_dict, &sv->sv_var);
++           init_var_dict(&sv->sv_dict, &sv->sv_var, VAR_SCOPE);
+            ++ga_scripts.ga_len;
+        }
+     }
+@@ -19575,11 +20074,14 @@
+  * point to it.
+  */
+     void
+-init_var_dict(dict, dict_var)
++init_var_dict(dict, dict_var, scope)
+     dict_T     *dict;
+     dictitem_T *dict_var;
++    int                scope;
+ {
+     hash_init(&dict->dv_hashtab);
++    dict->dv_lock = 0;
++    dict->dv_scope = scope;
+     dict->dv_refcount = DO_NOT_FREE_CNT;
+     dict->dv_copyID = 0;
+     dict_var->di_tv.vval.v_dict = dict;
+@@ -19730,7 +20232,6 @@
      dictitem_T *v;
      char_u     *varname;
@@ -27895 +29088 @@
      ht = find_var_ht(name, &varname);
      if (ht == NULL || *varname == NUL)
-@@ -19740,25 +20142,8 @@
+@@ -19740,25 +20241,8 @@
      }
      v = find_var_in_ht(ht, varname, TRUE);
@@ -27923 +29116 @@
      if (v != NULL)
      {
-@@ -19824,13 +20209,8 @@
+@@ -19824,13 +20308,8 @@
         }
  
@@ -27939 +29132 @@
         v = (dictitem_T *)alloc((unsigned)(sizeof(dictitem_T)
                                                           + STRLEN(varname)));
-@@ -19895,6 +20275,55 @@
+@@ -19895,6 +20374,55 @@
  }
  
@@ -27995 +29188 @@
   * Also give an error message, using "name".
   */
-@@ -20099,7 +20528,13 @@
+@@ -20099,7 +20627,13 @@
                 /* Call msg_start() after eval1(), evaluating the expression
                  * may cause a message to appear. */
@@ -28009 +29202 @@
             else if (eap->cmdidx == CMD_echo)
                 msg_puts_attr((char_u *)" ", echo_attr);
-@@ -20302,6 +20737,7 @@
+@@ -20302,6 +20836,7 @@
      exarg_T    *eap;
  {
@@ -28017 +29210 @@
      int                c;
      int                saved_did_emsg;
-@@ -20548,6 +20984,15 @@
+@@ -20548,6 +21083,15 @@
             arg = vim_strsave(arg);
             if (arg == NULL)
@@ -28033 +29226 @@
             *p = c;
             newargs.ga_len++;
-@@ -20623,7 +21068,8 @@
+@@ -20623,7 +21167,8 @@
      nesting = 0;
      for (;;)
@@ -28043 +29236 @@
         sourcing_lnum_off = sourcing_lnum;
  
-@@ -20726,6 +21172,8 @@
+@@ -20726,6 +21271,8 @@
                                     && (!ASCII_ISALPHA(p[2]) || p[2] == 'r'))
                         || (p[0] == 't' && p[1] == 'c'
@@ -28052 +29245 @@
                                     && (!ASCII_ISALPHA(p[3]) || p[3] == 'y'))
                         || (p[0] == 'm' && p[1] == 'z'
-@@ -21562,6 +22010,9 @@
+@@ -21562,6 +22109,9 @@
             ++hi;
         fp = HI2UF(hi);
@@ -28062 +29255 @@
             return fp->uf_name; /* prevents overflow */
  
-@@ -21921,8 +22372,12 @@
+@@ -21689,7 +22239,7 @@
+  * Unreference a Function: decrement the reference count and free it when it
+  * becomes zero.  Only for numbered functions.
+  */
+-    static void
++    void
+ func_unref(name)
+     char_u     *name;
+ {
+@@ -21713,7 +22263,7 @@
+ /*
+  * Count a reference to a Function.
+  */
+-    static void
++    void
+ func_ref(name)
+     char_u     *name;
+ {
+@@ -21792,7 +22342,7 @@
+     /*
+      * Init l: variables.
+      */
+-    init_var_dict(&fc->l_vars, &fc->l_vars_var);
++    init_var_dict(&fc->l_vars, &fc->l_vars_var, VAR_DEF_SCOPE);
+     if (selfdict != NULL)
+     {
+        /* Set l:self to "selfdict".  Use "name" to avoid a warning from
+@@ -21813,7 +22363,7 @@
+      * 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);
++    init_var_dict(&fc->l_avars, &fc->l_avars_var, VAR_SCOPE);
+     add_nr_var(&fc->l_avars, &fc->fixvar[fixvar_idx++].var, "0",
+                                (varnumber_T)(argcount - fp->uf_args.ga_len));
+     /* Use "name" to avoid a warning from some compiler that checks the
+@@ -21921,8 +22471,12 @@
                         s = tv2string(&argvars[i], &tofree, numbuf2, 0);
                         if (s != NULL)
@@ -28077 +29306 @@
                         }
                     }
-@@ -22010,8 +22465,12 @@
+@@ -22010,8 +22564,12 @@
             s = tv2string(fc->rettv, &tofree, numbuf2, 0);
             if (s != NULL)
@@ -28092 +29321 @@
             }
         }
-@@ -22519,18 +22978,21 @@
+@@ -22519,18 +23077,21 @@
         if (tab != NULL)
         {
@@ -28119 +29348 @@
                                        (int)(tab - virp->vir_line + 1), TRUE);
  #ifdef FEAT_FLOAT
-@@ -22539,9 +23001,28 @@
+@@ -22539,9 +23100,28 @@
  #endif
                 else
@@ -28149 +29378 @@
         }
      }
-@@ -22583,8 +23064,10 @@
+@@ -22583,8 +23163,10 @@
                     case VAR_STRING: s = "STR"; break;
                     case VAR_NUMBER: s = "NUM"; break;
@@ -28161 +29390 @@
                 }
                 fprintf(fp, "!%s\t%s\t", this_var->di_key, s);
-@@ -22656,7 +23139,7 @@
+@@ -22656,7 +23238,7 @@
                     f = -f;
                     sign = '-';
@@ -28170 +29399 @@
                         || put_eol(fd) == FAIL)
                     return FAIL;
-@@ -23019,6 +23502,7 @@
+@@ -23019,6 +23601,7 @@
      int                c;
      int                has_fullname = 0;
@@ -28178 +29407 @@
  #endif
  
-@@ -23193,24 +23677,25 @@
+@@ -23072,6 +23655,27 @@
+                return -1;
+        }
+ 
++#ifdef WIN3264
++# if _WIN32_WINNT >= 0x0500
++       if (vim_strchr(*fnamep, '~') != NULL)
++       {
++           /* Expand 8.3 filename to full path.  Needed to make sure the same
++            * file does not have two different names.
++            * Note: problem does not occur if _WIN32_WINNT < 0x0500. */
++           p = alloc(_MAX_PATH + 1);
++           if (p != NULL)
++           {
++               if (GetLongPathName(*fnamep, p, MAXPATHL))
++               {
++                   vim_free(*bufp);
++                   *bufp = *fnamep = p;
++               }
++               else
++                   vim_free(p);
++           }
++       }
++# endif
++#endif
+        /* Append a path separator to a directory. */
+        if (mch_isdir(*fnamep))
+        {
+@@ -23193,24 +23797,25 @@
      }
  
@@ -28211 +29468 @@
         {
             if (shortpath_for_partial(fnamep, bufp, fnamelen) == FAIL)
-@@ -23218,18 +23703,16 @@
+@@ -23218,18 +23823,16 @@
         }
         else
@@ -28234 +29491 @@
                     return -1;
 diff -Naur vim73.orig/src/ex_cmds.c vim73/src/ex_cmds.c
---- vim73.orig/src/ex_cmds.c    2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/ex_cmds.c 2012-06-03 23:09:55.848084445 +0000
+--- vim73.orig/src/ex_cmds.c    2010-08-13 09:14:35.000000000 +0000
++++ vim73/src/ex_cmds.c 2012-07-20 20:31:18.014311616 +0000
 @@ -11,10 +11,6 @@
   * ex_cmds.c: some functions for command line commands
@@ -28701 +29958 @@
 -               p = p_rtp;
 -               while (*p != NUL)
-+           if (strstr((char *)line, "*local-additions*") == NULL)
-+               continue;
-+
-+           /* Go through all directories in 'runtimepath', skipping
-+            * $VIMRUNTIME. */
-+           p = p_rtp;
-+           while (*p != NUL)
-+           {
-+               copy_option_part(&p, NameBuff, MAXPATHL, ",");
-+               mustfree = FALSE;
-+               rt = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
-+               if (fullpathcmp(rt, NameBuff, FALSE) != FPC_SAME)
-                {
+-               {
 -                   copy_option_part(&p, NameBuff, MAXPATHL, ",");
 -                   mustfree = FALSE;
@@ -28724 +29969 @@
 -                       char_u  *s;
 -                       int     fi;
++           if (strstr((char *)line, "*local-additions*") == NULL)
++               continue;
++
++           /* Go through all directories in 'runtimepath', skipping
++            * $VIMRUNTIME. */
++           p = p_rtp;
++           while (*p != NUL)
++           {
++               copy_option_part(&p, NameBuff, MAXPATHL, ",");
++               mustfree = FALSE;
++               rt = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
++               if (fullpathcmp(rt, NameBuff, FALSE) != FPC_SAME)
++               {
 +                   int         fcount;
 +                   char_u      **fnames;
@@ -29085 +30343 @@
  
                 /* set values for a defined sign. */
-@@ -6886,6 +7004,8 @@
+@@ -6879,6 +6997,16 @@
+                lnum = atoi((char *)arg);
+                arg = skiptowhite(arg);
+            }
++           else if (STRNCMP(arg, "*", 1) == 0 && idx == SIGNCMD_UNPLACE)
++           {
++               if (id != -1)
++               {
++                   EMSG(_(e_invarg));
++                   return;
++               }
++               id = -2;
++               arg = skiptowhite(arg + 1);
++           }
+            else if (STRNCMP(arg, "name=", 5) == 0)
+            {
+                arg += 5;
+@@ -6886,6 +7014,8 @@
                 arg = skiptowhite(arg);
                 if (*arg != NUL)
@@ -29094 +30369 @@
             else if (STRNCMP(arg, "file=", 5) == 0)
             {
+@@ -6913,7 +7043,7 @@
+        {
+            EMSG2(_("E158: Invalid buffer name: %s"), arg);
+        }
+-       else if (id <= 0)
++       else if (id <= 0 && !(idx == SIGNCMD_UNPLACE && id == -2))
+        {
+            if (lnum >= 0 || sign_name != NULL)
+                EMSG(_(e_invarg));
+@@ -6954,11 +7084,17 @@
+        }
+        else if (idx == SIGNCMD_UNPLACE)
+        {
+-           /* ":sign unplace {id} file={fname}" */
+            if (lnum >= 0 || sign_name != NULL)
+                EMSG(_(e_invarg));
++           else if (id == -2)
++           {
++               /* ":sign unplace * file={fname}" */
++               redraw_buf_later(buf, NOT_VALID);
++               buf_delete_signs(buf);
++           }
+            else
+            {
++               /* ":sign unplace {id} file={fname}" */
+                lnum = buf_delsign(buf, id);
+                update_debug_sign(buf, lnum);
+            }
 diff -Naur vim73.orig/src/ex_cmds.h vim73/src/ex_cmds.h
---- vim73.orig/src/ex_cmds.h    2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/ex_cmds.h 2012-06-03 23:09:55.880085297 +0000
+--- vim73.orig/src/ex_cmds.h    2010-07-21 13:48:02.000000000 +0000
++++ vim73/src/ex_cmds.h 2012-07-20 20:31:17.920978216 +0000
 @@ -102,7 +102,7 @@
  EX(CMD_aboveleft,      "aboveleft",    ex_wrongmodifier,
@@ -29133 +30436 @@
                         NEEDARG|EXTRA|NOTRLCOM),
  EX(CMD_saveas,         "saveas",       ex_write,
+@@ -944,7 +944,7 @@
+ EX(CMD_tabfirst,       "tabfirst",     ex_tabnext,
+                        TRLBAR),
+ EX(CMD_tabmove,                "tabmove",      ex_tabmove,
+-                       RANGE|NOTADR|ZEROR|COUNT|TRLBAR|ZEROR),
++                       RANGE|NOTADR|ZEROR|EXTRA|NOSPC|TRLBAR),
+ EX(CMD_tablast,                "tablast",      ex_tabnext,
+                        TRLBAR),
+ EX(CMD_tabnext,                "tabnext",      ex_tabnext,
 @@ -1078,7 +1078,7 @@
  EX(CMD_wsverb,         "wsverb",       ex_wsverb,
@@ -29143 +30455 @@
  EX(CMD_xit,            "xit",          ex_exit,
 diff -Naur vim73.orig/src/ex_cmds2.c vim73/src/ex_cmds2.c
---- vim73.orig/src/ex_cmds2.c   2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/ex_cmds2.c        2012-06-03 23:09:55.780082635 +0000
+--- vim73.orig/src/ex_cmds2.c   2010-07-27 19:43:38.000000000 +0000
++++ vim73/src/ex_cmds2.c        2012-07-20 20:31:17.370977822 +0000
 @@ -11,10 +11,6 @@
   * ex_cmds2.c: some more functions for command line commands
@@ -29175 +30487 @@
         if (p == NULL)
             return FAIL;
-@@ -694,10 +682,12 @@
+@@ -608,10 +596,15 @@
+     garray_T   *gap;
+ 
+     gap = &dbg_breakp;
+-#ifdef FEAT_PROFILE
+     if (eap->cmdidx == CMD_profdel)
++    {
++#ifdef FEAT_PROFILE
+        gap = &prof_ga;
++#else
++       ex_ni(eap);
++       return;
+ #endif
++    }
+ 
+     if (vim_isdigit(*eap->arg))
+     {
+@@ -694,10 +687,12 @@
         for (i = 0; i < dbg_breakp.ga_len; ++i)
         {
@@ -29189 +30518 @@
         }
  }
-@@ -1119,7 +1109,7 @@
+@@ -1119,7 +1114,7 @@
  static enum
  {
@@ -29198 +30527 @@
  
  static char *pexpand_cmds[] = {
-@@ -1488,7 +1478,7 @@
+@@ -1488,7 +1483,7 @@
  #endif
  
@@ -29207 +30536 @@
   */
      void
-@@ -1496,9 +1486,10 @@
+@@ -1496,9 +1491,10 @@
      buf_T      *buf;
      int                checkall;       /* may abandon all changed buffers */
@@ -29219 +30548 @@
      dialog_msg(buff, _("Save changes to \"%s\"?"),
                         (buf->b_fname != NULL) ?
-@@ -1508,13 +1499,19 @@
+@@ -1508,13 +1504,19 @@
      else
         ret = vim_dialog_yesnocancel(VIM_QUESTION, NULL, buff, 1);
@@ -29240 +30569 @@
      }
      else if (ret == VIM_NO)
-@@ -1542,7 +1539,9 @@
+@@ -1542,7 +1544,9 @@
                 /* May get file name, when there is none */
                 browse_save_fname(buf2);
@@ -29251 +30580 @@
  #ifdef FEAT_AUTOCMD
                 /* an autocommand may have deleted the buffer */
-@@ -1579,6 +1578,26 @@
+@@ -1579,6 +1583,26 @@
                 || forceit);
  }
@@ -29278 +30607 @@
   * Return TRUE if any buffer was changed and cannot be abandoned.
   * That changed buffer becomes the current buffer.
-@@ -1587,32 +1606,64 @@
+@@ -1587,32 +1611,64 @@
  check_changed_any(hidden)
      int                hidden;         /* Only check hidden buffers */
@@ -29358 +30687 @@
  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
      /*
-@@ -1645,24 +1696,29 @@
+@@ -1645,24 +1701,29 @@
  #ifdef FEAT_WINDOWS
      /* Try to find a window that contains the buffer. */
@@ -29393 +30722 @@
  
  /*
-@@ -1949,7 +2005,7 @@
+@@ -1789,22 +1850,28 @@
+ #if defined(FEAT_QUICKFIX) || defined(FEAT_SYN_HL) || defined(PROTO)
+ /*
+  * Parse a list of arguments (file names), expand them and return in
+- * "fnames[fcountp]".
++ * "fnames[fcountp]".  When "wig" is TRUE, removes files matching 'wildignore'.
+  * Return FAIL or OK.
+  */
+     int
+-get_arglist_exp(str, fcountp, fnamesp)
++get_arglist_exp(str, fcountp, fnamesp, wig)
+     char_u     *str;
+     int                *fcountp;
+     char_u     ***fnamesp;
++    int                wig;
+ {
+     garray_T   ga;
+     int                i;
+ 
+     if (get_arglist(&ga, str) == FAIL)
+        return FAIL;
+-    i = gen_expand_wildcards(ga.ga_len, (char_u **)ga.ga_data,
+-                                      fcountp, fnamesp, EW_FILE|EW_NOTFOUND);
++    if (wig == TRUE)
++       i = expand_wildcards(ga.ga_len, (char_u **)ga.ga_data,
++                                       fcountp, fnamesp, EW_FILE|EW_NOTFOUND);
++    else
++       i = gen_expand_wildcards(ga.ga_len, (char_u **)ga.ga_data,
++                                       fcountp, fnamesp, EW_FILE|EW_NOTFOUND);
++
+     ga_clear(&ga);
+     return i;
+ }
+@@ -1949,7 +2016,7 @@
  }
  
@@ -29402 +30764 @@
   */
      static int
-@@ -2165,9 +2221,7 @@
+@@ -2165,9 +2232,7 @@
         {
             if (win_split(0, 0) == FAIL)
@@ -29413 +30775 @@
         else
  #endif
-@@ -2946,11 +3000,7 @@
+@@ -2422,7 +2487,7 @@
+                /* go to window "tp" */
+                if (!valid_tabpage(tp))
+                    break;
+-               goto_tabpage_tp(tp);
++               goto_tabpage_tp(tp, TRUE);
+                tp = tp->tp_next;
+            }
+ #endif
+@@ -2946,11 +3011,7 @@
      proftime_T             wait_start;
  #endif
@@ -29425 +30796 @@
         return retval;
      fname_exp = fix_fname(p);
-@@ -3286,7 +3336,11 @@
+@@ -3286,7 +3347,11 @@
  
      for (i = 1; i <= script_items.ga_len && !got_int; ++i)
@@ -29438 +30809 @@
  
  # if defined(BACKSLASH_IN_FILENAME) || defined(PROTO)
-@@ -3412,7 +3466,7 @@
+@@ -3412,7 +3477,7 @@
  {
      struct source_cookie *sp = (struct source_cookie *)cookie;
@@ -29447 +30818 @@
  #ifdef FEAT_EVAL
      /* If breakpoints have been added/deleted need to check for it. */
-@@ -3451,28 +3505,49 @@
+@@ -3451,28 +3516,49 @@
      {
         /* compensate for the one line read-ahead */
@@ -29512 +30883 @@
         s = string_convert(&sp->conv, line, NULL);
         if (s != NULL)
-@@ -4166,11 +4241,90 @@
+@@ -4166,11 +4252,90 @@
             /* Set v:lang, v:lc_time and v:ctype to the final result. */
             set_lang_var();
@@ -29603 +30974 @@
   * Function given to ExpandGeneric() to obtain the possible arguments of the
   * ":language" command.
-@@ -4186,7 +4340,25 @@
+@@ -4186,7 +4351,25 @@
         return (char_u *)"ctype";
      if (idx == 2)
@@ -29631 +31002 @@
  
 diff -Naur vim73.orig/src/ex_docmd.c vim73/src/ex_docmd.c
---- vim73.orig/src/ex_docmd.c   2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/ex_docmd.c        2012-06-03 23:09:55.824083805 +0000
+--- vim73.orig/src/ex_docmd.c   2010-08-07 14:59:47.000000000 +0000
++++ vim73/src/ex_docmd.c        2012-07-20 20:31:18.217645094 +0000
 @@ -61,6 +61,7 @@
  static char_u  *do_one_cmd __ARGS((char_u **, int, char_u *(*fgetline)(int, void *, int), void *cookie));
@@ -30263 +31634 @@
         uc_add_command(name, end - name, p, argt, def, flags, compl, compl_arg,
                                                                 eap->forceit);
-@@ -5888,7 +5983,14 @@
+@@ -5750,8 +5845,14 @@
+        }
+        else
+        {
++#ifdef FEAT_MBYTE
++           int charlen = (*mb_ptr2len)(p);
++           len += charlen;
++           p += charlen;
++#else
+            ++len;
+            ++p;
++#endif
+        }
+     }
+ 
+@@ -5794,7 +5895,7 @@
+        }
+        else
+        {
+-           *q++ = *p++;
++           MB_COPY_CHAR(p, q);
+        }
+     }
+     *q++ = '"';
+@@ -5888,7 +5989,14 @@
             result = STRLEN(eap->arg) + 2;
             for (p = eap->arg; *p; ++p)
@@ -30279 +31674 @@
             }
  
-@@ -5897,7 +5999,14 @@
+@@ -5897,7 +6005,14 @@
                 *buf++ = '"';
                 for (p = eap->arg; *p; ++p)
@@ -30295 +31690 @@
                     *buf++ = *p;
                 }
-@@ -6039,15 +6148,17 @@
+@@ -6039,15 +6154,17 @@
                 end = vim_strchr(start + 1, '>');
             if (buf != NULL)
@@ -30316 +31711 @@
                      * do_cmdline() doesn't handle that, so convert it back.
                      * Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */
-@@ -6439,7 +6550,7 @@
+@@ -6347,7 +6464,10 @@
+        return;
+     }
+ #ifdef FEAT_AUTOCMD
+-    if (curbuf_locked())
++    apply_autocmds(EVENT_QUITPRE, NULL, NULL, FALSE, curbuf);
++    /* Refuse to quick when locked or when the buffer in the last window is
++     * being closed (can only happen in autocommands). */
++    if (curbuf_locked() || (curbuf->b_nwindows == 1 && curbuf->b_closing))
+        return;
+ #endif
+ 
+@@ -6439,7 +6559,7 @@
  {
  # ifdef FEAT_CMDWIN
@@ -30325 +31732 @@
  # endif
         if (!text_locked()
-@@ -6897,9 +7008,7 @@
+@@ -6897,9 +7017,7 @@
  # ifdef FEAT_WINDOWS
         if (win_split(0, 0) == FAIL)
@@ -30336 +31743 @@
         /* When splitting the window, create a new alist.  Otherwise the
          * existing one is overwritten. */
-@@ -7026,7 +7135,7 @@
+@@ -7026,7 +7144,7 @@
         old_arg_count = GARGCOUNT;
         if (expand_wildcards(old_arg_count, old_arg_files,
@@ -30345 +31752 @@
         {
             alist_set(&global_alist, new_arg_file_count, new_arg_files,
-@@ -7299,7 +7408,9 @@
+@@ -7299,7 +7417,9 @@
                 || cmdmod.browse
  #  endif
@@ -30356 +31763 @@
             do_check_scrollbind(FALSE);
  # endif
-@@ -8122,6 +8233,12 @@
+@@ -7364,7 +7484,42 @@
+ ex_tabmove(eap)
+     exarg_T    *eap;
+ {
+-    tabpage_move(eap->addr_count == 0 ? 9999 : (int)eap->line2);
++    int tab_number = 9999;
++
++    if (eap->arg && *eap->arg != NUL)
++    {
++       char_u *p = eap->arg;
++       int    relative = 0; /* argument +N/-N means: move N places to the
++                             * right/left relative to the current position. */
++
++       if (*eap->arg == '-')
++       {
++           relative = -1;
++           p = eap->arg + 1;
++       }
++       else if (*eap->arg == '+')
++       {
++           relative = 1;
++           p = eap->arg + 1;
++       }
++       else
++           p = eap->arg;
++
++       if (p == skipdigits(p))
++       {
++           /* No numbers as argument. */
++           eap->errmsg = e_invarg;
++           return;
++       }
++
++       tab_number = getdigits(&p);
++       if (relative != 0)
++           tab_number = tab_number * relative + tabpage_index(curtab) - 1;;
++    }
++    else if (eap->addr_count != 0)
++       tab_number = eap->line2;
++
++    tabpage_move(tab_number);
+ }
+ 
+ /*
+@@ -8122,6 +8277,12 @@
      {
         ui_delay(msec - done > 1000L ? 1000L : msec - done, TRUE);
@@ -30369 +31820 @@
  }
  
-@@ -8193,7 +8310,7 @@
+@@ -8193,7 +8354,7 @@
      p = skipwhite(p);
      if (*p != NUL && *p != '"' && eap->nextcmd == NULL)
@@ -30378 +31829 @@
         /* Pass flags on for ":vertical wincmd ]". */
         postponed_split_flags = cmdmod.split;
-@@ -8907,35 +9024,42 @@
+@@ -8428,7 +8589,7 @@
+        }
+        ++eap->line2;
+     }
+-    (void)do_join(eap->line2 - eap->line1 + 1, !eap->forceit, TRUE);
++    (void)do_join(eap->line2 - eap->line1 + 1, !eap->forceit, TRUE, TRUE);
+     beginline(BL_WHITE | BL_FIX);
+     ex_may_print(eap);
+ }
+@@ -8907,35 +9068,42 @@
                 failed = TRUE;
             if (eap->cmdidx == CMD_mksession)
@@ -30445 +31905 @@
             }
             else
-@@ -8966,10 +9090,15 @@
+@@ -8966,10 +9134,15 @@
         else if (eap->cmdidx == CMD_mksession)
         {
@@ -30464 +31924 @@
  #endif
  #ifdef MKSESSION_NL
-@@ -9295,7 +9424,7 @@
+@@ -9295,7 +9468,7 @@
                                                                   && !got_int)
      {
@@ -30473 +31933 @@
  }
  #endif
-@@ -9393,7 +9522,7 @@
+@@ -9393,7 +9566,7 @@
  ex_ptag(eap)
      exarg_T    *eap;
@@ -30482 +31942 @@
  }
  
-@@ -9525,17 +9654,23 @@
+@@ -9525,17 +9698,23 @@
  #define SPEC_CFILE  4
                     "<sfile>",          /* ":so" file name */
@@ -30510 +31970 @@
      };
  
-@@ -9560,6 +9695,7 @@
+@@ -9560,6 +9739,7 @@
   *       '<cWORD>' to WORD under the cursor
   *       '<cfile>' to path name under the cursor
@@ -30518 +31978 @@
   *       '<abuf>'  to buffer number for autocommand
   *       '<amatch>' to matching name for autocommand
-@@ -9591,10 +9727,7 @@
+@@ -9591,10 +9771,7 @@
  #ifdef FEAT_MODIFY_FNAME
      int                skip_mod = FALSE;
@@ -30529 +31989 @@
      *errormsg = NULL;
      if (escaped != NULL)
-@@ -9653,14 +9786,7 @@
+@@ -9653,14 +9830,7 @@
                     valid = 0;      /* Must have ":p:h" to be valid */
                 }
@@ -30544 +32004 @@
  
         case SPEC_HASH:         /* '#' or "#99": alternate file */
-@@ -9783,6 +9909,15 @@
+@@ -9783,6 +9953,15 @@
                     return NULL;
                 }
@@ -30560 +32020 @@
         case SPEC_CLIENT:       /* Source of last submitted input */
                 sprintf((char *)strbuf, PRINTF_HEX_LONG_U,
-@@ -9796,11 +9931,7 @@
+@@ -9796,11 +9975,7 @@
         if (src[*usedlen] == '<')       /* remove the file name extension */
         {
@@ -30572 +32032 @@
         }
  #ifdef FEAT_MODIFY_FNAME
-@@ -10645,7 +10776,7 @@
+@@ -10645,7 +10820,7 @@
      unsigned   *flagp;
  {
@@ -30581 +32041 @@
  
      if (gap->ga_len == 0)
-@@ -10660,11 +10791,19 @@
+@@ -10660,11 +10835,19 @@
         {
             if (fullname)
@@ -30603 +32063 @@
      }
      return put_eol(fd);
-@@ -10707,7 +10846,7 @@
+@@ -10707,7 +10890,7 @@
   * Write a file name to the session file.
   * Takes care of the "slash" option in 'sessionoptions' and escapes special
@@ -30612 +32072 @@
      static int
  ses_put_fname(fd, name, flagp)
-@@ -10716,49 +10855,32 @@
+@@ -10716,49 +10899,32 @@
      unsigned   *flagp;
  {
@@ -30682 +32142 @@
  }
  
-@@ -10826,8 +10948,7 @@
+@@ -10826,8 +10992,7 @@
             else if (vim_ispathsep(*p))
             {
@@ -30692 +32152 @@
                     *s++ = '-';
                 else
-@@ -10910,7 +11031,7 @@
+@@ -10910,7 +11075,7 @@
  
  #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) || defined(PROTO)
@@ -30701 +32161 @@
   */
      void
-@@ -10921,7 +11042,7 @@
+@@ -10921,7 +11086,7 @@
  {
      if (fname == NULL)
@@ -30711 +32171 @@
  
 diff -Naur vim73.orig/src/ex_getln.c vim73/src/ex_getln.c
---- vim73.orig/src/ex_getln.c   2012-06-03 23:09:52.956007482 +0000
-+++ vim73/src/ex_getln.c        2012-06-03 23:09:55.884085403 +0000
+--- vim73.orig/src/ex_getln.c   2010-08-14 15:25:45.000000000 +0000
++++ vim73/src/ex_getln.c        2012-07-20 20:31:17.557644623 +0000
 @@ -25,7 +25,7 @@
      int                cmdlen;         /* number of chars in command line */
@@ -30893 +32353 @@
      }
  
-@@ -2843,6 +2888,7 @@
+@@ -2719,6 +2764,11 @@
+     msg_no_more = TRUE;
+     if (ccline.cmdlen == ccline.cmdpos)
+        msg_putchar(' ');
++#ifdef FEAT_MBYTE
++    else if (has_mbyte)
++       draw_cmdline(ccline.cmdpos,
++                              (*mb_ptr2len)(ccline.cmdbuff + ccline.cmdpos));
++#endif
+     else
+        draw_cmdline(ccline.cmdpos, 1);
+     msg_no_more = FALSE;
+@@ -2843,6 +2893,7 @@
         {
             msg_no_more = TRUE;
@@ -30901 +32373 @@
             /* Avoid clearing the rest of the line too often. */
             if (cmdline_row != i || ccline.overstrike)
-@@ -3023,7 +3069,7 @@
+@@ -3023,7 +3074,7 @@
             int     len;
  
@@ -30910 +32382 @@
  #ifdef FEAT_MBYTE
                 if (has_mbyte)
-@@ -3041,7 +3087,7 @@
+@@ -3041,7 +3092,7 @@
                     --w;
                 }
@@ -30919 +32391 @@
                 p += len;
         }
-@@ -3258,6 +3304,24 @@
+@@ -3082,7 +3133,8 @@
+            else
+ #endif
+                c = *s++;
+-           if (cv == Ctrl_V || c == ESC || c == Ctrl_C || c == CAR || c == NL
++           if (cv == Ctrl_V || c == ESC || c == Ctrl_C
++                   || c == CAR || c == NL || c == Ctrl_L
+ #ifdef UNIX
+                    || c == intr_char
+ #endif
+@@ -3258,6 +3310,24 @@
      return check_abbr(c, ccline.cmdbuff, ccline.cmdpos, 0);
  }
@@ -30944 +32426 @@
   * Return FAIL if this is not an appropriate context in which to do
   * completion of anything, return OK if it is (even if there are no matches).
-@@ -3316,10 +3380,14 @@
+@@ -3316,10 +3386,14 @@
             p2 = NULL;
         else
@@ -30961 +32443 @@
             /* longest match: make sure it is not shorter, happens with :help */
             if (p2 != NULL && type == WILD_LONGEST)
-@@ -3396,6 +3464,7 @@
+@@ -3396,6 +3470,7 @@
   * mode = WILD_PREV:       use previous match in multiple match, wrap to first
   * mode = WILD_ALL:        return all matches concatenated
@@ -30969 +32451 @@
   * options = WILD_LIST_NOTFOUND:    list entries without a match
   * options = WILD_HOME_REPLACE:            do home_replace() for buffer names
-@@ -3405,6 +3474,7 @@
+@@ -3405,6 +3480,7 @@
   * options = WILD_KEEP_ALL:        don't remove 'wildignore' entries
   * options = WILD_SILENT:          don't print warning messages
@@ -30977 +32459 @@
   * The variables xp->xp_context and xp->xp_backslash must have been set!
   */
-@@ -3518,7 +3588,8 @@
+@@ -3518,7 +3594,8 @@
             /*
              * Check for matching suffixes in file names.
@@ -30987 +32469 @@
                 if (xp->xp_numfiles)
                     non_suf_match = xp->xp_numfiles;
-@@ -3674,6 +3745,7 @@
+@@ -3674,6 +3751,7 @@
      if (options & WILD_ESCAPE)
      {
@@ -30995 +32477 @@
                 || xp->xp_context == EXPAND_BUFFERS
                 || xp->xp_context == EXPAND_DIRECTORIES)
-@@ -4338,6 +4410,7 @@
+@@ -4338,6 +4416,7 @@
      char_u     ***matches;     /* return: array of pointers to matches */
  {
@@ -31003 +32485 @@
      if (xp->xp_context == EXPAND_UNSUCCESSFUL)
      {
-@@ -4356,9 +4429,11 @@
+@@ -4356,9 +4435,11 @@
      if (file_str == NULL)
         return EXPAND_UNSUCCESSFUL;
@@ -31017 +32499 @@
         *matchcount = 0;
         *matches = NULL;
-@@ -4410,7 +4485,7 @@
+@@ -4410,7 +4491,7 @@
      char_u     *pat;
      int                *num_file;
@@ -31026 +32508 @@
  #ifdef FEAT_CMDL_COMPL
      regmatch_T regmatch;
-@@ -4464,6 +4539,9 @@
+@@ -4464,6 +4545,9 @@
             flags |= (EW_FILE | EW_PATH);
         else
@@ -31036 +32518 @@
         ret = expand_wildcards_eval(&pat, num_file, file, flags);
         if (free_pat)
-@@ -4501,13 +4579,25 @@
+@@ -4501,13 +4585,25 @@
             || xp->xp_context == EXPAND_TAGS_LISTFILES)
         return expand_tags(xp->xp_context == EXPAND_TAGS, pat, num_file, file);
@@ -31066 +32548 @@
      if (xp->xp_context == EXPAND_USER_LIST)
         return ExpandUserList(xp, num_file, file);
-@@ -4536,48 +4626,53 @@
+@@ -4536,48 +4632,53 @@
             int         context;
             char_u      *((*func)__ARGS((expand_T *, int)));
@@ -31141 +32623 @@
         int     i;
  
-@@ -4591,7 +4686,8 @@
+@@ -4591,7 +4692,8 @@
             {
                 if (tab[i].ic)
@@ -31147 +32629 @@
 -               ret = ExpandGeneric(xp, &regmatch, num_file, file, tab[i].func);
 +               ret = ExpandGeneric(xp, &regmatch, num_file, file,
-+                                                tab[i].func, tab[i].escaped);
++                                               tab[i].func, tab[i].escaped);
                 break;
             }
      }
-@@ -4613,13 +4709,14 @@
+@@ -4613,13 +4715,14 @@
   * Returns OK when no problems encountered, FAIL for error (out of memory).
   */
@@ -31167 +32649 @@
      int                i;
      int                count = 0;
-@@ -4644,7 +4741,10 @@
+@@ -4644,7 +4747,10 @@
             {
                 if (round)
@@ -31179 +32661 @@
  #ifdef FEAT_MENU
                     if (func == get_menu_names && str != NULL)
-@@ -4676,7 +4776,16 @@
+@@ -4676,7 +4782,16 @@
  
      /* Sort the results.  Keep menu's in the specified order. */
@@ -31197 +32679 @@
  #ifdef FEAT_CMDL_COMPL
      /* Reset the variables used for special highlight names expansion, so that
-@@ -4728,7 +4837,11 @@
+@@ -4728,7 +4843,11 @@
                             || (pat[1] == '.' && vim_ispathsep(pat[2])))))
         path = (char_u *)".";
@@ -31209 +32691 @@
      /*
       * Go over all directories in $PATH.  Expand matches in that directory and
-@@ -4949,57 +5062,68 @@
+@@ -4949,57 +5068,68 @@
  /*
   * Expand color scheme, compiler or filetype names:
@@ -31300 +32782 @@
 -    vim_free(all);
 +    if (ga.ga_len == 0)
-+        return FAIL;
++       return FAIL;
  
      /* Sort and remove duplicates which can happen when specifying multiple
@@ -31308 +32790 @@
  
      *file = ga.ga_data;
-@@ -5127,6 +5251,34 @@
+@@ -5127,6 +5257,34 @@
      NULL
  };
@@ -31343 +32825 @@
   * init_history() - Initialize the command line history.
   * Also used to re-allocate the history when the size changes.
-@@ -5220,13 +5372,15 @@
+@@ -5220,13 +5378,15 @@
   * If 'move_to_front' is TRUE, matching entry is moved to end of history.
   */
@@ -31360 +32842 @@
      if (hisidx[type] < 0)
         return FALSE;
-@@ -5235,7 +5389,12 @@
+@@ -5235,7 +5395,12 @@
      {
         if (history[type][i].hisstr == NULL)
@@ -31374 +32856 @@
             if (!move_to_front)
                 return TRUE;
-@@ -5329,7 +5488,7 @@
+@@ -5329,7 +5494,7 @@
         }
         last_maptick = -1;
@@ -31383 +32865 @@
         if (++hisidx[histype] == hislen)
             hisidx[histype] = 0;
-@@ -5803,7 +5962,7 @@
+@@ -5803,7 +5968,7 @@
                                                               hist[i].hisnum);
                     if (vim_strsize(hist[i].hisstr) > (int)Columns - 10)
@@ -31392 +32874 @@
                         STRCAT(IObuff, hist[i].hisstr);
                     msg_outtrans(IObuff);
-@@ -5907,8 +6066,10 @@
+@@ -5907,8 +6072,10 @@
         val = viminfo_readstring(virp, 1, TRUE);
         if (val != NULL && *val != NUL)
@@ -31404 +32886 @@
                 /* Need to re-allocate to append the separator byte. */
                 len = STRLEN(val);
-@@ -5920,7 +6081,7 @@
+@@ -5920,7 +6087,7 @@
                         /* Search entry: Move the separator from the first
                          * column to after the NUL. */
@@ -31413 +32895 @@
                     else
                     {
-@@ -6147,9 +6308,7 @@
+@@ -6147,9 +6314,7 @@
      curwin->w_p_rl = cmdmsg_rl;
      cmdmsg_rl = FALSE;
@@ -31424 +32906 @@
  # ifdef FEAT_AUTOCMD
      /* Do execute autocommands for setting the filetype (load syntax). */
-@@ -6287,6 +6446,12 @@
+@@ -6287,6 +6452,12 @@
             ccline.cmdbuff = vim_strsave((char_u *)"qa");
             cmdwin_result = CAR;
@@ -31437 +32919 @@
             ccline.cmdbuff = vim_strsave(ml_get_curline());
         if (ccline.cmdbuff == NULL)
-@@ -6317,7 +6482,7 @@
+@@ -6317,7 +6488,7 @@
         /* win_close() may have already wiped the buffer when 'bh' is
          * set to 'wipe' */
@@ -31446 +32928 @@
         /* Restore window sizes. */
         win_size_restore(&winsizes);
+diff -Naur vim73.orig/src/farsi.c vim73/src/farsi.c
+--- vim73.orig/src/farsi.c      2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/farsi.c   2012-07-20 20:31:18.224311766 +0000
+@@ -1813,7 +1813,7 @@
+                ptr[i] = toF_leading(ptr[i]);
+                ++i;
+ 
+-               while(canF_Rjoin(ptr[i]) && (i < llen))
++               while (canF_Rjoin(ptr[i]) && i < llen)
+                {
+                    ptr[i] = toF_Rjoin(ptr[i]);
+                    if (F_isterm(ptr[i]) || !F_isalpha(ptr[i]))
 diff -Naur vim73.orig/src/feature.h vim73/src/feature.h
---- vim73.orig/src/feature.h    2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/feature.h 2012-06-03 23:09:55.760082103 +0000
+--- vim73.orig/src/feature.h    2010-07-27 19:45:42.000000000 +0000
++++ vim73/src/feature.h 2012-07-20 20:31:15.827643384 +0000
 @@ -506,15 +506,6 @@
  #endif
@@ -31516 +33010 @@
 +#endif
 diff -Naur vim73.orig/src/fileio.c vim73/src/fileio.c
---- vim73.orig/src/fileio.c     2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/fileio.c  2012-06-03 23:09:55.800083168 +0000
+--- vim73.orig/src/fileio.c     2010-08-14 12:20:54.000000000 +0000
++++ vim73/src/fileio.c  2012-07-20 20:31:18.164311724 +0000
 @@ -11,14 +11,6 @@
   * fileio.c: read from and write to a file
@@ -31974 +33468 @@
  #  else
      char_u     *p;
-@@ -7682,6 +7674,7 @@
+@@ -7651,6 +7643,7 @@
+     {"CmdwinEnter",    EVENT_CMDWINENTER},
+     {"CmdwinLeave",    EVENT_CMDWINLEAVE},
+     {"ColorScheme",    EVENT_COLORSCHEME},
++    {"CompleteDone",   EVENT_COMPLETEDONE},
+     {"CursorHold",     EVENT_CURSORHOLD},
+     {"CursorHoldI",    EVENT_CURSORHOLDI},
+     {"CursorMoved",    EVENT_CURSORMOVED},
+@@ -7682,9 +7675,11 @@
      {"InsertChange",   EVENT_INSERTCHANGE},
      {"InsertEnter",    EVENT_INSERTENTER},
@@ -31982 +33484 @@
      {"QuickFixCmdPost",        EVENT_QUICKFIXCMDPOST},
      {"QuickFixCmdPre", EVENT_QUICKFIXCMDPRE},
-@@ -8744,6 +8737,8 @@
++    {"QuitPre",                EVENT_QUITPRE},
+     {"RemoteReply",    EVENT_REMOTEREPLY},
+     {"SessionLoadPost",        EVENT_SESSIONLOADPOST},
+     {"ShellCmdPost",   EVENT_SHELLCMDPOST},
+@@ -8744,6 +8739,8 @@
      int                retval;
      aco_save_T aco;
@@ -31991 +33497 @@
      /*
       * This is a bit tricky: For some commands curwin->w_buffer needs to be
-@@ -8760,11 +8755,15 @@
+@@ -8760,11 +8757,15 @@
             aucmd_prepbuf(&aco, buf);
  
@@ -32011 +33517 @@
             /* restore the current window */
             aucmd_restbuf(&aco);
-@@ -8779,6 +8778,23 @@
+@@ -8779,6 +8780,23 @@
  }
  
@@ -32035 +33541 @@
   * Search for a visible window containing the current buffer.  If there isn't
   * one then use "aucmd_win".
-@@ -8903,10 +8919,11 @@
+@@ -8901,12 +8919,13 @@
+                if (wp == aucmd_win)
+                {
                     if (tp != curtab)
-                        goto_tabpage_tp(tp);
+-                       goto_tabpage_tp(tp);
++                       goto_tabpage_tp(tp, TRUE);
                     win_goto(aucmd_win);
 -                   break;
@@ -32048 +33557 @@
         /* Remove the window and frame from the tree of frames. */
         (void)winframe_remove(curwin, &dummy, NULL);
-@@ -8965,6 +8982,10 @@
+@@ -8965,6 +8984,10 @@
                     && buf_valid(aco->new_curbuf)
                     && aco->new_curbuf->b_ml.ml_mfp != NULL)
@@ -32059 +33568 @@
                 curbuf = aco->new_curbuf;
                 curwin->w_buffer = curbuf;
-@@ -9063,7 +9084,10 @@
+@@ -9063,7 +9086,10 @@
  {
      int                state;
@@ -32071 +33580 @@
             && !ins_compl_active()
  #endif
-@@ -9094,6 +9118,15 @@
+@@ -9094,6 +9120,15 @@
      return (first_autopat[(int)EVENT_CURSORMOVEDI] != NULL);
  }
@@ -32087 +33596 @@
  apply_autocmds_group(event, fname, fname_io, force, group, buf, eap)
      event_T    event;
-@@ -9954,6 +9987,8 @@
+@@ -9954,6 +9989,8 @@
             if ((c == ';' || c == '>') && match == FALSE)
             {
@@ -32096 +33605 @@
                 *pattern = c;       /* Restore the terminator */
                 type_start = pattern + 1;
-@@ -10181,19 +10216,11 @@
+@@ -10181,19 +10218,11 @@
                     ++p;
                 break;
@@ -32116 +33625 @@
                 break;
             case '\\':
-@@ -10304,3 +10331,55 @@
+@@ -10304,3 +10333,55 @@
      }
      return reg_pat;
@@ -32173 +33682 @@
 +#endif
 diff -Naur vim73.orig/src/fold.c vim73/src/fold.c
---- vim73.orig/src/fold.c       2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/fold.c    2012-06-03 23:09:55.544076354 +0000
+--- vim73.orig/src/fold.c       2010-06-22 04:20:24.000000000 +0000
++++ vim73/src/fold.c    2012-07-20 20:31:15.170976247 +0000
 @@ -1033,10 +1033,10 @@
   * Init the fold info in a new window.
@@ -32322 +33831 @@
  /* }}}1 */
 diff -Naur vim73.orig/src/getchar.c vim73/src/getchar.c
---- vim73.orig/src/getchar.c    2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/getchar.c 2012-06-03 23:09:55.936086788 +0000
+--- vim73.orig/src/getchar.c    2010-08-08 13:00:33.000000000 +0000
++++ vim73/src/getchar.c 2012-07-20 20:31:16.570977250 +0000
 @@ -418,12 +418,12 @@
  
@@ -32611 +34120 @@
                                             : p_tm)), typebuf.tb_change_cnt);
  
-@@ -3168,6 +3188,7 @@
+@@ -2799,7 +2819,8 @@
+                        edit_unputchar();
+                    if (State & CMDLINE)
+                        unputcmdline();
+-                   setcursor();        /* put cursor back where it belongs */
++                   else
++                       setcursor();    /* put cursor back where it belongs */
+                }
+ 
+                if (c < 0)
+@@ -3168,6 +3189,7 @@
      int                expr = FALSE;
  #endif
@@ -32619 +34138 @@
      keys = arg;
      map_table = maphash;
-@@ -3251,9 +3272,9 @@
+@@ -3251,9 +3273,9 @@
      validate_maphash();
  
@@ -32631 +34150 @@
      p = keys;
      do_backslash = (vim_strchr(p_cpo, CPO_BSLASH) == NULL);
-@@ -3266,6 +3287,7 @@
+@@ -3266,6 +3288,7 @@
      }
      if (*p != NUL)
@@ -32639 +34158 @@
      rhs = p;
      hasarg = (*rhs != NUL);
-@@ -3288,6 +3310,7 @@
+@@ -3288,6 +3311,7 @@
       */
      if (haskey)
@@ -32647 +34166 @@
      {
         if (STRICMP(rhs, "<nop>") == 0)     /* "<Nop>" means nothing */
-@@ -3298,7 +3321,7 @@
+@@ -3298,7 +3322,7 @@
  
  #ifdef FEAT_FKMAP
@@ -32656 +34175 @@
       */
      if (p_altkeymap && curwin->w_p_rl)
-@@ -3556,6 +3579,8 @@
+@@ -3556,6 +3580,8 @@
                                 }
                                 vim_free(mp->m_str);
@@ -32665 +34184 @@
                                 mp->m_silent = silent;
                                 mp->m_mode = mode;
-@@ -3633,10 +3658,12 @@
+@@ -3633,10 +3659,12 @@
  
      mp->m_keys = vim_strsave(keys);
@@ -32678 +34197 @@
         retval = 4;     /* no mem */
         goto theend;
-@@ -3682,6 +3709,7 @@
+@@ -3682,6 +3710,7 @@
      mp = *mpp;
      vim_free(mp->m_keys);
@@ -32686 +34205 @@
      vim_free(mp);
  }
-@@ -3851,12 +3879,57 @@
+@@ -3851,12 +3880,57 @@
      }
  }
@@ -32745 +34264 @@
      if (msg_didout || msg_silent != 0)
      {
-@@ -3864,49 +3937,15 @@
+@@ -3864,49 +3938,15 @@
         if (got_int)        /* 'q' typed at MORE prompt */
             return;
@@ -32802 +34321 @@
         msg_putchar(' ');
  
-@@ -3931,12 +3970,21 @@
+@@ -3931,12 +3971,21 @@
         msg_putchar(' ');
  
@@ -32827 +34346 @@
      if (p_verbose > 0)
         last_set_msg(mp->m_script_ID);
-@@ -4287,11 +4335,7 @@
+@@ -4287,11 +4336,7 @@
      int                scol;           /* starting column of the abbr. */
      int                j;
@@ -32839 +34358 @@
  #ifdef FEAT_LOCALMAP
      mapblock_T *mp2;
-@@ -4304,8 +4348,9 @@
+@@ -4304,8 +4349,9 @@
  
      if (typebuf.tb_no_abbr_cnt)        /* abbrev. are not recursive */
@@ -32851 +34370 @@
  
      /*
-@@ -4478,12 +4523,25 @@
+@@ -4478,12 +4524,25 @@
  {
      char_u     *res;
@@ -32877 +34396 @@
      /* Forbid changing text or using ":normal" to avoid most of the bad side
       * effects.  Also restore the cursor position. */
-@@ -4493,16 +4551,23 @@
+@@ -4493,16 +4552,23 @@
  #endif
      set_vim_var_char(c);  /* set v:char to the typed character */
@@ -32902 +34421 @@
      vim_free(p);
  
-@@ -4995,19 +5060,21 @@
+@@ -4995,19 +5061,21 @@
      sourcing_name = save_name;
  }
@@ -32929 +34448 @@
      int                hash;
      int                len, minlen;
-@@ -5062,7 +5129,17 @@
+@@ -5062,7 +5130,17 @@
                             minlen = mp->m_keylen - 3;
                     }
@@ -32948 +34467 @@
         }
 diff -Naur vim73.orig/src/globals.h vim73/src/globals.h
---- vim73.orig/src/globals.h    2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/globals.h 2012-06-03 23:09:55.404072629 +0000
+--- vim73.orig/src/globals.h    2010-07-23 19:20:45.000000000 +0000
++++ vim73/src/globals.h 2012-07-20 20:31:18.067644988 +0000
 @@ -113,9 +113,9 @@
   * When '$' is included in 'cpoptions' option set:
@@ -32962 +34481 @@
  #ifdef FEAT_INS_EXPAND
  /*
-@@ -510,8 +510,13 @@
+@@ -510,9 +510,15 @@
  EXTERN VimClipboard clip_plus; /* CLIPBOARD selection in X11 */
  # else
@@ -32969 +34488 @@
  # endif
 -EXTERN int     clip_unnamed INIT(= FALSE);
-+
-+#define CLIP_UNNAMED      1
-+#define CLIP_UNNAMED_PLUS 2
+-EXTERN int     clip_autoselect INIT(= FALSE);
++
++# define CLIP_UNNAMED      1
++# define CLIP_UNNAMED_PLUS 2
 +EXTERN int     clip_unnamed INIT(= 0); /* above two values or'ed */
 +
- EXTERN int     clip_autoselect INIT(= FALSE);
++EXTERN int     clip_autoselect_star INIT(= FALSE);
++EXTERN int     clip_autoselect_plus INIT(= FALSE);
  EXTERN int     clip_autoselectml INIT(= FALSE);
  EXTERN int     clip_html INIT(= FALSE);
-@@ -530,6 +535,10 @@
+ EXTERN regprog_T *clip_exclude_prog INIT(= NULL);
+@@ -530,6 +536,10 @@
  EXTERN win_T   *prevwin INIT(= NULL);  /* previous window */
  # define W_NEXT(wp) ((wp)->w_next)
@@ -32988 +34510 @@
      for ((tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next) \
         for ((wp) = ((tp) == curtab) \
-@@ -1052,10 +1061,6 @@
+@@ -728,9 +738,9 @@
+ #endif
+ 
+ EXTERN pos_T   saved_cursor            /* w_cursor before formatting text. */
+-# ifdef DO_INIT
++#ifdef DO_INIT
+        = INIT_POS_T(0, 0, 0)
+-# endif
++#endif
+        ;
+ 
+ /*
+@@ -798,9 +808,9 @@
+ # endif
+ EXTERN int     has_mbyte INIT(= 0);            /* any multi-byte encoding */
+ 
+-#if defined(WIN3264) && defined(FEAT_MBYTE)
++# if defined(WIN3264) && defined(FEAT_MBYTE)
+ EXTERN int     wide_WindowProc INIT(= FALSE);  /* use wide WindowProc() */
+-#endif
++# endif
+ 
+ /*
+  * To speed up BYTELEN() we fill a table with the byte lengths whenever
+@@ -1052,10 +1062,6 @@
                         ;
  #endif
@@ -32999 +34545 @@
  EXTERN int     postponed_split INIT(= 0);  /* for CTRL-W CTRL-] command */
  EXTERN int     postponed_split_flags INIT(= 0);  /* args for win_split() */
-@@ -1512,7 +1517,7 @@
+@@ -1094,8 +1100,8 @@
+ EXTERN int  save_p_ls INIT(= -1);      /* Save 'laststatus' setting */
+ EXTERN int  save_p_wmh INIT(= -1);     /* Save 'winminheight' setting */
+ EXTERN int  wild_menu_showing INIT(= 0);
+-#define WM_SHOWN       1               /* wildmenu showing */
+-#define WM_SCROLLED    2               /* wildmenu showing with scroll */
++# define WM_SHOWN      1               /* wildmenu showing */
++# define WM_SCROLLED   2               /* wildmenu showing with scroll */
+ #endif
+ 
+ #ifdef MSWIN
+@@ -1305,9 +1311,9 @@
+ EXTERN Atom    commProperty INIT(= None);
+ EXTERN char_u  *serverDelayedStartName INIT(= NULL);
+ # else
+-# ifdef PROTO
++#  ifdef PROTO
+ typedef int HWND;
+-# endif
++#  endif
+ EXTERN HWND    clientWindow INIT(= 0);
+ # endif
+ #endif
+@@ -1512,7 +1518,7 @@
  EXTERN char_u e_sandbox[]      INIT(= N_("E48: Not allowed in sandbox"));
  #endif
@@ -33008 +34577 @@
  EXTERN char_u e_screenmode[]   INIT(= N_("E359: Screen mode setting not supported"));