Changeset 4641a79 for patches

Timestamp:

Jul 21, 2012, 9:15:17 PM (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"));
  #endif
-@@ -1560,6 +1565,9 @@
+@@ -1560,6 +1566,9 @@
         (defined(FEAT_INS_EXPAND) && defined(FEAT_COMPL_FUNC))
  EXTERN char_u e_notset[]       INIT(= N_("E764: Option '%s' is not set"));
@@ -33019 +34588 @@
  EXTERN short disallow_gui      INIT(= FALSE);
 diff -Naur vim73.orig/src/gui.c vim73/src/gui.c
---- vim73.orig/src/gui.c        2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/gui.c     2012-06-03 23:09:55.908086042 +0000
+--- vim73.orig/src/gui.c        2010-08-08 13:01:18.000000000 +0000
++++ vim73/src/gui.c     2012-07-20 20:31:18.074311659 +0000
 @@ -37,6 +37,24 @@
  static void gui_set_bg_color __ARGS((char_u *name));
@@ -33505 +35074 @@
         /* Always allow pasting */
         if (button != MOUSE_MIDDLE)
+@@ -3008,7 +3154,7 @@
+     }
+ 
+     if (clip_star.state != SELECT_CLEARED && !did_clip)
+-       clip_clear_selection();
++       clip_clear_selection(&clip_star);
+ #endif
+ 
+     /* Don't put events in the input queue now. */
 @@ -4893,7 +5039,7 @@
                 if (STRLEN(p) > 2000)
@@ -33515 +35093 @@
         ga_clear(&error_ga);
 diff -Naur vim73.orig/src/gui.h vim73/src/gui.h
---- vim73.orig/src/gui.h        2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/gui.h     2012-06-03 23:09:54.376045272 +0000
+--- vim73.orig/src/gui.h        2010-07-17 19:40:58.000000000 +0000
++++ vim73/src/gui.h     2012-07-20 20:31:11.674307068 +0000
 @@ -52,10 +52,6 @@
  # include <SegLoad.h>*/
@@ -33572 +35150 @@
      PtWidget_t *vimTextArea;           /* PtRaw */
 diff -Naur vim73.orig/src/gui_athena.c vim73/src/gui_athena.c
---- vim73.orig/src/gui_athena.c 2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/gui_athena.c      2012-06-03 23:09:53.612024941 +0000
+--- vim73.orig/src/gui_athena.c 2010-08-08 13:01:39.000000000 +0000
++++ vim73/src/gui_athena.c      2012-07-20 20:31:09.277638673 +0000
 @@ -2117,13 +2117,14 @@
  }
@@ -33591 +35169 @@
      char_u             *p, *next;
 diff -Naur vim73.orig/src/gui_gtk.c vim73/src/gui_gtk.c
---- vim73.orig/src/gui_gtk.c    2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/gui_gtk.c 2012-06-03 23:09:55.776082529 +0000
-@@ -90,6 +90,11 @@
+--- vim73.orig/src/gui_gtk.c    2010-07-20 11:15:22.000000000 +0000
++++ vim73/src/gui_gtk.c 2012-07-20 20:31:17.964311580 +0000
+@@ -90,6 +90,13 @@
  static void entry_activate_cb(GtkWidget *widget, gpointer data);
  static void entry_changed_cb(GtkWidget *entry, GtkWidget *dialog);
  static void find_replace_cb(GtkWidget *widget, gpointer data);
++#if defined(FEAT_BROWSE) || defined(PROTO)
 +static void recent_func_log_func(
 +       const gchar *log_domain,
@@ -33602 +35181 @@
 +       const gchar *message,
 +       gpointer user_data);
++#endif
  
  #if defined(FEAT_TOOLBAR)
  /*
-@@ -839,6 +844,8 @@
+@@ -772,9 +779,6 @@
+ /*
+  * Implementation of the file selector related stuff
+  */
+-#if GTK_CHECK_VERSION(2,4,0)
+-# define USE_FILE_CHOOSER
+-#endif
+ 
+ #ifndef USE_FILE_CHOOSER
+     static void
+@@ -833,12 +837,15 @@
+               char_u *dflt,
+               char_u *ext UNUSED,
+               char_u *initdir,
+-              char_u *filter UNUSED)
++              char_u *filter)
+ {
+ #ifdef USE_FILE_CHOOSER
      GtkWidget          *fc;
  #endif
@@ -33611 +35208 @@
 +    guint              log_handler;
 +    const gchar                *domain = "Gtk";
++    GtkFileFilter      *gfilter;
  
      title = CONVERT_TO_UTF8(title);
@@ -33626 +35224 @@
      /* We create the dialog each time, so that the button text can be "Open"
       * or "Save" according to the action. */
-@@ -916,6 +928,7 @@
+@@ -865,6 +877,45 @@
+            NULL);
+     gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fc),
+                                                       (const gchar *)dirbuf);
++
++    if (filter != NULL && *filter != NUL)
++    {
++       int     i = 0;
++       char_u  *patt;
++       char_u  *p = filter;
++
++       gfilter = gtk_file_filter_new();
++       patt = alloc(STRLEN(filter));
++       while (p != NULL && *p != NUL)
++       {
++           if (*p == '\n' || *p == ';' || *p == '\t')
++           {
++               STRNCPY(patt, filter, i);
++               patt[i] = '\0';
++               if (*p == '\t')
++                   gtk_file_filter_set_name(gfilter, (gchar *)patt);
++               else
++               {
++                   gtk_file_filter_add_pattern(gfilter, (gchar *)patt);
++                   if (*p == '\n')
++                   {
++                       gtk_file_chooser_add_filter((GtkFileChooser *)fc,
++                                                                    gfilter);
++                       if (*(p + 1) != NUL)
++                           gfilter = gtk_file_filter_new();
++                   }
++               }
++               filter = ++p;
++               i = 0;
++           }
++           else
++           {
++               p++;
++               i++;
++           }
++       }
++       vim_free(patt);
++    }
+     if (saving && dflt != NULL && *dflt != NUL)
+        gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(fc), (char *)dflt);
+ 
+@@ -916,6 +967,7 @@
      gtk_widget_show(gui.filedlg);
      gtk_main();
@@ -33634 +35278 @@
      CONVERT_TO_UTF8_FREE(title);
      if (gui.browse_fname == NULL)
-@@ -1268,7 +1281,8 @@
+@@ -1268,7 +1320,8 @@
                char_u   *message,   /* message text */
                char_u   *buttons,   /* names of buttons */
@@ -33644 +35288 @@
      GtkWidget  *dialog;
      GtkWidget  *entry = NULL;
-@@ -1287,6 +1301,9 @@
+@@ -1287,6 +1340,9 @@
         entry = gtk_entry_new();
         gtk_widget_show(entry);
  
 +       /* Make Enter work like pressing OK. */
-+        gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
++       gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
 +
         text = CONVERT_TO_UTF8(textfield);
         gtk_entry_set_text(GTK_ENTRY(entry), (const char *)text);
         CONVERT_TO_UTF8_FREE(text);
-@@ -1387,7 +1404,7 @@
+@@ -1387,7 +1443,7 @@
      gtk_menu_popup(GTK_MENU(menu->submenu_id),
                    NULL, NULL,
@@ -33663 +35307 @@
  
  /* Ugly global variable to pass "mouse_pos" flag from gui_make_popup() to
-@@ -1795,7 +1812,6 @@
+@@ -1795,7 +1851,6 @@
      char_u             *repl_text;
      gboolean           direction_down;
@@ -33671 +35315 @@
      flags = (int)(long)data;       /* avoid a lint warning here */
  
-@@ -1821,7 +1837,7 @@
+@@ -1821,7 +1876,7 @@
  
      repl_text = CONVERT_FROM_UTF8(repl_text);
@@ -33680 +35324 @@
      CONVERT_FROM_UTF8_FREE(find_text);
  }
-@@ -1879,3 +1895,14 @@
+@@ -1879,3 +1934,15 @@
       * backwards compatibility anyway. */
      do_cmdline_cmd((char_u *)"emenu ToolBar.FindHelp");
  }
 +
++#if defined(FEAT_BROWSE) || defined(PROTO)
 +    static void
 +recent_func_log_func(const gchar *log_domain UNUSED,
@@ -33694 +35339 @@
 +    /* http://bugzilla.gnome.org/show_bug.cgi?id=664587 */
 +}
-+
++#endif
 diff -Naur vim73.orig/src/gui_gtk_x11.c vim73/src/gui_gtk_x11.c
---- vim73.orig/src/gui_gtk_x11.c        2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/gui_gtk_x11.c     2012-06-03 23:09:55.860084763 +0000
+--- vim73.orig/src/gui_gtk_x11.c        2010-08-15 11:52:15.000000000 +0000
++++ vim73/src/gui_gtk_x11.c     2012-07-20 20:31:16.157643621 +0000
 @@ -86,7 +86,6 @@
  
@@ -33874 +35519 @@
  }
 diff -Naur vim73.orig/src/gui_mac.c vim73/src/gui_mac.c
---- vim73.orig/src/gui_mac.c    2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/gui_mac.c 2012-06-03 23:09:55.024062516 +0000
+--- vim73.orig/src/gui_mac.c    2010-08-14 19:39:54.000000000 +0000
++++ vim73/src/gui_mac.c 2012-07-20 20:31:13.584308441 +0000
 @@ -1480,7 +1480,7 @@
   *
@@ -33997 +35642 @@
  // of the tabs, not pointers to the tabs (which are invalid for a short time).
 diff -Naur vim73.orig/src/gui_motif.c vim73/src/gui_motif.c
---- vim73.orig/src/gui_motif.c  2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/gui_motif.c       2012-06-03 23:09:53.616025047 +0000
+--- vim73.orig/src/gui_motif.c  2010-08-08 13:04:15.000000000 +0000
++++ vim73/src/gui_motif.c       2012-07-20 20:31:09.287638679 +0000
 @@ -2549,13 +2549,14 @@
  #endif
@@ -34016 +35661 @@
      char_u             *p, *next;
 diff -Naur vim73.orig/src/gui_photon.c vim73/src/gui_photon.c
---- vim73.orig/src/gui_photon.c 2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/gui_photon.c      2012-06-03 23:09:54.736054852 +0000
+--- vim73.orig/src/gui_photon.c 2010-05-15 11:04:08.000000000 +0000
++++ vim73/src/gui_photon.c      2012-07-20 20:31:12.694307802 +0000
 @@ -32,9 +32,9 @@
  #endif
@@ -37184 +38829 @@
  
 diff -Naur vim73.orig/src/gui_riscos.c vim73/src/gui_riscos.c
---- vim73.orig/src/gui_riscos.c 2012-06-03 23:09:52.944007163 +0000
+--- vim73.orig/src/gui_riscos.c 2010-05-15 11:04:09.000000000 +0000
 +++ vim73/src/gui_riscos.c      1970-01-01 00:00:00.000000000 +0000
 @@ -1,3558 +0,0 @@
@@ -40746 +42391 @@
 -}
 diff -Naur vim73.orig/src/gui_riscos.h vim73/src/gui_riscos.h
---- vim73.orig/src/gui_riscos.h 2012-06-03 23:09:52.948007269 +0000
+--- vim73.orig/src/gui_riscos.h 2010-05-15 11:04:10.000000000 +0000
 +++ vim73/src/gui_riscos.h      1970-01-01 00:00:00.000000000 +0000
 @@ -1,32 +0,0 @@
@@ -40782 +42427 @@
 -void ro_open_main(int *block);
 diff -Naur vim73.orig/src/gui_w16.c vim73/src/gui_w16.c
---- vim73.orig/src/gui_w16.c    2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/gui_w16.c 2012-06-03 23:09:55.320070394 +0000
+--- vim73.orig/src/gui_w16.c    2010-07-18 13:03:38.000000000 +0000
++++ vim73/src/gui_w16.c 2012-07-20 20:31:14.477642416 +0000
 @@ -21,6 +21,12 @@
   *
@@ -40808 +42453 @@
      LPWORD     p, pnumitems;
 diff -Naur vim73.orig/src/gui_w32.c vim73/src/gui_w32.c
---- vim73.orig/src/gui_w32.c    2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/gui_w32.c 2012-06-03 23:09:55.120065072 +0000
+--- vim73.orig/src/gui_w32.c    2010-08-08 13:05:26.000000000 +0000
++++ vim73/src/gui_w32.c 2012-07-20 20:31:13.890975327 +0000
 @@ -289,13 +289,13 @@
  
@@ -41092 +42737 @@
  
 diff -Naur vim73.orig/src/gui_w48.c vim73/src/gui_w48.c
---- vim73.orig/src/gui_w48.c    2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/gui_w48.c 2012-06-03 23:09:55.244068371 +0000
+--- vim73.orig/src/gui_w48.c    2010-07-27 19:46:04.000000000 +0000
++++ vim73/src/gui_w48.c 2012-07-20 20:31:14.280975607 +0000
 @@ -328,6 +328,10 @@
  static LRESULT _OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData);
@@ -41289 +42934 @@
  
 diff -Naur vim73.orig/src/gui_x11.c vim73/src/gui_x11.c
---- vim73.orig/src/gui_x11.c    2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/gui_x11.c 2012-06-03 23:09:53.348017915 +0000
+--- vim73.orig/src/gui_x11.c    2010-08-08 13:05:45.000000000 +0000
++++ vim73/src/gui_x11.c 2012-07-20 20:31:08.337637993 +0000
 @@ -2895,6 +2895,11 @@
             focus = gui.in_focus;
@@ -41304 +42949 @@
          * char arrives, instead we use XtAppProcessEvent() to hang until an
 diff -Naur vim73.orig/src/gui_xmdlg.c vim73/src/gui_xmdlg.c
---- vim73.orig/src/gui_xmdlg.c  2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/gui_xmdlg.c       2012-06-03 23:09:53.604024727 +0000
+--- vim73.orig/src/gui_xmdlg.c  2010-06-26 03:53:50.000000000 +0000
++++ vim73/src/gui_xmdlg.c       2012-07-20 20:31:09.267638665 +0000
 @@ -688,7 +688,7 @@
             do_dialog(VIM_ERROR,
@@ -41324 +42969 @@
      }
      else
+diff -Naur vim73.orig/src/gui_xmebw.c vim73/src/gui_xmebw.c
+--- vim73.orig/src/gui_xmebw.c  2010-07-14 14:48:14.000000000 +0000
++++ vim73/src/gui_xmebw.c       2012-07-20 20:31:17.487644573 +0000
+@@ -375,11 +375,8 @@
+ 
+     XGetGeometry(dpy, pix, &root, &x, &y, &width, &height, &border, &depth);
+ 
+-    if (eb->enhancedbutton.label_location == (int)XmTOP
+-           || eb->enhancedbutton.label_location == (int)XmBOTTOM)
+-       shift = eb->primitive.shadow_thickness / 2;
+-    else
+-       shift = eb->primitive.shadow_thickness / 2;
++    /* TODO: does the shift depend on label_location somehow? */
++    shift = eb->primitive.shadow_thickness / 2;
+ 
+     if (shift < 1)
+        shift = 1;
 diff -Naur vim73.orig/src/hardcopy.c vim73/src/hardcopy.c
---- vim73.orig/src/hardcopy.c   2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/hardcopy.c        2012-06-03 23:09:53.916033030 +0000
+--- vim73.orig/src/hardcopy.c   2010-07-31 14:10:59.000000000 +0000
++++ vim73/src/hardcopy.c        2012-07-20 20:31:10.217639350 +0000
 @@ -1759,18 +1759,25 @@
      char       *name;
@@ -41374 +43036 @@
 +    struct prt_ps_resource_S *res_cidfont;
 +    struct prt_ps_resource_S *res_cmap;
-+#endif
+ #endif
 +    int                retval = FALSE;
 +
@@ -41390 +43052 @@
 +#ifdef FEAT_MBYTE
 +           || res_cidfont == NULL || res_cmap == NULL
- #endif
++#endif
 +       )
 +       goto theend;
@@ -41583 +43245 @@
      void
 diff -Naur vim73.orig/src/if_cscope.c vim73/src/if_cscope.c
---- vim73.orig/src/if_cscope.c  2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/if_cscope.c       2012-06-03 23:09:54.260042184 +0000
+--- vim73.orig/src/if_cscope.c  2010-07-25 14:32:31.000000000 +0000
++++ vim73/src/if_cscope.c       2012-07-20 20:31:11.340973493 +0000
 @@ -13,16 +13,10 @@
  
@@ -41749 +43411 @@
  /*
 diff -Naur vim73.orig/src/if_lua.c vim73/src/if_lua.c
---- vim73.orig/src/if_lua.c     2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/if_lua.c  2012-06-03 23:09:55.724081145 +0000
+--- vim73.orig/src/if_lua.c     2010-08-12 20:12:04.000000000 +0000
++++ vim73/src/if_lua.c  2012-07-20 20:31:17.324311122 +0000
 @@ -1,4 +1,4 @@
 -/* vi:set ts=8 sts=4 sw=4:
@@ -41949 +43611 @@
 +lua_Integer (*dll_lua_tointegerx) (lua_State *L, int idx, int *isnum);
 +void (*dll_lua_callk) (lua_State *L, int nargs, int nresults, int ctx,
-+        lua_CFunction k);
++       lua_CFunction k);
 +int (*dll_lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc,
-+        int ctx, lua_CFunction k);
++       int ctx, lua_CFunction k);
 +void (*dll_lua_getglobal) (lua_State *L, const char *var);
 +void (*dll_lua_setglobal) (lua_State *L, const char *var);
@@ -42077 +43739 @@
 +{
 +    const char *msg = lua_pushfstring(L, "%s expected, got %s",
-+            tname, luaL_typename(L, narg));
++           tname, luaL_typename(L, narg));
 +    return luaL_argerror(L, narg, msg);
 +}
@@ -42246 +43908 @@
  }
  
-@@ -479,89 +606,508 @@
+@@ -479,89 +606,372 @@
      lua_pop(L, 2); /* original and modified strings */
  }
@@ -42289 +43951 @@
 +       return 1; \
 +    }
++
++/* =======   List type   ======= */
++
++    static luaV_List *
++luaV_newlist (lua_State *L, list_T *lis)
++{
++    luaV_List *l = (luaV_List *) lua_newuserdata(L, sizeof(luaV_List));
++    *l = lis;
++    lis->lv_refcount++; /* reference in Lua */
++    luaV_setudata(L, lis); /* cache[lis] = udata */
++    luaV_getfield(L, LUAVIM_LIST);
++    lua_setmetatable(L, -2);
++    return l;
++}
++
++luaV_pushtype(list_T, list, luaV_List)
++luaV_type_tostring(list, LUAVIM_LIST)
  
 -/* =======   Buffer type   ======= */
++    static int
++luaV_list_gc (lua_State *L)
++{
++    list_unref(luaV_unbox(L, luaV_List, 1));
++    return 0;
++}
  
 -    static luaV_Buffer *
 -luaV_newbuffer(lua_State *L, buf_T *buf)
-+/* adapted from eval.c */
-+
-+#define listitem_alloc() (listitem_T *)alloc(sizeof(listitem_T))
-+
-+    static listitem_T *
-+list_find (list_T *l, long n)
-+{
-+    listitem_T *li;
-+    if (l == NULL || n < -l->lv_len || n >= l->lv_len)
-+       return NULL;
-+    if (n < 0) /* search backward? */
-+       for (li = l->lv_last; n < -1; li = li->li_prev)
-+           n++;
-+    else /* search forward */
-+       for (li = l->lv_first; n > 0; li = li->li_next)
-+           n--;
-+    return li;
-+}
-+
-+    static void
-+list_remove (list_T *l, listitem_T *li)
++    static int
++luaV_list_len (lua_State *L)
  {
 -    luaV_Buffer *b = (luaV_Buffer *) lua_newuserdata(L, sizeof(luaV_Buffer));
@@ -42327 +43993 @@
 -    /* set metatable */
 -    luaV_getfield(L, LUAVIM_BUFFER);
-+    listwatch_T *lw;
-+    --l->lv_len;
-+    /* fix watchers */
-+    for (lw = l->lv_watch; lw != NULL; lw = lw->lw_next)
-+       if (lw->lw_item == li)
-+           lw->lw_item = li->li_next;
-+    /* fix list pointers */
-+    if (li->li_next == NULL) /* last? */
-+       l->lv_last = li->li_prev;
-+    else
-+       li->li_next->li_prev = li->li_prev;
-+    if (li->li_prev == NULL) /* first? */
-+       l->lv_first = li->li_next;
-+    else
-+       li->li_prev->li_next = li->li_next;
-+    l->lv_idx_item = NULL;
-+}
-+
-+    static void
-+list_append(list_T *l, listitem_T *item)
-+{
-+    if (l->lv_last == NULL) /* empty list? */
-+       l->lv_first = item;
-+    else
-+       l->lv_last->li_next = item;
-+    item->li_prev = l->lv_last;
-+    item->li_next = NULL;
-+    l->lv_last = item;
-+    ++l->lv_len;
-+}
-+
-+    static int
-+list_insert_tv(list_T *l, typval_T *tv, listitem_T *item)
-+{
-+    listitem_T *ni = listitem_alloc();
-+
-+    if (ni == NULL)
-+       return FAIL;
-+    copy_tv(tv, &ni->li_tv);
-+    if (item == NULL)
-+       list_append(l, ni);
-+    else
-+    {
-+       ni->li_prev = item->li_prev;
-+       ni->li_next = item;
-+       if (item->li_prev == NULL)
-+       {
-+           l->lv_first = ni;
-+           ++l->lv_idx;
-+       }
-+       else
-+       {
-+           item->li_prev->li_next = ni;
-+           l->lv_idx_item = NULL;
-+       }
-+       item->li_prev = ni;
-+       ++l->lv_len;
-+    }
-+    return OK;
-+}
-+
-+/* set references */
-+
-+static void set_ref_in_tv (typval_T *tv, int copyID);
-+
-+    static void
-+set_ref_in_dict(dict_T *d, int copyID)
-+{
-+    hashtab_T *ht = &d->dv_hashtab;
-+    int n = ht->ht_used;
-+    hashitem_T *hi;
-+    for (hi = ht->ht_array; n > 0; ++hi)
-+       if (!HASHITEM_EMPTY(hi))
-+       {
-+           dictitem_T *di = dict_lookup(hi);
-+           set_ref_in_tv(&di->di_tv, copyID);
-+           --n;
-+       }
-+}
-+
-+    static void
-+set_ref_in_list(list_T *l, int copyID)
-+{
-+    listitem_T *li;
-+    for (li = l->lv_first; li != NULL; li = li->li_next)
-+       set_ref_in_tv(&li->li_tv, copyID);
-+}
-+
-+    static void
-+set_ref_in_tv(typval_T *tv, int copyID)
-+{
-+    if (tv->v_type == VAR_LIST)
-+    {
-+       list_T *l = tv->vval.v_list;
-+       if (l != NULL && l->lv_copyID != copyID)
-+       {
-+           l->lv_copyID = copyID;
-+           set_ref_in_list(l, copyID);
-+       }
-+    }
-+    else if (tv->v_type == VAR_DICT)
-+    {
-+       dict_T *d = tv->vval.v_dict;
-+       if (d != NULL && d->dv_copyID != copyID)
-+       {
-+           d->dv_copyID = copyID;
-+           set_ref_in_dict(d, copyID);
-+       }
-+    }
-+}
-+
-+
-+/* =======   List type   ======= */
-+
-+    static luaV_List *
-+luaV_newlist (lua_State *L, list_T *lis)
-+{
-+    luaV_List *l = (luaV_List *) lua_newuserdata(L, sizeof(luaV_List));
-+    *l = lis;
-+    lis->lv_refcount++; /* reference in Lua */
-+    luaV_setudata(L, lis); /* cache[lis] = udata */
-+    luaV_getfield(L, LUAVIM_LIST);
-     lua_setmetatable(L, -2);
+-    lua_setmetatable(L, -2);
 -    return b;
-+    return l;
++    list_T *l = luaV_unbox(L, luaV_List, 1);
++    lua_pushinteger(L, (l == NULL) ? 0 : (int) l->lv_len);
++    return 1;
  }
  
 -    static luaV_Buffer *
 -luaV_pushbuffer (lua_State *L, buf_T *buf)
-+luaV_pushtype(list_T, list, luaV_List)
-+luaV_type_tostring(list, LUAVIM_LIST)
-+
 +    static int
-+luaV_list_gc (lua_State *L)
++luaV_list_iter (lua_State *L)
  {
 -    luaV_Buffer *b = NULL;
@@ -42469 +44012 @@
 -       lua_rawget(L, LUA_ENVIRONINDEX);
 -       if (lua_isnil(L, -1)) /* not interned? */
-+    list_unref(luaV_unbox(L, luaV_List, 1));
-+    return 0;
-+}
-+
-+    static int
-+luaV_list_len (lua_State *L)
-+{
-+    list_T *l = luaV_unbox(L, luaV_List, 1);
-+    lua_pushinteger(L, (l == NULL) ? 0 : (int) l->lv_len);
-+    return 1;
-+}
-+
-+    static int
-+luaV_list_iter (lua_State *L)
-+{
 +    listitem_T *li = (listitem_T *) lua_touserdata(L, lua_upvalueindex(2));
 +    if (li == NULL) return 0;
@@ -42529 +44057 @@
 -           b = (luaV_Buffer *) lua_touserdata(L, -1);
 +           lua_pushnil(L);
-     }
--    return b;
++    }
 +    else
 +       lua_pushnil(L);
@@ -42548 +44075 @@
 +    if (lua_isnil(L, 3)) /* remove? */
 +    {
-+       list_remove(l, li);
++       list_remove(l, li, li);
 +       clear_tv(&li->li_tv);
 +       vim_free(li);
-+    }
+     }
+-    return b;
 +    else
 +    {
@@ -42576 +44104 @@
 +       lua_settop(L, 2);
 +       luaV_totypval(L, 2, &v);
-+       copy_tv(&v, &li->li_tv);
-+       list_append(l, li);
++       list_append_tv(l, &v);
 +    }
 +    lua_settop(L, 1);
@@ -42796 +44323 @@
         else if (strncmp(s,   "insert", 6) == 0
                 || strncmp(s, "next", 4) == 0
-@@ -582,17 +1128,17 @@
+@@ -582,17 +992,17 @@
      static int
  luaV_buffer_newindex(lua_State *L)
@@ -42817 +44344 @@
         {
             curbuf = buf;
-@@ -605,7 +1151,7 @@
+@@ -605,7 +1015,7 @@
         }
         else {
@@ -42826 +44353 @@
                 if (curwin->w_cursor.lnum >= n)
                 {
-@@ -625,7 +1171,7 @@
+@@ -625,7 +1035,7 @@
      else if (lua_isstring(L, 3)) /* update line */
      {
@@ -42835 +44362 @@
         {
             curbuf = buf;
-@@ -638,7 +1184,7 @@
+@@ -638,7 +1048,7 @@
         }
         else changed_bytes(n, 0);
@@ -42844 +44371 @@
      }
      else
-@@ -649,8 +1195,9 @@
+@@ -649,8 +1059,9 @@
      static int
  luaV_buffer_insert(lua_State *L)
@@ -42856 +44383 @@
      buf_T *buf;
      luaL_checktype(L, 2, LUA_TSTRING);
-@@ -662,7 +1209,7 @@
+@@ -662,7 +1073,7 @@
      if (n > last) n = last;
      /* insert */
@@ -42865 +44392 @@
      {
         curbuf = buf;
-@@ -684,7 +1231,8 @@
+@@ -684,7 +1095,8 @@
  luaV_buffer_next(lua_State *L)
  {
@@ -42875 +44402 @@
  }
  
-@@ -692,7 +1240,8 @@
+@@ -692,7 +1104,8 @@
  luaV_buffer_previous(lua_State *L)
  {
@@ -42885 +44412 @@
  }
  
-@@ -700,8 +1249,7 @@
+@@ -700,8 +1113,7 @@
  luaV_buffer_isvalid(lua_State *L)
  {
@@ -42895 +44422 @@
      return 1;
  }
-@@ -722,78 +1270,36 @@
+@@ -722,78 +1134,36 @@
  
  /* =======   Window type   ======= */
@@ -42985 +44512 @@
      else if (strncmp(s,   "next", 4) == 0
             || strncmp(s, "previous", 8) == 0
-@@ -810,7 +1316,7 @@
+@@ -810,7 +1180,7 @@
      static int
  luaV_window_newindex (lua_State *L)
@@ -42994 +44521 @@
      int v = luaL_checkinteger(L, 3);
      if (strncmp(s, "line", 4) == 0)
-@@ -818,9 +1324,9 @@
+@@ -818,9 +1188,9 @@
  #ifdef HAVE_SANDBOX
         luaV_checksandbox(L);
@@ -43006 +44533 @@
      }
      else if (strncmp(s, "col", 3) == 0)
-@@ -828,7 +1334,7 @@
+@@ -828,7 +1198,7 @@
  #ifdef HAVE_SANDBOX
         luaV_checksandbox(L);
@@ -43015 +44542 @@
      }
  #ifdef FEAT_VERTSPLIT
-@@ -838,7 +1344,7 @@
+@@ -838,7 +1208,7 @@
  #ifdef FEAT_GUI
         need_mouse_correct = TRUE;
@@ -43024 +44551 @@
         curwin = win;
      }
-@@ -849,7 +1355,7 @@
+@@ -849,7 +1219,7 @@
  #ifdef FEAT_GUI
         need_mouse_correct = TRUE;
@@ -43033 +44560 @@
         curwin = win;
      }
-@@ -862,7 +1368,8 @@
+@@ -862,7 +1232,8 @@
  luaV_window_next(lua_State *L)
  {
@@ -43043 +44570 @@
  }
  
-@@ -870,7 +1377,8 @@
+@@ -870,7 +1241,8 @@
  luaV_window_previous(lua_State *L)
  {
@@ -43053 +44580 @@
  }
  
-@@ -878,8 +1386,7 @@
+@@ -878,8 +1250,7 @@
  luaV_window_isvalid(lua_State *L)
  {
@@ -43063 +44590 @@
      return 1;
  }
-@@ -925,6 +1432,31 @@
+@@ -925,6 +1296,31 @@
  }
  
@@ -43095 +44622 @@
  {
      do_cmdline_cmd((char_u *) luaL_checkstring(L, 1));
-@@ -956,6 +1488,28 @@
+@@ -956,6 +1352,28 @@
  }
  
@@ -43124 +44651 @@
  {
      buf_T *buf;
-@@ -981,15 +1535,10 @@
+@@ -981,15 +1399,10 @@
                     break;
             }
@@ -43142 +44669 @@
  }
  
-@@ -1002,59 +1551,62 @@
+@@ -1002,59 +1415,62 @@
         int n = lua_tointeger(L, 1);
         for (win = firstwin; win != NULL; win = win->w_next, n--)
@@ -43170 +44697 @@
      if (lua_isstring(L, 1)) s = (char_u *) lua_tostring(L, 1);
 -    b = luaV_pushbuffer(L, buflist_new(s, NULL, 1L, BLN_LISTED));
-+    luaV_pushbuffer(L, buflist_new(s, NULL, 1L, BLN_LISTED));
-     return 1;
- }
- 
-     static int
+-    return 1;
+-}
+-
+-    static int
 -luaV_isbuffer(lua_State *L)
-+luaV_type(lua_State *L)
- {
+-{
 -    lua_pushboolean(L, luaV_toudata(L, 1, LUAVIM_BUFFER) != NULL);
 -    return 1;
@@ -43186 +44711 @@
 -{
 -    lua_pushboolean(L, luaV_toudata(L, 1, LUAVIM_WINDOW) != NULL);
--    return 1;
--}
--
++    luaV_pushbuffer(L, buflist_new(s, NULL, 1L, BLN_LISTED));
+     return 1;
+ }
+ 
 -/* for freeing buffer and window objects; lightuserdata as arg */
--    static int
+     static int
 -luaV_free(lua_State *L)
--{
++luaV_type(lua_State *L)
+ {
 -    lua_pushvalue(L, 1); /* lightudata */
 -    lua_rawget(L, LUA_ENVIRONINDEX);
@@ -43238 +44765 @@
  
  static const luaL_Reg luaV_module[] = {
-@@ -1062,37 +1614,128 @@
+@@ -1062,37 +1478,128 @@
      {"eval", luaV_eval},
      {"beep", luaV_beep},
@@ -43312 +44839 @@
 +       }
 +       lua_pop(L, 2); /* metatable and value */
-+       set_ref_in_tv(&tv, copyID);
++       set_ref_in_item(&tv, copyID);
 +    }
 +    return 0;
@@ -43377 +44904 @@
  }
  
-@@ -1123,7 +1766,7 @@
+@@ -1123,7 +1630,7 @@
  static lua_State *L = NULL;
  
@@ -43386 +44913 @@
      return L != NULL;
  }
-@@ -1131,7 +1774,7 @@
+@@ -1131,7 +1638,7 @@
      static int
  lua_init(void)
@@ -43395 +44922 @@
  #ifdef DYNAMIC_LUA
         if (!lua_enabled(TRUE))
-@@ -1148,7 +1791,7 @@
+@@ -1148,7 +1655,7 @@
      void
  lua_end(void)
@@ -43404 +44931 @@
         lua_close(L);
         L = NULL;
-@@ -1191,7 +1834,7 @@
+@@ -1191,7 +1698,7 @@
      }
      luaV_setrange(L, eap->line1, eap->line2);
@@ -43413 +44940 @@
      luaL_addlstring(&b, " end", 4); /* footer */
      luaL_pushresult(&b);
-@@ -1208,7 +1851,8 @@
+@@ -1208,7 +1715,8 @@
      {
         lua_pushvalue(L, -1); /* function */
@@ -43423 +44950 @@
             luaV_emsg(L);
             break;
-@@ -1242,23 +1886,36 @@
+@@ -1242,23 +1750,36 @@
      }
  }
@@ -43472 +44999 @@
  
 diff -Naur vim73.orig/src/if_mzsch.c vim73/src/if_mzsch.c
---- vim73.orig/src/if_mzsch.c   2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/if_mzsch.c        2012-06-03 23:09:55.416072949 +0000
+--- vim73.orig/src/if_mzsch.c   2010-06-26 03:56:17.000000000 +0000
++++ vim73/src/if_mzsch.c        2012-07-20 20:31:14.800975981 +0000
 @@ -31,8 +31,6 @@
   * depend". */
@@ -43632 +45159 @@
  
 diff -Naur vim73.orig/src/if_ole.h vim73/src/if_ole.h
---- vim73.orig/src/if_ole.h     2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/if_ole.h  2012-06-03 23:09:54.208040801 +0000
+--- vim73.orig/src/if_ole.h     2010-05-15 11:04:07.000000000 +0000
++++ vim73/src/if_ole.h  2012-07-20 20:31:11.164306700 +0000
 @@ -46,8 +46,11 @@
  /* header files for imported files */
@@ -43649 +45176 @@
  #define __IVim_INTERFACE_DEFINED__
 diff -Naur vim73.orig/src/if_perl.xs vim73/src/if_perl.xs
---- vim73.orig/src/if_perl.xs   2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/if_perl.xs        2012-06-03 23:09:55.604077952 +0000
+--- vim73.orig/src/if_perl.xs   2010-07-22 09:33:37.000000000 +0000
++++ vim73/src/if_perl.xs        2012-07-20 20:31:15.314309683 +0000
 @@ -106,7 +106,7 @@
  #define close_dll dlclose
@@ -43813 +45340 @@
                 count = -count;
 diff -Naur vim73.orig/src/if_py_both.h vim73/src/if_py_both.h
---- vim73.orig/src/if_py_both.h 2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/if_py_both.h      2012-06-03 23:09:55.732081359 +0000
+--- vim73.orig/src/if_py_both.h 2010-08-08 11:06:29.000000000 +0000
++++ vim73/src/if_py_both.h      2012-07-20 20:31:17.820978145 +0000
+@@ -1,4 +1,4 @@
+-/* vi:set ts=8 sts=4 sw=4:
++/* vi:set ts=8 sts=4 sw=4 noet:
+  *
+  * VIM - Vi IMproved   by Bram Moolenaar
+  *
 @@ -12,6 +12,12 @@
   * Common code for if_python.c and if_python3.c.
@@ -43847 +45380 @@
 +    {"write",      OutputWrite,        1,          ""},
 +    {"writelines",  OutputWritelines,  1,          ""},
-+    {"flush",       OutputFlush,        1,          ""},
++    {"flush",      OutputFlush,        1,          ""},
 +    { NULL,        NULL,               0,          NULL}
  };
@@ -43878 +45411 @@
      Py_INCREF(Py_None);
      return Py_None;
-@@ -101,10 +116,10 @@
+@@ -90,7 +105,8 @@
+        return NULL;
+     Py_INCREF(list);
+ 
+-    if (!PyList_Check(list)) {
++    if (!PyList_Check(list))
++    {
+        PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
+        Py_DECREF(list);
+        return NULL;
+@@ -101,10 +117,11 @@
      for (i = 0; i < n; ++i)
      {
@@ -43887 +45430 @@
  
 -       if (!PyArg_Parse(line, "s#", &str, &len)) {
-+       if (!PyArg_Parse(line, "et#", ENC_OPT, &str, &len)) {
++       if (!PyArg_Parse(line, "et#", ENC_OPT, &str, &len))
++       {
             PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
             Py_DECREF(list);
             return NULL;
-@@ -115,6 +130,7 @@
+@@ -115,6 +132,7 @@
         writer((writefn)(error ? emsg : msg), (char_u *)str, len);
         Python_Release_Vim();
@@ -43899 +45443 @@
  
      Py_DECREF(list);
-@@ -122,52 +138,28 @@
+@@ -122,52 +140,28 @@
      return Py_None;
  }
@@ -43923 +45467 @@
 -    while (new_size < n)
 -       new_size += 80;
-+    /* do nothing */
-+    Py_INCREF(Py_None);
-+    return Py_None;
-+}
- 
+-
 -    if (new_size != buffer_size)
 -    {
@@ -43933 +45473 @@
 -       if (new_buffer == NULL)
 -           return;
++    /* do nothing */
++    Py_INCREF(Py_None);
++    return Py_None;
++}
  
 -       if (buffer)
@@ -43939 +45483 @@
 -           vim_free(buffer);
 -       }
--
+ 
 -       buffer = new_buffer;
 -       buffer_size = new_size;
@@ -43965 +45509 @@
  
      static void
-@@ -175,30 +167,34 @@
+@@ -175,30 +169,34 @@
  {
      char_u *ptr;
@@ -44012 +45556 @@
  
  /***************/
-@@ -543,7 +539,6 @@
+@@ -301,7 +299,7 @@
+ {
+     PyObject   *result;
+     PyObject   *newObj;
+-    char       ptrBuf[NUMBUFLEN];
++    char       ptrBuf[sizeof(void *) * 2 + 3];
+ 
+     /* Avoid infinite recursion */
+     if (depth > 100)
+@@ -316,9 +314,9 @@
+     if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL)
+            || (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL))
      {
-        long lnum;
-        long col;
+-       sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U,
+-               our_tv->v_type == VAR_LIST ? (long_u)our_tv->vval.v_list
+-                                          : (long_u)our_tv->vval.v_dict);
++       sprintf(ptrBuf, "%p",
++               our_tv->v_type == VAR_LIST ? (void *)our_tv->vval.v_list
++                                          : (void *)our_tv->vval.v_dict);
+        result = PyDict_GetItemString(lookupDict, ptrBuf);
+        if (result != NULL)
+        {
+@@ -449,6 +447,57 @@
+ #endif
+ }
+ 
++static PyObject *ConvertToPyObject(typval_T *);
++
++    static PyObject *
++VimEvalPy(PyObject *self UNUSED, PyObject *args UNUSED)
++{
++#ifdef FEAT_EVAL
++    char       *expr;
++    typval_T   *our_tv;
++    PyObject   *result;
++
++    if (!PyArg_ParseTuple(args, "s", &expr))
++       return NULL;
++
++    Py_BEGIN_ALLOW_THREADS
++    Python_Lock_Vim();
++    our_tv = eval_expr((char_u *)expr, NULL);
++
++    Python_Release_Vim();
++    Py_END_ALLOW_THREADS
++
++    if (our_tv == NULL)
++    {
++       PyErr_SetVim(_("invalid expression"));
++       return NULL;
++    }
++
++    result = ConvertToPyObject(our_tv);
++    Py_BEGIN_ALLOW_THREADS
++    Python_Lock_Vim();
++    free_tv(our_tv);
++    Python_Release_Vim();
++    Py_END_ALLOW_THREADS
++
++    return result;
++#else
++    PyErr_SetVim(_("expressions disabled at compile time"));
++    return NULL;
++#endif
++}
++
++    static PyObject *
++VimStrwidth(PyObject *self UNUSED, PyObject *args)
++{
++    char       *expr;
++
++    if (!PyArg_ParseTuple(args, "s", &expr))
++       return NULL;
++
++    return PyLong_FromLong(mb_string2cells((char_u *)expr, (int)STRLEN(expr)));
++}
++
+ /*
+  * Vim module - Definitions
+  */
+@@ -457,6 +506,8 @@
+     /* name,        function,          calling,    documentation */
+     {"command",             VimCommand,        1,          "Execute a Vim ex-mode command" },
+     {"eval",        VimEval,           1,          "Evaluate an expression using Vim evaluator" },
++    {"bindeval",     VimEvalPy,                1,          "Like eval(), but returns objects attached to vim ones"},
++    {"strwidth",     VimStrwidth,      1,          "Screen string width, counts <Tab> as having width 1"},
+     { NULL,         NULL,              0,          NULL }
+ };
+ 
+@@ -464,8 +515,7 @@
+ {
+     PyObject_HEAD
+     buf_T *buf;
+-}
+-BufferObject;
++} BufferObject;
+ 
+ #define INVALID_BUFFER_VALUE ((buf_T *)(-1))
+ 
+@@ -509,161 +559,919 @@
+     win_T      *win;
+ } WindowObject;
+ 
+-#define INVALID_WINDOW_VALUE ((win_T *)(-1))
++static int ConvertFromPyObject(PyObject *, typval_T *);
++static int _ConvertFromPyObject(PyObject *, typval_T *, PyObject *);
+ 
+-    static int
+-CheckWindow(WindowObject *this)
++typedef struct pylinkedlist_S {
++    struct pylinkedlist_S      *pll_next;
++    struct pylinkedlist_S      *pll_prev;
++    PyObject                   *pll_obj;
++} pylinkedlist_T;
++
++static pylinkedlist_T *lastdict = NULL;
++static pylinkedlist_T *lastlist = NULL;
++
++    static void
++pyll_remove(pylinkedlist_T *ref, pylinkedlist_T **last)
+ {
+-    if (this->win == INVALID_WINDOW_VALUE)
++    if (ref->pll_prev == NULL)
+     {
+-       PyErr_SetVim(_("attempt to refer to deleted window"));
+-       return -1;
++       if (ref->pll_next == NULL)
++       {
++           *last = NULL;
++           return;
++       }
+     }
++    else
++       ref->pll_prev->pll_next = ref->pll_next;
+ 
+-    return 0;
++    if (ref->pll_next == NULL)
++       *last = ref->pll_prev;
++    else
++       ref->pll_next->pll_prev = ref->pll_prev;
+ }
+ 
+-static int WindowSetattr(PyObject *, char *, PyObject *);
+-static PyObject *WindowRepr(PyObject *);
++    static void
++pyll_add(PyObject *self, pylinkedlist_T *ref, pylinkedlist_T **last)
++{
++    if (*last == NULL)
++       ref->pll_prev = NULL;
++    else
++    {
++       (*last)->pll_next = ref;
++       ref->pll_prev = *last;
++    }
++    ref->pll_next = NULL;
++    ref->pll_obj = self;
++    *last = ref;
++}
+ 
+-    static int
+-WindowSetattr(PyObject *self, char *name, PyObject *val)
++static PyTypeObject DictionaryType;
++
++typedef struct
+ {
+-    WindowObject *this = (WindowObject *)(self);
++    PyObject_HEAD
++    dict_T     *dict;
++    pylinkedlist_T     ref;
++} DictionaryObject;
+ 
+-    if (CheckWindow(this))
+-       return -1;
++    static PyObject *
++DictionaryNew(dict_T *dict)
++{
++    DictionaryObject   *self;
+ 
+-    if (strcmp(name, "buffer") == 0)
++    self = PyObject_NEW(DictionaryObject, &DictionaryType);
++    if (self == NULL)
++       return NULL;
++    self->dict = dict;
++    ++dict->dv_refcount;
++
++    pyll_add((PyObject *)(self), &self->ref, &lastdict);
++
++    return (PyObject *)(self);
++}
++
++    static int
++pydict_to_tv(PyObject *obj, typval_T *tv, PyObject *lookupDict)
++{
++    dict_T     *d;
++    char_u     *key;
++    dictitem_T *di;
++    PyObject   *keyObject;
++    PyObject   *valObject;
++    Py_ssize_t iter = 0;
++
++    d = dict_alloc();
++    if (d == NULL)
+     {
+-       PyErr_SetString(PyExc_TypeError, _("readonly attribute"));
++       PyErr_NoMemory();
+        return -1;
+     }
+-    else if (strcmp(name, "cursor") == 0)
++
++    tv->v_type = VAR_DICT;
++    tv->vval.v_dict = d;
++
++    while (PyDict_Next(obj, &iter, &keyObject, &valObject))
+     {
+-       long lnum;
+-       long col;
 -       long len;
- 
-        if (!PyArg_Parse(val, "(ll)", &lnum, &col))
++       DICTKEY_DECL
+ 
+-       if (!PyArg_Parse(val, "(ll)", &lnum, &col))
++       if (keyObject == NULL)
++           return -1;
++       if (valObject == NULL)
             return -1;
-@@ -558,18 +553,15 @@
-        if (VimErrorCheck())
+ 
+-       if (lnum <= 0 || lnum > this->win->w_buffer->b_ml.ml_line_count)
++       DICTKEY_GET(-1)
++
++       di = dictitem_alloc(key);
++
++       DICTKEY_UNREF
++
++       if (di == NULL)
+        {
+-           PyErr_SetVim(_("cursor position outside buffer"));
++           PyErr_NoMemory();
             return -1;
+        }
++       di->di_tv.v_lock = 0;
+ 
+-       /* Check for keyboard interrupts */
+-       if (VimErrorCheck())
++       if (_ConvertFromPyObject(valObject, &di->di_tv, lookupDict) == -1)
++       {
++           vim_free(di);
+            return -1;
++       }
++       if (dict_add(d, di) == FAIL)
++       {
++           vim_free(di);
++           PyErr_SetVim(_("failed to add key to dictionary"));
++           return -1;
++       }
++    }
++    return 0;
++}
  
 -       /* When column is out of range silently correct it. */
@@ -44029 +45818 @@
 -           col = len;
 -
-        this->win->w_cursor.lnum = lnum;
-        this->win->w_cursor.col = col;
- #ifdef FEAT_VIRTUALEDIT
-        this->win->w_cursor.coladd = 0;
- #endif
+-       this->win->w_cursor.lnum = lnum;
+-       this->win->w_cursor.col = col;
+-#ifdef FEAT_VIRTUALEDIT
+-       this->win->w_cursor.coladd = 0;
+-#endif
 -       update_screen(VALID);
++    static int
++pymap_to_tv(PyObject *obj, typval_T *tv, PyObject *lookupDict)
++{
++    dict_T     *d;
++    char_u     *key;
++    dictitem_T *di;
++    PyObject   *list;
++    PyObject   *litem;
++    PyObject   *keyObject;
++    PyObject   *valObject;
++    Py_ssize_t lsize;
+ 
+-       return 0;
++    d = dict_alloc();
++    if (d == NULL)
++    {
++       PyErr_NoMemory();
++       return -1;
+     }
+-    else if (strcmp(name, "height") == 0)
++
++    tv->v_type = VAR_DICT;
++    tv->vval.v_dict = d;
++
++    list = PyMapping_Items(obj);
++    lsize = PyList_Size(list);
++    while (lsize--)
+     {
+-       int     height;
+-       win_T   *savewin;
++       DICTKEY_DECL
+ 
+-       if (!PyArg_Parse(val, "i", &height))
++       litem = PyList_GetItem(list, lsize);
++       if (litem == NULL)
++       {
++           Py_DECREF(list);
+            return -1;
++       }
+ 
+-#ifdef FEAT_GUI
+-       need_mouse_correct = TRUE;
+-#endif
+-       savewin = curwin;
+-       curwin = this->win;
+-       win_setheight(height);
+-       curwin = savewin;
+-
+-       /* Check for keyboard interrupts */
+-       if (VimErrorCheck())
++       keyObject = PyTuple_GetItem(litem, 0);
++       if (keyObject == NULL)
++       {
++           Py_DECREF(list);
++           Py_DECREF(litem);
+            return -1;
++       }
+ 
+-       return 0;
+-    }
+-#ifdef FEAT_VERTSPLIT
+-    else if (strcmp(name, "width") == 0)
+-    {
+-       int     width;
+-       win_T   *savewin;
++       DICTKEY_GET(-1)
+ 
+-       if (!PyArg_Parse(val, "i", &width))
++       valObject = PyTuple_GetItem(litem, 1);
++       if (valObject == NULL)
++       {
++           Py_DECREF(list);
++           Py_DECREF(litem);
+            return -1;
++       }
+ 
+-#ifdef FEAT_GUI
+-       need_mouse_correct = TRUE;
+-#endif
+-       savewin = curwin;
+-       curwin = this->win;
+-       win_setwidth(width);
+-       curwin = savewin;
++       di = dictitem_alloc(key);
+ 
+-       /* Check for keyboard interrupts */
+-       if (VimErrorCheck())
++       DICTKEY_UNREF
++
++       if (di == NULL)
++       {
++           Py_DECREF(list);
++           Py_DECREF(litem);
++           PyErr_NoMemory();
+            return -1;
++       }
++       di->di_tv.v_lock = 0;
+ 
+-       return 0;
+-    }
+-#endif
+-    else
+-    {
+-       PyErr_SetString(PyExc_AttributeError, name);
+-       return -1;
++       if (_ConvertFromPyObject(valObject, &di->di_tv, lookupDict) == -1)
++       {
++           vim_free(di);
++           Py_DECREF(list);
++           Py_DECREF(litem);
++           return -1;
++       }
++       if (dict_add(d, di) == FAIL)
++       {
++           vim_free(di);
++           Py_DECREF(list);
++           Py_DECREF(litem);
++           PyErr_SetVim(_("failed to add key to dictionary"));
++           return -1;
++       }
++       Py_DECREF(litem);
+     }
++    Py_DECREF(list);
++    return 0;
++}
++
++    static PyInt
++DictionaryLength(PyObject *self)
++{
++    return ((PyInt) ((((DictionaryObject *)(self))->dict->dv_hashtab.ht_used)));
+ }
+ 
+     static PyObject *
+-WindowRepr(PyObject *self)
++DictionaryItem(PyObject *self, PyObject *keyObject)
+ {
+-    static char repr[100];
+-    WindowObject *this = (WindowObject *)(self);
++    char_u     *key;
++    dictitem_T *val;
++    DICTKEY_DECL
+ 
+-    if (this->win == INVALID_WINDOW_VALUE)
+-    {
+-       vim_snprintf(repr, 100, _("<window object (deleted) at %p>"), (self));
+-       return PyString_FromString(repr);
+-    }
+-    else
+-    {
+-       int     i = 0;
+-       win_T   *w;
++    DICTKEY_GET(NULL)
+ 
+-       for (w = firstwin; w != NULL && w != this->win; w = W_NEXT(w))
+-           ++i;
++    val = dict_find(((DictionaryObject *) (self))->dict, key, -1);
+ 
+-       if (w == NULL)
+-           vim_snprintf(repr, 100, _("<window object (unknown) at %p>"),
+-                                                                     (self));
+-       else
+-           vim_snprintf(repr, 100, _("<window %d>"), i);
++    DICTKEY_UNREF
+ 
+-       return PyString_FromString(repr);
+-    }
++    return ConvertToPyObject(&val->di_tv);
+ }
+ 
+-/*
+- * Window list object - Implementation
+- */
+     static PyInt
+-WinListLength(PyObject *self UNUSED)
++DictionaryAssItem(PyObject *self, PyObject *keyObject, PyObject *valObject)
+ {
+-    win_T      *w = firstwin;
+-    PyInt      n = 0;
++    char_u     *key;
++    typval_T   tv;
++    dict_T     *d = ((DictionaryObject *)(self))->dict;
++    dictitem_T *di;
++    DICTKEY_DECL
+ 
+-    while (w != NULL)
++    if (d->dv_lock)
++    {
++       PyErr_SetVim(_("dict is locked"));
++       return -1;
++    }
++
++    DICTKEY_GET(-1)
++
++    di = dict_find(d, key, -1);
++
++    if (valObject == NULL)
++    {
++       hashitem_T      *hi;
++
++       if (di == NULL)
++       {
++           PyErr_SetString(PyExc_IndexError, _("no such key in dictionary"));
++           return -1;
++       }
++       hi = hash_find(&d->dv_hashtab, di->di_key);
++       hash_remove(&d->dv_hashtab, hi);
++       dictitem_free(di);
++       return 0;
++    }
++
++    if (ConvertFromPyObject(valObject, &tv) == -1)
++       return -1;
++
++    if (di == NULL)
++    {
++       di = dictitem_alloc(key);
++       if (di == NULL)
++       {
++           PyErr_NoMemory();
++           return -1;
++       }
++       di->di_tv.v_lock = 0;
++
++       if (dict_add(d, di) == FAIL)
++       {
++           vim_free(di);
++           PyErr_SetVim(_("failed to add key to dictionary"));
++           return -1;
++       }
++    }
++    else
++       clear_tv(&di->di_tv);
++
++    DICTKEY_UNREF
++
++    copy_tv(&tv, &di->di_tv);
++    return 0;
++}
++
++    static PyObject *
++DictionaryListKeys(PyObject *self)
++{
++    dict_T     *dict = ((DictionaryObject *)(self))->dict;
++    long_u     todo = dict->dv_hashtab.ht_used;
++    Py_ssize_t i = 0;
++    PyObject   *r;
++    hashitem_T *hi;
++
++    r = PyList_New(todo);
++    for (hi = dict->dv_hashtab.ht_array; todo > 0; ++hi)
++    {
++       if (!HASHITEM_EMPTY(hi))
++       {
++           PyList_SetItem(r, i, PyBytes_FromString((char *)(hi->hi_key)));
++           --todo;
++           ++i;
++       }
++    }
++    return r;
++}
++
++static struct PyMethodDef DictionaryMethods[] = {
++    {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},
++    { NULL,        NULL,               0,          NULL }
++};
++
++static PyTypeObject ListType;
++
++typedef struct
++{
++    PyObject_HEAD
++    list_T     *list;
++    pylinkedlist_T     ref;
++} ListObject;
++
++    static PyObject *
++ListNew(list_T *list)
++{
++    ListObject *self;
++
++    self = PyObject_NEW(ListObject, &ListType);
++    if (self == NULL)
++       return NULL;
++    self->list = list;
++    ++list->lv_refcount;
++
++    pyll_add((PyObject *)(self), &self->ref, &lastlist);
++
++    return (PyObject *)(self);
++}
++
++    static int
++list_py_concat(list_T *l, PyObject *obj, PyObject *lookupDict)
++{
++    Py_ssize_t i;
++    Py_ssize_t lsize = PySequence_Size(obj);
++    PyObject   *litem;
++    listitem_T *li;
++
++    for(i=0; i<lsize; i++)
++    {
++       li = listitem_alloc();
++       if (li == NULL)
++       {
++           PyErr_NoMemory();
++           return -1;
++       }
++       li->li_tv.v_lock = 0;
++
++       litem = PySequence_GetItem(obj, i);
++       if (litem == NULL)
++           return -1;
++       if (_ConvertFromPyObject(litem, &li->li_tv, lookupDict) == -1)
++           return -1;
++
++       list_append(l, li);
++    }
++    return 0;
++}
++
++    static int
++pyseq_to_tv(PyObject *obj, typval_T *tv, PyObject *lookupDict)
++{
++    list_T     *l;
++
++    l = list_alloc();
++    if (l == NULL)
++    {
++       PyErr_NoMemory();
++       return -1;
++    }
++
++    tv->v_type = VAR_LIST;
++    tv->vval.v_list = l;
++
++    if (list_py_concat(l, obj, lookupDict) == -1)
++       return -1;
++
++    return 0;
++}
++
++    static int
++pyiter_to_tv(PyObject *obj, typval_T *tv, PyObject *lookupDict)
++{
++    PyObject   *iterator = PyObject_GetIter(obj);
++    PyObject   *item;
++    list_T     *l;
++    listitem_T *li;
++
++    l = list_alloc();
++
++    if (l == NULL)
++    {
++       PyErr_NoMemory();
++       return -1;
++    }
++
++    tv->vval.v_list = l;
++    tv->v_type = VAR_LIST;
++
++
++    if (iterator == NULL)
++       return -1;
++
++    while ((item = PyIter_Next(obj)))
++    {
++       li = listitem_alloc();
++       if (li == NULL)
++       {
++           PyErr_NoMemory();
++           return -1;
++       }
++       li->li_tv.v_lock = 0;
++
++       if (_ConvertFromPyObject(item, &li->li_tv, lookupDict) == -1)
++           return -1;
++
++       list_append(l, li);
++
++       Py_DECREF(item);
++    }
++
++    Py_DECREF(iterator);
++    return 0;
++}
++
++    static PyInt
++ListLength(PyObject *self)
++{
++    return ((PyInt) (((ListObject *) (self))->list->lv_len));
++}
++
++    static PyObject *
++ListItem(PyObject *self, Py_ssize_t index)
++{
++    listitem_T *li;
++
++    if (index>=ListLength(self))
++    {
++       PyErr_SetString(PyExc_IndexError, "list index out of range");
++       return NULL;
++    }
++    li = list_find(((ListObject *) (self))->list, (long) index);
++    if (li == NULL)
++    {
++       PyErr_SetVim(_("internal error: failed to get vim list item"));
++       return NULL;
++    }
++    return ConvertToPyObject(&li->li_tv);
++}
++
++#define PROC_RANGE \
++    if (last < 0) {\
++       if (last < -size) \
++           last = 0; \
++       else \
++           last += size; \
++    } \
++    if (first < 0) \
++       first = 0; \
++    if (first > size) \
++       first = size; \
++    if (last > size) \
++       last = size;
++
++    static PyObject *
++ListSlice(PyObject *self, Py_ssize_t first, Py_ssize_t last)
++{
++    PyInt      i;
++    PyInt      size = ListLength(self);
++    PyInt      n;
++    PyObject   *list;
++    int                reversed = 0;
++
++    PROC_RANGE
++    if (first >= last)
++       first = last;
++
++    n = last-first;
++    list = PyList_New(n);
++    if (list == NULL)
++       return NULL;
++
++    for (i = 0; i < n; ++i)
++    {
++       PyObject        *item = ListItem(self, i);
++       if (item == NULL)
++       {
++           Py_DECREF(list);
++           return NULL;
++       }
++
++       if ((PyList_SetItem(list, ((reversed)?(n-i-1):(i)), item)))
++       {
++           Py_DECREF(item);
++           Py_DECREF(list);
++           return NULL;
++       }
++    }
++
++    return list;
++}
++
++    static int
++ListAssItem(PyObject *self, Py_ssize_t index, PyObject *obj)
++{
++    typval_T   tv;
++    list_T     *l = ((ListObject *) (self))->list;
++    listitem_T *li;
++    Py_ssize_t length = ListLength(self);
++
++    if (l->lv_lock)
++    {
++       PyErr_SetVim(_("list is locked"));
++       return -1;
++    }
++    if (index>length || (index==length && obj==NULL))
++    {
++       PyErr_SetString(PyExc_IndexError, "list index out of range");
++       return -1;
++    }
++
++    if (obj == NULL)
++    {
++       li = list_find(l, (long) index);
++       list_remove(l, li, li);
++       clear_tv(&li->li_tv);
++       vim_free(li);
++       return 0;
++    }
++
++    if (ConvertFromPyObject(obj, &tv) == -1)
++       return -1;
++
++    if (index == length)
++    {
++       if (list_append_tv(l, &tv) == FAIL)
++       {
++           PyErr_SetVim(_("Failed to add item to list"));
++           return -1;
++       }
++    }
++    else
++    {
++       li = list_find(l, (long) index);
++       clear_tv(&li->li_tv);
++       copy_tv(&tv, &li->li_tv);
++    }
++    return 0;
++}
++
++    static int
++ListAssSlice(PyObject *self, Py_ssize_t first, Py_ssize_t last, PyObject *obj)
++{
++    PyInt      size = ListLength(self);
++    Py_ssize_t i;
++    Py_ssize_t lsize;
++    PyObject   *litem;
++    listitem_T *li;
++    listitem_T *next;
++    typval_T   v;
++    list_T     *l = ((ListObject *) (self))->list;
++
++    if (l->lv_lock)
++    {
++       PyErr_SetVim(_("list is locked"));
++       return -1;
++    }
++
++    PROC_RANGE
++
++    if (first == size)
++       li = NULL;
++    else
++    {
++       li = list_find(l, (long) first);
++       if (li == NULL)
++       {
++           PyErr_SetVim(_("internal error: no vim list item"));
++           return -1;
++       }
++       if (last > first)
++       {
++           i = last - first;
++           while (i-- && li != NULL)
++           {
++               next = li->li_next;
++               listitem_remove(l, li);
++               li = next;
++           }
++       }
++    }
++
++    if (obj == NULL)
++       return 0;
++
++    if (!PyList_Check(obj))
++    {
++       PyErr_SetString(PyExc_TypeError, _("can only assign lists to slice"));
++       return -1;
++    }
++
++    lsize = PyList_Size(obj);
++
++    for(i=0; i<lsize; i++)
++    {
++       litem = PyList_GetItem(obj, i);
++       if (litem == NULL)
++           return -1;
++       if (ConvertFromPyObject(litem, &v) == -1)
++           return -1;
++       if (list_insert_tv(l, &v, li) == FAIL)
++       {
++           PyErr_SetVim(_("internal error: failed to add item to list"));
++           return -1;
++       }
++    }
++    return 0;
++}
++
++    static PyObject *
++ListConcatInPlace(PyObject *self, PyObject *obj)
++{
++    list_T     *l = ((ListObject *) (self))->list;
++    PyObject   *lookup_dict;
++
++    if (l->lv_lock)
++    {
++       PyErr_SetVim(_("list is locked"));
++       return NULL;
++    }
++
++    if (!PySequence_Check(obj))
++    {
++       PyErr_SetString(PyExc_TypeError, _("can only concatenate with lists"));
++       return NULL;
++    }
++
++    lookup_dict = PyDict_New();
++    if (list_py_concat(l, obj, lookup_dict) == -1)
++    {
++       Py_DECREF(lookup_dict);
++       return NULL;
++    }
++    Py_DECREF(lookup_dict);
++
++    Py_INCREF(self);
++    return self;
++}
++
++static struct PyMethodDef ListMethods[] = {
++    {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
++    { NULL,        NULL,               0,          NULL }
++};
++
++typedef struct
++{
++    PyObject_HEAD
++    char_u     *name;
++} FunctionObject;
++
++static PyTypeObject FunctionType;
++
++    static PyObject *
++FunctionNew(char_u *name)
++{
++    FunctionObject     *self;
++
++    self = PyObject_NEW(FunctionObject, &FunctionType);
++    if (self == NULL)
++       return NULL;
++    self->name = PyMem_New(char_u, STRLEN(name) + 1);
++    if (self->name == NULL)
++    {
++       PyErr_NoMemory();
++       return NULL;
++    }
++    STRCPY(self->name, name);
++    func_ref(name);
++    return (PyObject *)(self);
++}
++
++    static PyObject *
++FunctionCall(PyObject *self, PyObject *argsObject, PyObject *kwargs)
++{
++    FunctionObject     *this = (FunctionObject *)(self);
++    char_u     *name = this->name;
++    typval_T   args;
++    typval_T   selfdicttv;
++    typval_T   rettv;
++    dict_T     *selfdict = NULL;
++    PyObject   *selfdictObject;
++    PyObject   *result;
++    int                error;
++
++    if (ConvertFromPyObject(argsObject, &args) == -1)
++       return NULL;
++
++    if (kwargs != NULL)
++    {
++       selfdictObject = PyDict_GetItemString(kwargs, "self");
++       if (selfdictObject != NULL)
++       {
++           if (!PyDict_Check(selfdictObject))
++           {
++               PyErr_SetString(PyExc_TypeError, _("'self' argument must be a dictionary"));
++               clear_tv(&args);
++               return NULL;
++           }
++           if (ConvertFromPyObject(selfdictObject, &selfdicttv) == -1)
++               return NULL;
++           selfdict = selfdicttv.vval.v_dict;
++       }
++    }
++
++    error = func_call(name, &args, selfdict, &rettv);
++    if (error != OK)
++    {
++       result = NULL;
++       PyErr_SetVim(_("failed to run function"));
++    }
++    else
++       result = ConvertToPyObject(&rettv);
++
++    /* FIXME Check what should really be cleared. */
++    clear_tv(&args);
++    clear_tv(&rettv);
++    /*
++     * if (selfdict!=NULL)
++     *     clear_tv(selfdicttv);
++     */
++
++    return result;
++}
++
++static struct PyMethodDef FunctionMethods[] = {
++    {"__call__",    (PyCFunction)FunctionCall, METH_VARARGS|METH_KEYWORDS, ""},
++    { NULL,        NULL,               0,          NULL }
++};
++
++#define INVALID_WINDOW_VALUE ((win_T *)(-1))
++
++    static int
++CheckWindow(WindowObject *this)
++{
++    if (this->win == INVALID_WINDOW_VALUE)
++    {
++       PyErr_SetVim(_("attempt to refer to deleted window"));
++       return -1;
++    }
++
++    return 0;
++}
++
++static int WindowSetattr(PyObject *, char *, PyObject *);
++static PyObject *WindowRepr(PyObject *);
++
++    static int
++WindowSetattr(PyObject *self, char *name, PyObject *val)
++{
++    WindowObject *this = (WindowObject *)(self);
++
++    if (CheckWindow(this))
++       return -1;
++
++    if (strcmp(name, "buffer") == 0)
++    {
++       PyErr_SetString(PyExc_TypeError, _("readonly attribute"));
++       return -1;
++    }
++    else if (strcmp(name, "cursor") == 0)
++    {
++       long lnum;
++       long col;
++
++       if (!PyArg_Parse(val, "(ll)", &lnum, &col))
++           return -1;
++
++       if (lnum <= 0 || lnum > this->win->w_buffer->b_ml.ml_line_count)
++       {
++           PyErr_SetVim(_("cursor position outside buffer"));
++           return -1;
++       }
++
++       /* Check for keyboard interrupts */
++       if (VimErrorCheck())
++           return -1;
++
++       this->win->w_cursor.lnum = lnum;
++       this->win->w_cursor.col = col;
++#ifdef FEAT_VIRTUALEDIT
++       this->win->w_cursor.coladd = 0;
++#endif
 +       /* When column is out of range silently correct it. */
 +       check_cursor_col_win(this->win);
- 
++
 +       update_screen(VALID);
-        return 0;
-     }
-     else if (strcmp(name, "height") == 0)
-@@ -698,6 +690,7 @@
++       return 0;
++    }
++    else if (strcmp(name, "height") == 0)
++    {
++       int     height;
++       win_T   *savewin;
++
++       if (!PyArg_Parse(val, "i", &height))
++           return -1;
++
++#ifdef FEAT_GUI
++       need_mouse_correct = TRUE;
++#endif
++       savewin = curwin;
++       curwin = this->win;
++       win_setheight(height);
++       curwin = savewin;
++
++       /* Check for keyboard interrupts */
++       if (VimErrorCheck())
++           return -1;
++
++       return 0;
++    }
++#ifdef FEAT_VERTSPLIT
++    else if (strcmp(name, "width") == 0)
++    {
++       int     width;
++       win_T   *savewin;
++
++       if (!PyArg_Parse(val, "i", &width))
++           return -1;
++
++#ifdef FEAT_GUI
++       need_mouse_correct = TRUE;
++#endif
++       savewin = curwin;
++       curwin = this->win;
++       win_setwidth(width);
++       curwin = savewin;
++
++       /* Check for keyboard interrupts */
++       if (VimErrorCheck())
++           return -1;
++
++       return 0;
++    }
++#endif
++    else
++    {
++       PyErr_SetString(PyExc_AttributeError, name);
++       return -1;
++    }
++}
++
++    static PyObject *
++WindowRepr(PyObject *self)
++{
++    static char repr[100];
++    WindowObject *this = (WindowObject *)(self);
++
++    if (this->win == INVALID_WINDOW_VALUE)
++    {
++       vim_snprintf(repr, 100, _("<window object (deleted) at %p>"), (self));
++       return PyString_FromString(repr);
++    }
++    else
++    {
++       int     i = 0;
++       win_T   *w;
++
++       for (w = firstwin; w != NULL && w != this->win; w = W_NEXT(w))
++           ++i;
++
++       if (w == NULL)
++           vim_snprintf(repr, 100, _("<window object (unknown) at %p>"),
++                                                                     (self));
++       else
++           vim_snprintf(repr, 100, _("<window %d>"), i);
++
++       return PyString_FromString(repr);
++    }
++}
++
++/*
++ * Window list object - Implementation
++ */
++    static PyInt
++WinListLength(PyObject *self UNUSED)
++{
++    win_T      *w = firstwin;
++    PyInt      n = 0;
++
++    while (w != NULL)
+     {
+        ++n;
+        w = W_NEXT(w);
+@@ -698,6 +1506,7 @@
  {
      const char *str;
@@ -44050 +46686 @@
      PyInt i;
      char *p;
-@@ -708,8 +701,9 @@
+@@ -708,8 +1517,9 @@
         return NULL;
      }
@@ -44062 +46698 @@
      /*
       * Error checking: String must not contain newlines, as we
-@@ -748,6 +742,7 @@
+@@ -748,6 +1558,7 @@
      }
  
@@ -44070 +46706 @@
      return save;
  }
-@@ -834,7 +829,8 @@
-     invalidate_botline();
- }
- 
--/* Replace a line in the specified buffer. The line number is
+@@ -831,42 +1642,142 @@
+            check_cursor_col();
+        changed_cline_bef_curs();
+     }
+-    invalidate_botline();
++    invalidate_botline();
++}
++
 +/*
 + * Replace a line in the specified buffer. The line number is
-  * in Vim format (1-based). The replacement line is given as
-  * a Python string object. The object is checked for validity
-  * and correct format. Errors are returned as a value of FAIL.
-@@ -925,6 +921,193 @@
-     }
++ * in Vim format (1-based). The replacement line is given as
++ * a Python string object. The object is checked for validity
++ * and correct format. Errors are returned as a value of FAIL.
++ * The return value is OK on success.
++ * If OK is returned and len_change is not NULL, *len_change
++ * is set to the change in the buffer length.
++ */
++    static int
++SetBufferLine(buf_T *buf, PyInt n, PyObject *line, PyInt *len_change)
++{
++    /* First of all, we check the thpe of the supplied Python object.
++     * There are three cases:
++     *   1. NULL, or None - this is a deletion.
++     *   2. A string      - this is a replacement.
++     *   3. Anything else - this is an error.
++     */
++    if (line == Py_None || line == NULL)
++    {
++       buf_T *savebuf = curbuf;
++
++       PyErr_Clear();
++       curbuf = buf;
++
++       if (u_savedel((linenr_T)n, 1L) == FAIL)
++           PyErr_SetVim(_("cannot save undo information"));
++       else if (ml_delete((linenr_T)n, FALSE) == FAIL)
++           PyErr_SetVim(_("cannot delete line"));
++       else
++       {
++           if (buf == curwin->w_buffer)
++               py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
++           deleted_lines_mark((linenr_T)n, 1L);
++       }
++
++       curbuf = savebuf;
++
++       if (PyErr_Occurred() || VimErrorCheck())
++           return FAIL;
++
++       if (len_change)
++           *len_change = -1;
++
++       return OK;
++    }
++    else if (PyString_Check(line))
++    {
++       char *save = StringToLine(line);
++       buf_T *savebuf = curbuf;
++
++       if (save == NULL)
++           return FAIL;
++
++       /* We do not need to free "save" if ml_replace() consumes it. */
++       PyErr_Clear();
++       curbuf = buf;
++
++       if (u_savesub((linenr_T)n) == FAIL)
++       {
++           PyErr_SetVim(_("cannot save undo information"));
++           vim_free(save);
++       }
++       else if (ml_replace((linenr_T)n, (char_u *)save, FALSE) == FAIL)
++       {
++           PyErr_SetVim(_("cannot replace line"));
++           vim_free(save);
++       }
++       else
++           changed_bytes((linenr_T)n, 0);
++
++       curbuf = savebuf;
++
++       /* Check that the cursor is not beyond the end of the line now. */
++       if (buf == curwin->w_buffer)
++           check_cursor_col();
++
++       if (PyErr_Occurred() || VimErrorCheck())
++           return FAIL;
++
++       if (len_change)
++           *len_change = 0;
++
++       return OK;
++    }
++    else
++    {
++       PyErr_BadArgument();
++       return FAIL;
++    }
  }
  
+-/* Replace a line in the specified buffer. The line number is
+- * in Vim format (1-based). The replacement line is given as
+- * a Python string object. The object is checked for validity
+- * and correct format. Errors are returned as a value of FAIL.
+- * The return value is OK on success.
 +/* Replace a range of lines in the specified buffer. The line numbers are in
 + * Vim format (1-based). The range is from lo up to, but not including, hi.
@@ -44089 +46816 @@
 + * list is checked for validity and correct format. Errors are returned as a
 + * value of FAIL.  The return value is OK on success.
-+ * If OK is returned and len_change is not NULL, *len_change
-+ * is set to the change in the buffer length.
-+ */
-+    static int
+  * If OK is returned and len_change is not NULL, *len_change
+  * is set to the change in the buffer length.
+  */
+     static int
+-SetBufferLine(buf_T *buf, PyInt n, PyObject *line, PyInt *len_change)
 +SetBufferLineList(buf_T *buf, PyInt lo, PyInt hi, PyObject *list, PyInt *len_change)
-+{
-+    /* First of all, we check the thpe of the supplied Python object.
-+     * There are three cases:
-+     *   1. NULL, or None - this is a deletion.
+ {
+     /* First of all, we check the thpe of the supplied Python object.
+      * There are three cases:
+      *   1. NULL, or None - this is a deletion.
+-     *   2. A string      - this is a replacement.
 +     *   2. A list        - this is a replacement.
-+     *   3. Anything else - this is an error.
-+     */
+      *   3. Anything else - this is an error.
+      */
+-    if (line == Py_None || line == NULL)
 +    if (list == Py_None || list == NULL)
-+    {
+     {
+-       buf_T *savebuf = curbuf;
 +       PyInt   i;
 +       PyInt   n = (int)(hi - lo);
 +       buf_T   *savebuf = curbuf;
-+
-+       PyErr_Clear();
-+       curbuf = buf;
-+
+ 
+        PyErr_Clear();
+        curbuf = buf;
+ 
+-       if (u_savedel((linenr_T)n, 1L) == FAIL)
 +       if (u_savedel((linenr_T)lo, (long)n) == FAIL)
-+           PyErr_SetVim(_("cannot save undo information"));
-+       else
-+       {
+            PyErr_SetVim(_("cannot save undo information"));
+-       else if (ml_delete((linenr_T)n, FALSE) == FAIL)
+-           PyErr_SetVim(_("cannot delete line"));
+        else
+        {
 +           for (i = 0; i < n; ++i)
 +           {
@@ -44122 +46856 @@
 +               }
 +           }
-+           if (buf == curwin->w_buffer)
+            if (buf == curwin->w_buffer)
+-               py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
+-           deleted_lines_mark((linenr_T)n, 1L);
 +               py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
 +           deleted_lines_mark((linenr_T)lo, (long)i);
-+       }
-+
-+       curbuf = savebuf;
-+
-+       if (PyErr_Occurred() || VimErrorCheck())
-+           return FAIL;
-+
-+       if (len_change)
+        }
+ 
+        curbuf = savebuf;
+@@ -875,46 +1786,135 @@
+            return FAIL;
+ 
+        if (len_change)
+-           *len_change = -1;
 +           *len_change = -n;
-+
-+       return OK;
-+    }
+ 
+        return OK;
+     }
+-    else if (PyString_Check(line))
 +    else if (PyList_Check(list))
-+    {
+     {
+-       char *save = StringToLine(line);
+-       buf_T *savebuf = curbuf;
 +       PyInt   i;
 +       PyInt   new_len = PyList_Size(list);
@@ -44145 +46884 @@
 +       char    **array;
 +       buf_T   *savebuf;
-+
+ 
+-       if (save == NULL)
+-           return FAIL;
 +       if (new_len == 0)       /* avoid allocating zero bytes */
 +           array = NULL;
@@ -44173 +46914 @@
 +
 +       savebuf = curbuf;
-+
-+       PyErr_Clear();
-+       curbuf = buf;
-+
+ 
+-       /* We do not need to free "save" if ml_replace() consumes it. */
+        PyErr_Clear();
+        curbuf = buf;
+ 
+-       if (u_savesub((linenr_T)n) == FAIL)
+-       {
 +       if (u_save((linenr_T)(lo-1), (linenr_T)hi) == FAIL)
-+           PyErr_SetVim(_("cannot save undo information"));
+            PyErr_SetVim(_("cannot save undo information"));
+-           vim_free(save);
 +
 +       /* If the size of the range is reducing (ie, new_len < old_len) we
@@ -44193 +46938 @@
 +               }
 +           extra -= i;
-+       }
+        }
+-       else if (ml_replace((linenr_T)n, (char_u *)save, FALSE) == FAIL)
 +
 +       /* For as long as possible, replace the existing old_len with the
@@ -44200 +46946 @@
 +        */
 +       if (!PyErr_Occurred())
-+       {
+        {
+-           PyErr_SetVim(_("cannot replace line"));
+-           vim_free(save);
 +           for (i = 0; i < old_len && i < new_len; ++i)
 +               if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], FALSE)
@@ -44208 +46956 @@
 +                   break;
 +               }
-+       }
-+       else
+        }
+        else
+-           changed_bytes((linenr_T)n, 0);
 +           i = 0;
-+
+ 
+-       curbuf = savebuf;
 +       /* Now we may need to insert the remaining new old_len. If we do, we
 +        * must free the strings as we finish with them (we can't pass the
@@ -44251 +47001 @@
 +                                                 (long)MAXLNUM, (long)extra);
 +       changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra);
-+
-+       if (buf == curwin->w_buffer)
+ 
+-       /* Check that the cursor is not beyond the end of the line now. */
+        if (buf == curwin->w_buffer)
+-           check_cursor_col();
 +           py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)extra);
 +
 +       curbuf = savebuf;
-+
-+       if (PyErr_Occurred() || VimErrorCheck())
-+           return FAIL;
-+
-+       if (len_change)
+ 
+        if (PyErr_Occurred() || VimErrorCheck())
+            return FAIL;
+ 
+        if (len_change)
+-           *len_change = 0;
 +           *len_change = new_len - old_len;
-+
-+       return OK;
-+    }
-+    else
-+    {
-+       PyErr_BadArgument();
-+       return FAIL;
-+    }
-+}
- 
+ 
+        return OK;
+     }
+@@ -925,7 +1925,6 @@
+     }
+ }
+ 
+-
  /* Insert a number of lines into the specified buffer after the specifed line.
   * The line number is in Vim format (1-based). The lines to be inserted are
-@@ -1130,6 +1313,40 @@
+  * given as a Python list of string objects or as a single string. The lines
+@@ -1130,6 +2129,40 @@
      return 0;
  }
@@ -44315 +47067 @@
      static PyObject *
  RBAppend(BufferObject *self, PyObject *args, PyInt start, PyInt end, PyInt *new_end)
-@@ -1267,6 +1484,9 @@
+@@ -1267,6 +2300,9 @@
      {"append",     BufferAppend,       1,          "Append data to Vim buffer" },
      {"mark",       BufferMark,         1,          "Return (row,col) representing position of named mark" },
@@ -44325 +47077 @@
  };
  
+@@ -1347,3 +2383,270 @@
+     { NULL,        NULL,               0,          NULL }
+ };
+ 
++    static void
++set_ref_in_py(const int copyID)
++{
++    pylinkedlist_T     *cur;
++    dict_T     *dd;
++    list_T     *ll;
++
++    if (lastdict != NULL)
++       for(cur = lastdict ; cur != NULL ; cur = cur->pll_prev)
++       {
++           dd = ((DictionaryObject *) (cur->pll_obj))->dict;
++           if (dd->dv_copyID != copyID)
++           {
++               dd->dv_copyID = copyID;
++               set_ref_in_ht(&dd->dv_hashtab, copyID);
++           }
++       }
++
++    if (lastlist != NULL)
++       for(cur = lastlist ; cur != NULL ; cur = cur->pll_prev)
++       {
++           ll = ((ListObject *) (cur->pll_obj))->list;
++           if (ll->lv_copyID != copyID)
++           {
++               ll->lv_copyID = copyID;
++               set_ref_in_list(ll, copyID);
++           }
++       }
++}
++
++    static int
++set_string_copy(char_u *str, typval_T *tv)
++{
++    tv->vval.v_string = vim_strsave(str);
++    if (tv->vval.v_string == NULL)
++    {
++       PyErr_NoMemory();
++       return -1;
++    }
++    return 0;
++}
++
++#ifdef FEAT_EVAL
++typedef int (*pytotvfunc)(PyObject *, typval_T *, PyObject *);
++
++    static int
++convert_dl(PyObject *obj, typval_T *tv,
++                                   pytotvfunc py_to_tv, PyObject *lookupDict)
++{
++    PyObject   *capsule;
++    char       hexBuf[sizeof(void *) * 2 + 3];
++
++    sprintf(hexBuf, "%p", obj);
++
++# ifdef PY_USE_CAPSULE
++    capsule = PyDict_GetItemString(lookupDict, hexBuf);
++# else
++    capsule = (PyObject *)PyDict_GetItemString(lookupDict, hexBuf);
++# endif
++    if (capsule == NULL)
++    {
++# ifdef PY_USE_CAPSULE
++       capsule = PyCapsule_New(tv, NULL, NULL);
++# else
++       capsule = PyCObject_FromVoidPtr(tv, NULL);
++# endif
++       PyDict_SetItemString(lookupDict, hexBuf, capsule);
++       Py_DECREF(capsule);
++       if (py_to_tv(obj, tv, lookupDict) == -1)
++       {
++           tv->v_type = VAR_UNKNOWN;
++           return -1;
++       }
++       /* As we are not using copy_tv which increments reference count we must
++        * do it ourself. */
++       switch(tv->v_type)
++       {
++           case VAR_DICT: ++tv->vval.v_dict->dv_refcount; break;
++           case VAR_LIST: ++tv->vval.v_list->lv_refcount; break;
++       }
++    }
++    else
++    {
++       typval_T        *v;
++
++# ifdef PY_USE_CAPSULE
++       v = PyCapsule_GetPointer(capsule, NULL);
++# else
++       v = PyCObject_AsVoidPtr(capsule);
++# endif
++       copy_tv(v, tv);
++    }
++    return 0;
++}
++
++    static int
++ConvertFromPyObject(PyObject *obj, typval_T *tv)
++{
++    PyObject   *lookup_dict;
++    int                r;
++
++    lookup_dict = PyDict_New();
++    r = _ConvertFromPyObject(obj, tv, lookup_dict);
++    Py_DECREF(lookup_dict);
++    return r;
++}
++
++    static int
++_ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict)
++{
++    if (obj->ob_type == &DictionaryType)
++    {
++       tv->v_type = VAR_DICT;
++       tv->vval.v_dict = (((DictionaryObject *)(obj))->dict);
++       ++tv->vval.v_dict->dv_refcount;
++    }
++    else if (obj->ob_type == &ListType)
++    {
++       tv->v_type = VAR_LIST;
++       tv->vval.v_list = (((ListObject *)(obj))->list);
++       ++tv->vval.v_list->lv_refcount;
++    }
++    else if (obj->ob_type == &FunctionType)
++    {
++       if (set_string_copy(((FunctionObject *) (obj))->name, tv) == -1)
++           return -1;
++
++       tv->v_type = VAR_FUNC;
++       func_ref(tv->vval.v_string);
++    }
++#if PY_MAJOR_VERSION >= 3
++    else if (PyBytes_Check(obj))
++    {
++       char_u  *result = (char_u *) PyBytes_AsString(obj);
++
++       if (result == NULL)
++           return -1;
++
++       if (set_string_copy(result, tv) == -1)
++           return -1;
++
++       tv->v_type = VAR_STRING;
++    }
++    else if (PyUnicode_Check(obj))
++    {
++       PyObject        *bytes;
++       char_u  *result;
++
++       bytes = PyString_AsBytes(obj);
++       if (bytes == NULL)
++           return -1;
++
++       result = (char_u *) PyBytes_AsString(bytes);
++       if (result == NULL)
++           return -1;
++
++       if (set_string_copy(result, tv) == -1)
++       {
++           Py_XDECREF(bytes);
++           return -1;
++       }
++       Py_XDECREF(bytes);
++
++       tv->v_type = VAR_STRING;
++    }
++#else
++    else if (PyUnicode_Check(obj))
++    {
++       PyObject        *bytes;
++       char_u  *result;
++
++       bytes = PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, NULL);
++       if (bytes == NULL)
++           return -1;
++
++       result=(char_u *) PyString_AsString(bytes);
++       if (result == NULL)
++           return -1;
++
++       if (set_string_copy(result, tv) == -1)
++       {
++           Py_XDECREF(bytes);
++           return -1;
++       }
++       Py_XDECREF(bytes);
++
++       tv->v_type = VAR_STRING;
++    }
++    else if (PyString_Check(obj))
++    {
++       char_u  *result = (char_u *) PyString_AsString(obj);
++
++       if (result == NULL)
++           return -1;
++
++       if (set_string_copy(result, tv) == -1)
++           return -1;
++
++       tv->v_type = VAR_STRING;
++    }
++    else if (PyInt_Check(obj))
++    {
++       tv->v_type = VAR_NUMBER;
++       tv->vval.v_number = (varnumber_T) PyInt_AsLong(obj);
++    }
++#endif
++    else if (PyLong_Check(obj))
++    {
++       tv->v_type = VAR_NUMBER;
++       tv->vval.v_number = (varnumber_T) PyLong_AsLong(obj);
++    }
++    else if (PyDict_Check(obj))
++       return convert_dl(obj, tv, pydict_to_tv, lookupDict);
++#ifdef FEAT_FLOAT
++    else if (PyFloat_Check(obj))
++    {
++       tv->v_type = VAR_FLOAT;
++       tv->vval.v_float = (float_T) PyFloat_AsDouble(obj);
++    }
++#endif
++    else if (PyIter_Check(obj))
++       return convert_dl(obj, tv, pyiter_to_tv, lookupDict);
++    else if (PySequence_Check(obj))
++       return convert_dl(obj, tv, pyseq_to_tv, lookupDict);
++    else if (PyMapping_Check(obj))
++       return convert_dl(obj, tv, pymap_to_tv, lookupDict);
++    else
++    {
++       PyErr_SetString(PyExc_TypeError, _("unable to convert to vim structure"));
++       return -1;
++    }
++    return 0;
++}
++
++    static PyObject *
++ConvertToPyObject(typval_T *tv)
++{
++    if (tv == NULL)
++    {
++       PyErr_SetVim(_("NULL reference passed"));
++       return NULL;
++    }
++    switch (tv->v_type)
++    {
++       case VAR_STRING:
++           return PyBytes_FromString((char *) tv->vval.v_string);
++       case VAR_NUMBER:
++           return PyLong_FromLong((long) tv->vval.v_number);
++#ifdef FEAT_FLOAT
++       case VAR_FLOAT:
++           return PyFloat_FromDouble((double) tv->vval.v_float);
++#endif
++       case VAR_LIST:
++           return ListNew(tv->vval.v_list);
++       case VAR_DICT:
++           return DictionaryNew(tv->vval.v_dict);
++       case VAR_FUNC:
++           return FunctionNew(tv->vval.v_string);
++       case VAR_UNKNOWN:
++           Py_INCREF(Py_None);
++           return Py_None;
++       default:
++           PyErr_SetVim(_("internal error: invalid value type"));
++           return NULL;
++    }
++}
++#endif
 diff -Naur vim73.orig/src/if_python.c vim73/src/if_python.c
---- vim73.orig/src/if_python.c  2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/if_python.c       2012-06-03 23:09:54.636052191 +0000
-@@ -56,6 +56,10 @@
+--- vim73.orig/src/if_python.c  2010-08-13 13:59:41.000000000 +0000
++++ vim73/src/if_python.c       2012-07-20 20:31:17.824311481 +0000
+@@ -1,4 +1,4 @@
+-/* vi:set ts=8 sts=4 sw=4:
++/* vi:set ts=8 sts=4 sw=4 noet:
+  *
+  * VIM - Vi IMproved   by Bram Moolenaar
+  *
+@@ -56,6 +56,12 @@
  
  static void init_structs(void);
  
++#define PyBytes_FromString PyString_FromString
++
 +/* No-op conversion functions, use with care! */
 +#define PyString_AsBytes(obj) (obj)
@@ -44339 +47370 @@
  /* Use this to be able to generate prototypes without python being used. */
  # define PyObject Py_ssize_t
-@@ -102,7 +106,7 @@
+@@ -65,6 +71,10 @@
+ # define PySequenceMethods Py_ssize_t
+ #endif
+ 
++#if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000
++# define PY_USE_CAPSULE
++#endif
++
+ #if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000
+ # define PyInt Py_ssize_t
+ # define PyInquiry lenfunc
+@@ -102,7 +112,7 @@
  #  include <dlfcn.h>
  #  define FARPROC void*
@@ -44348 +47390 @@
  #  else
  #   define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
-@@ -110,7 +114,7 @@
+@@ -110,7 +120,7 @@
  #  define close_dll dlclose
  #  define symbol_from_dll dlsym
@@ -44357 +47399 @@
  #  define symbol_from_dll GetProcAddress
  # endif
-@@ -129,6 +133,7 @@
+@@ -118,17 +128,21 @@
+ /* This makes if_python.c compile without warnings against Python 2.5
+  * on Win32 and Win64. */
+ # undef PyRun_SimpleString
++# undef PyRun_String
+ # undef PyArg_Parse
+ # undef PyArg_ParseTuple
+ # undef Py_BuildValue
+ # undef Py_InitModule4
+ # undef Py_InitModule4_64
++# undef PyObject_CallMethod
+ 
+ /*
+  * Wrapper defines
   */
  # define PyArg_Parse dll_PyArg_Parse
  # define PyArg_ParseTuple dll_PyArg_ParseTuple
 +# define PyMem_Free dll_PyMem_Free
++# define PyMem_Malloc dll_PyMem_Malloc
  # define PyDict_SetItemString dll_PyDict_SetItemString
  # define PyErr_BadArgument dll_PyErr_BadArgument
  # define PyErr_Clear dll_PyErr_Clear
-@@ -165,9 +170,11 @@
+@@ -145,35 +159,67 @@
+ # endif
+ # define PyInt_AsLong dll_PyInt_AsLong
+ # define PyInt_FromLong dll_PyInt_FromLong
++# define PyLong_AsLong dll_PyLong_AsLong
++# define PyLong_FromLong dll_PyLong_FromLong
+ # define PyInt_Type (*dll_PyInt_Type)
++# define PyLong_Type (*dll_PyLong_Type)
+ # define PyList_GetItem dll_PyList_GetItem
+ # define PyList_Append dll_PyList_Append
+ # define PyList_New dll_PyList_New
+ # define PyList_SetItem dll_PyList_SetItem
+ # define PyList_Size dll_PyList_Size
+ # define PyList_Type (*dll_PyList_Type)
++# define PySequence_Check dll_PySequence_Check
++# define PySequence_Size dll_PySequence_Size
++# define PySequence_GetItem dll_PySequence_GetItem
++# define PyTuple_Size dll_PyTuple_Size
++# define PyTuple_GetItem dll_PyTuple_GetItem
++# define PyTuple_Type (*dll_PyTuple_Type)
+ # define PyImport_ImportModule dll_PyImport_ImportModule
+ # define PyDict_New dll_PyDict_New
+ # define PyDict_GetItemString dll_PyDict_GetItemString
++# define PyDict_Next dll_PyDict_Next
++# ifdef PyMapping_Items
++#  define PY_NO_MAPPING_ITEMS
++# else
++#  define PyMapping_Items dll_PyMapping_Items
++# endif
++# define PyObject_CallMethod dll_PyObject_CallMethod
++# define PyMapping_Check dll_PyMapping_Check
++# define PyIter_Next dll_PyIter_Next
+ # define PyModule_GetDict dll_PyModule_GetDict
+ # define PyRun_SimpleString dll_PyRun_SimpleString
++# define PyRun_String dll_PyRun_String
+ # define PyString_AsString dll_PyString_AsString
+ # define PyString_FromString dll_PyString_FromString
+ # define PyString_FromStringAndSize dll_PyString_FromStringAndSize
+ # define PyString_Size dll_PyString_Size
+ # define PyString_Type (*dll_PyString_Type)
++# define PyUnicode_Type (*dll_PyUnicode_Type)
++# undef PyUnicode_AsEncodedString
++# define PyUnicode_AsEncodedString py_PyUnicode_AsEncodedString
++# define PyFloat_AsDouble dll_PyFloat_AsDouble
++# define PyFloat_FromDouble dll_PyFloat_FromDouble
++# define PyFloat_Type (*dll_PyFloat_Type)
++# define PyImport_AddModule (*dll_PyImport_AddModule)
  # define PySys_SetObject dll_PySys_SetObject
  # define PySys_SetArgv dll_PySys_SetArgv
@@ -44377 +47479 @@
  # define Py_Finalize dll_Py_Finalize
  # define Py_IsInitialized dll_Py_IsInitialized
-@@ -187,6 +194,7 @@
+ # define _PyObject_New dll__PyObject_New
++# if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000
++#  define _PyObject_NextNotImplemented (*dll__PyObject_NextNotImplemented)
++# endif
+ # define _Py_NoneStruct (*dll__Py_NoneStruct)
+ # define PyObject_Init dll__PyObject_Init
++# define PyObject_GetIter dll_PyObject_GetIter
+ # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000
+ #  define PyType_IsSubtype dll_PyType_IsSubtype
+ # endif
+@@ -181,12 +227,21 @@
+ #  define PyObject_Malloc dll_PyObject_Malloc
+ #  define PyObject_Free dll_PyObject_Free
+ # endif
++# ifdef PY_USE_CAPSULE
++#  define PyCapsule_New dll_PyCapsule_New
++#  define PyCapsule_GetPointer dll_PyCapsule_GetPointer
++# else
++#  define PyCObject_FromVoidPtr dll_PyCObject_FromVoidPtr
++#  define PyCObject_AsVoidPtr dll_PyCObject_AsVoidPtr
++# endif
+ 
+ /*
+  * Pointers for dynamic link
   */
  static int(*dll_PyArg_Parse)(PyObject *, char *, ...);
  static int(*dll_PyArg_ParseTuple)(PyObject *, char *, ...);
 +static int(*dll_PyMem_Free)(void *);
++static void* (*dll_PyMem_Malloc)(size_t);
  static int(*dll_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item);
  static int(*dll_PyErr_BadArgument)(void);
  static void(*dll_PyErr_Clear)(void);
-@@ -223,9 +231,11 @@
+@@ -200,37 +255,66 @@
+ # ifdef PY_CAN_RECURSE
+ static PyGILState_STATE        (*dll_PyGILState_Ensure)(void);
+ static void (*dll_PyGILState_Release)(PyGILState_STATE);
+-#endif
++# endif
+ static long(*dll_PyInt_AsLong)(PyObject *);
+ static PyObject*(*dll_PyInt_FromLong)(long);
++static long(*dll_PyLong_AsLong)(PyObject *);
++static PyObject*(*dll_PyLong_FromLong)(long);
+ static PyTypeObject* dll_PyInt_Type;
++static PyTypeObject* dll_PyLong_Type;
+ static PyObject*(*dll_PyList_GetItem)(PyObject *, PyInt);
+ static PyObject*(*dll_PyList_Append)(PyObject *, PyObject *);
+ static PyObject*(*dll_PyList_New)(PyInt size);
+ static int(*dll_PyList_SetItem)(PyObject *, PyInt, PyObject *);
+ static PyInt(*dll_PyList_Size)(PyObject *);
+ static PyTypeObject* dll_PyList_Type;
++static int (*dll_PySequence_Check)(PyObject *);
++static PyInt(*dll_PySequence_Size)(PyObject *);
++static PyObject*(*dll_PySequence_GetItem)(PyObject *, PyInt);
++static PyInt(*dll_PyTuple_Size)(PyObject *);
++static PyObject*(*dll_PyTuple_GetItem)(PyObject *, PyInt);
++static PyTypeObject* dll_PyTuple_Type;
+ static PyObject*(*dll_PyImport_ImportModule)(const char *);
+ static PyObject*(*dll_PyDict_New)(void);
+ static PyObject*(*dll_PyDict_GetItemString)(PyObject *, const char *);
++static int (*dll_PyDict_Next)(PyObject *, Py_ssize_t *, PyObject **, PyObject **);
++# ifndef PY_NO_MAPPING_ITEMS
++static PyObject* (*dll_PyMapping_Items)(PyObject *);
++# endif
++static PyObject* (*dll_PyObject_CallMethod)(PyObject *, char *, PyObject *);
++static int (*dll_PyMapping_Check)(PyObject *);
++static PyObject* (*dll_PyIter_Next)(PyObject *);
+ static PyObject*(*dll_PyModule_GetDict)(PyObject *);
+ static int(*dll_PyRun_SimpleString)(char *);
++static PyObject *(*dll_PyRun_String)(char *, int, PyObject *, PyObject *);
+ static char*(*dll_PyString_AsString)(PyObject *);
+ static PyObject*(*dll_PyString_FromString)(const char *);
+ static PyObject*(*dll_PyString_FromStringAndSize)(const char *, PyInt);
+ static PyInt(*dll_PyString_Size)(PyObject *);
+ static PyTypeObject* dll_PyString_Type;
++static PyTypeObject* dll_PyUnicode_Type;
++static PyObject *(*py_PyUnicode_AsEncodedString)(PyObject *, char *, char *);
++static double(*dll_PyFloat_AsDouble)(PyObject *);
++static PyObject*(*dll_PyFloat_FromDouble)(double);
++static PyTypeObject* dll_PyFloat_Type;
  static int(*dll_PySys_SetObject)(char *, PyObject *);
  static int(*dll_PySys_SetArgv)(int, char **);
@@ -44393 +47565 @@
  static PyObject*(*dll_Py_FindMethod)(struct PyMethodDef[], PyObject *, char *);
  static PyObject*(*dll_Py_InitModule4)(char *, struct PyMethodDef *, char *, PyObject *, int);
++static PyObject*(*dll_PyImport_AddModule)(char *);
 +static void(*dll_Py_SetPythonHome)(char *home);
  static void(*dll_Py_Initialize)(void);
  static void(*dll_Py_Finalize)(void);
  static int(*dll_Py_IsInitialized)(void);
-@@ -267,6 +277,7 @@
+ static PyObject*(*dll__PyObject_New)(PyTypeObject *, PyObject *);
+ static PyObject*(*dll__PyObject_Init)(PyObject *, PyTypeObject *);
++static PyObject* (*dll_PyObject_GetIter)(PyObject *);
++# if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000
++static iternextfunc dll__PyObject_NextNotImplemented;
++# endif
+ static PyObject* dll__Py_NoneStruct;
+ # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000
+ static int (*dll_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *);
+@@ -239,6 +323,13 @@
+ static void* (*dll_PyObject_Malloc)(size_t);
+ static void (*dll_PyObject_Free)(void*);
+ # endif
++# ifdef PY_USE_CAPSULE
++static PyObject* (*dll_PyCapsule_New)(void *, char *, PyCapsule_Destructor);
++static void* (*dll_PyCapsule_GetPointer)(PyObject *, char *);
++# else
++static PyObject* (*dll_PyCObject_FromVoidPtr)(void *cobj, void (*destr)(void *));
++static void* (*dll_PyCObject_AsVoidPtr)(PyObject *);
++# endif
+ 
+ static HINSTANCE hinstPython = 0; /* Instance of python.dll */
+ 
+@@ -267,6 +358,8 @@
  {
      {"PyArg_Parse", (PYTHON_PROC*)&dll_PyArg_Parse},
      {"PyArg_ParseTuple", (PYTHON_PROC*)&dll_PyArg_ParseTuple},
 +    {"PyMem_Free", (PYTHON_PROC*)&dll_PyMem_Free},
++    {"PyMem_Malloc", (PYTHON_PROC*)&dll_PyMem_Malloc},
      {"PyDict_SetItemString", (PYTHON_PROC*)&dll_PyDict_SetItemString},
      {"PyErr_BadArgument", (PYTHON_PROC*)&dll_PyErr_BadArgument},
      {"PyErr_Clear", (PYTHON_PROC*)&dll_PyErr_Clear},
-@@ -303,6 +314,7 @@
+@@ -283,38 +376,67 @@
+ # endif
+     {"PyInt_AsLong", (PYTHON_PROC*)&dll_PyInt_AsLong},
+     {"PyInt_FromLong", (PYTHON_PROC*)&dll_PyInt_FromLong},
++    {"PyLong_AsLong", (PYTHON_PROC*)&dll_PyLong_AsLong},
++    {"PyLong_FromLong", (PYTHON_PROC*)&dll_PyLong_FromLong},
+     {"PyInt_Type", (PYTHON_PROC*)&dll_PyInt_Type},
++    {"PyLong_Type", (PYTHON_PROC*)&dll_PyLong_Type},
+     {"PyList_GetItem", (PYTHON_PROC*)&dll_PyList_GetItem},
+     {"PyList_Append", (PYTHON_PROC*)&dll_PyList_Append},
+     {"PyList_New", (PYTHON_PROC*)&dll_PyList_New},
+     {"PyList_SetItem", (PYTHON_PROC*)&dll_PyList_SetItem},
+     {"PyList_Size", (PYTHON_PROC*)&dll_PyList_Size},
+     {"PyList_Type", (PYTHON_PROC*)&dll_PyList_Type},
++    {"PySequence_GetItem", (PYTHON_PROC*)&dll_PySequence_GetItem},
++    {"PySequence_Size", (PYTHON_PROC*)&dll_PySequence_Size},
++    {"PySequence_Check", (PYTHON_PROC*)&dll_PySequence_Check},
++    {"PyTuple_GetItem", (PYTHON_PROC*)&dll_PyTuple_GetItem},
++    {"PyTuple_Size", (PYTHON_PROC*)&dll_PyTuple_Size},
++    {"PyTuple_Type", (PYTHON_PROC*)&dll_PyTuple_Type},
+     {"PyImport_ImportModule", (PYTHON_PROC*)&dll_PyImport_ImportModule},
+     {"PyDict_GetItemString", (PYTHON_PROC*)&dll_PyDict_GetItemString},
++    {"PyDict_Next", (PYTHON_PROC*)&dll_PyDict_Next},
+     {"PyDict_New", (PYTHON_PROC*)&dll_PyDict_New},
++# ifndef PY_NO_MAPPING_ITEMS
++    {"PyMapping_Items", (PYTHON_PROC*)&dll_PyMapping_Items},
++# endif
++    {"PyObject_CallMethod", (PYTHON_PROC*)&dll_PyObject_CallMethod},
++    {"PyMapping_Check", (PYTHON_PROC*)&dll_PyMapping_Check},
++    {"PyIter_Next", (PYTHON_PROC*)&dll_PyIter_Next},
+     {"PyModule_GetDict", (PYTHON_PROC*)&dll_PyModule_GetDict},
+     {"PyRun_SimpleString", (PYTHON_PROC*)&dll_PyRun_SimpleString},
++    {"PyRun_String", (PYTHON_PROC*)&dll_PyRun_String},
+     {"PyString_AsString", (PYTHON_PROC*)&dll_PyString_AsString},
+     {"PyString_FromString", (PYTHON_PROC*)&dll_PyString_FromString},
+     {"PyString_FromStringAndSize", (PYTHON_PROC*)&dll_PyString_FromStringAndSize},
+     {"PyString_Size", (PYTHON_PROC*)&dll_PyString_Size},
+     {"PyString_Type", (PYTHON_PROC*)&dll_PyString_Type},
++    {"PyUnicode_Type", (PYTHON_PROC*)&dll_PyUnicode_Type},
++    {"PyFloat_Type", (PYTHON_PROC*)&dll_PyFloat_Type},
++    {"PyFloat_AsDouble", (PYTHON_PROC*)&dll_PyFloat_AsDouble},
++    {"PyFloat_FromDouble", (PYTHON_PROC*)&dll_PyFloat_FromDouble},
++    {"PyImport_AddModule", (PYTHON_PROC*)&dll_PyImport_AddModule},
      {"PySys_SetObject", (PYTHON_PROC*)&dll_PySys_SetObject},
      {"PySys_SetArgv", (PYTHON_PROC*)&dll_PySys_SetArgv},
@@ -44412 +47651 @@
      {"Py_BuildValue", (PYTHON_PROC*)&dll_Py_BuildValue},
      {"Py_FindMethod", (PYTHON_PROC*)&dll_Py_FindMethod},
- # if (PY_VERSION_HEX >= 0x02050000) && SIZEOF_SIZE_T != SIZEOF_INT
-@@ -310,6 +322,7 @@
+-# if (PY_VERSION_HEX >= 0x02050000) && SIZEOF_SIZE_T != SIZEOF_INT
++# if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000 \
++       && SIZEOF_SIZE_T != SIZEOF_INT
+     {"Py_InitModule4_64", (PYTHON_PROC*)&dll_Py_InitModule4},
  # else
      {"Py_InitModule4", (PYTHON_PROC*)&dll_Py_InitModule4},
@@ -44421 +47662 @@
      {"Py_Finalize", (PYTHON_PROC*)&dll_Py_Finalize},
      {"Py_IsInitialized", (PYTHON_PROC*)&dll_Py_IsInitialized},
-@@ -349,13 +362,14 @@
+     {"_PyObject_New", (PYTHON_PROC*)&dll__PyObject_New},
+     {"PyObject_Init", (PYTHON_PROC*)&dll__PyObject_Init},
++    {"PyObject_GetIter", (PYTHON_PROC*)&dll_PyObject_GetIter},
++# if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02070000
++    {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&dll__PyObject_NextNotImplemented},
++# endif
+     {"_Py_NoneStruct", (PYTHON_PROC*)&dll__Py_NoneStruct},
+ # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000
+     {"PyType_IsSubtype", (PYTHON_PROC*)&dll_PyType_IsSubtype},
+@@ -323,6 +445,13 @@
+     {"PyObject_Malloc", (PYTHON_PROC*)&dll_PyObject_Malloc},
+     {"PyObject_Free", (PYTHON_PROC*)&dll_PyObject_Free},
+ # endif
++# ifdef PY_USE_CAPSULE
++    {"PyCapsule_New", (PYTHON_PROC*)&dll_PyCapsule_New},
++    {"PyCapsule_GetPointer", (PYTHON_PROC*)&dll_PyCapsule_GetPointer},
++# else
++    {"PyCObject_FromVoidPtr", (PYTHON_PROC*)&dll_PyCObject_FromVoidPtr},
++    {"PyCObject_AsVoidPtr", (PYTHON_PROC*)&dll_PyCObject_AsVoidPtr},
++# endif
+     {"", NULL},
+ };
+ 
+@@ -348,14 +477,16 @@
+ python_runtime_link_init(char *libname, int verbose)
  {
      int i;
++    void *ucs_as_encoded_string;
  
 -#if !defined(PY_NO_RTLD_GLOBAL) && defined(UNIX) && defined(FEAT_PYTHON3)
@@ -44438 +47704 @@
      }
  #endif
-@@ -543,6 +557,10 @@
+@@ -382,6 +513,25 @@
+            return FAIL;
+        }
+     }
++
++    /* Load unicode functions separately as only the ucs2 or the ucs4 functions
++     * will be present in the library. */
++    ucs_as_encoded_string = symbol_from_dll(hinstPython,
++                                            "PyUnicodeUCS2_AsEncodedString");
++    if (ucs_as_encoded_string == NULL)
++       ucs_as_encoded_string = symbol_from_dll(hinstPython,
++                                            "PyUnicodeUCS4_AsEncodedString");
++    if (ucs_as_encoded_string != NULL)
++       py_PyUnicode_AsEncodedString = ucs_as_encoded_string;
++    else
++    {
++       close_dll(hinstPython);
++       hinstPython = 0;
++       if (verbose)
++           EMSG2(_(e_loadfunc), "PyUnicode_UCSX_*");
++       return FAIL;
++    }
++
+     return OK;
+ }
+ 
+@@ -420,10 +570,25 @@
+ 
+ static PyObject *BufferNew (buf_T *);
+ static PyObject *WindowNew(win_T *);
++static PyObject *DictionaryNew(dict_T *);
+ static PyObject *LineToString(const char *);
+ 
+ static PyTypeObject RangeType;
+ 
++static int initialised = 0;
++#define PYINITIALISED initialised
++
++/* Add conversion from PyInt? */
++#define DICTKEY_GET(err) \
++    if (!PyString_Check(keyObject)) \
++    { \
++       PyErr_SetString(PyExc_TypeError, _("only string keys are allowed")); \
++       return err; \
++    } \
++    key = (char_u *) PyString_AsString(keyObject);
++#define DICTKEY_UNREF
++#define DICTKEY_DECL
++
+ /*
+  * Include the code shared with if_python3.c
+  */
+@@ -437,6 +602,8 @@
+ static PyInt RangeStart;
+ static PyInt RangeEnd;
+ 
++static PyObject *globals;
++
+ static void PythonIO_Flush(void);
+ static int PythonIO_Init(void);
+ static int PythonMod_Init(void);
+@@ -452,8 +619,6 @@
+  * 1. Python interpreter main program.
+  */
+ 
+-static int initialised = 0;
+-
+ #if PYTHON_API_VERSION < 1007 /* Python 1.4 */
+ typedef PyObject PyThreadState;
+ #endif
+@@ -543,6 +708,10 @@
         }
  #endif
@@ -44449 +47785 @@
  
  #if !defined(MACOS) || defined(MACOS_X_UNIX)
-@@ -773,7 +791,7 @@
+@@ -563,6 +732,8 @@
+        if (PythonMod_Init())
+            goto fail;
+ 
++       globals = PyModule_GetDict(PyImport_AddModule("__main__"));
++
+        /* Remove the element from sys.path that was added because of our
+         * argv[0] value in PythonMod_Init().  Previously we used an empty
+         * string, but dependinding on the OS we then get an empty entry or
+@@ -591,7 +762,7 @@
+  * External interface
+  */
+     static void
+-DoPythonCommand(exarg_T *eap, const char *cmd)
++DoPythonCommand(exarg_T *eap, const char *cmd, typval_T *rettv)
+ {
+ #ifndef PY_CAN_RECURSE
+     static int         recursive = 0;
+@@ -621,8 +792,16 @@
+     if (Python_Init())
+        goto theend;
+ 
+-    RangeStart = eap->line1;
+-    RangeEnd = eap->line2;
++    if (rettv == NULL)
++    {
++       RangeStart = eap->line1;
++       RangeEnd = eap->line2;
++    }
++    else
++    {
++       RangeStart = (PyInt) curwin->w_cursor.lnum;
++       RangeEnd = RangeStart;
++    }
+     Python_Release_Vim();          /* leave vim */
+ 
+ #if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
+@@ -640,7 +819,23 @@
+ 
+     Python_RestoreThread();        /* enter python */
+ 
+-    PyRun_SimpleString((char *)(cmd));
++    if (rettv == NULL)
++       PyRun_SimpleString((char *)(cmd));
++    else
++    {
++       PyObject        *r;
++
++       r = PyRun_String((char *)(cmd), Py_eval_input, globals, globals);
++       if (r == NULL)
++           EMSG(_("E858: Eval did not return a valid python object"));
++       else
++       {
++           if (ConvertFromPyObject(r, rettv) == -1)
++               EMSG(_("E859: Failed to convert returned python object to vim value"));
++           Py_DECREF(r);
++       }
++       PyErr_Clear();
++    }
+ 
+     Python_SaveThread();           /* leave python */
+ 
+@@ -662,7 +857,7 @@
+ #ifndef PY_CAN_RECURSE
+     --recursive;
+ #endif
+-    return;        /* keeps lint happy */
++    return;
+ }
+ 
+ /*
+@@ -677,9 +872,9 @@
+     if (!eap->skip)
+     {
+        if (script == NULL)
+-           DoPythonCommand(eap, (char *)eap->arg);
++           DoPythonCommand(eap, (char *)eap->arg, NULL);
+        else
+-           DoPythonCommand(eap, (char *)script);
++           DoPythonCommand(eap, (char *)script, NULL);
+     }
+     vim_free(script);
+ }
+@@ -725,7 +920,7 @@
+     *p++ = '\0';
+ 
+     /* Execute the file */
+-    DoPythonCommand(eap, buffer);
++    DoPythonCommand(eap, buffer, NULL);
+ }
+ 
+ /******************************************************
+@@ -747,14 +942,16 @@
+     static int
+ OutputSetattr(PyObject *self, char *name, PyObject *val)
+ {
+-    if (val == NULL) {
++    if (val == NULL)
++    {
+        PyErr_SetString(PyExc_AttributeError, _("can't delete OutputObject attributes"));
+        return -1;
+     }
+ 
+     if (strcmp(name, "softspace") == 0)
+     {
+-       if (!PyInt_Check(val)) {
++       if (!PyInt_Check(val))
++       {
+            PyErr_SetString(PyExc_TypeError, _("softspace must be an integer"));
+            return -1;
+        }
+@@ -773,7 +970,7 @@
  PythonIO_Init(void)
  {
@@ -44458 +47905 @@
      return PythonIO_Init_io();
  }
-@@ -823,44 +841,6 @@
+@@ -782,6 +979,9 @@
+  * 3. Implementation of the Vim module for Python
+  */
+ 
++static PyObject *ConvertToPyObject(typval_T *);
++static int ConvertFromPyObject(PyObject *, typval_T *);
++
+ /* Window type - Implementation functions
+  * --------------------------------------
+  */
+@@ -823,44 +1023,6 @@
  static PyObject *CurrentGetattr(PyObject *, char *);
  static int CurrentSetattr(PyObject *, char *, PyObject *);
@@ -44503 +47960 @@
      (PyInquiry)                BufferLength,       /* sq_length,    len(x)   */
      (binaryfunc)       0, /* BufferConcat, */       /* sq_concat,    x+y      */
-@@ -1028,7 +1008,7 @@
+@@ -1028,7 +1190,7 @@
      static PyInt
  BufferAssSlice(PyObject *self, PyInt lo, PyInt hi, PyObject *val)
@@ -44512 +47969 @@
                       NULL);
  }
-@@ -1078,7 +1058,7 @@
+@@ -1078,7 +1240,7 @@
      static PyInt
  RangeAssSlice(PyObject *self, PyInt lo, PyInt hi, PyObject *val)
@@ -44521 +47978 @@
                       ((RangeObject *)(self))->end,
                       &((RangeObject *)(self))->end);
-@@ -1395,12 +1375,12 @@
+@@ -1395,12 +1557,12 @@
      static char *(argv[2]) = {"/must>not&exist/foo", NULL};
  
@@ -44540 +47997 @@
      /* Set sys.argv[] to avoid a crash in warn(). */
      PySys_SetArgv(1, argv);
-@@ -1425,194 +1405,6 @@
+@@ -1425,194 +1587,6 @@
   * 4. Utility functions for handling the interface between Vim and Python.
   */
@@ -44735 +48192 @@
   * All internal newlines are replaced by null characters.
   *
+@@ -1649,6 +1623,172 @@
+     return result;
+ }
+ 
++static void DictionaryDestructor(PyObject *);
++static PyObject *DictionaryGetattr(PyObject *, char*);
++
++static PyMappingMethods DictionaryAsMapping = {
++    (PyInquiry)                DictionaryLength,
++    (binaryfunc)       DictionaryItem,
++    (objobjargproc)    DictionaryAssItem,
++};
++
++static PyTypeObject DictionaryType = {
++    PyObject_HEAD_INIT(0)
++    0,
++    "vimdictionary",
++    sizeof(DictionaryObject),
++    0,
++
++    (destructor)  DictionaryDestructor,
++    (printfunc)   0,
++    (getattrfunc) DictionaryGetattr,
++    (setattrfunc) 0,
++    (cmpfunc)     0,
++    (reprfunc)    0,
++
++    0,                     /* as number */
++    0,                     /* as sequence */
++    &DictionaryAsMapping,   /* as mapping */
++
++    (hashfunc)    0,
++    (ternaryfunc) 0,
++    (reprfunc)    0,
++};
++
++    static void
++DictionaryDestructor(PyObject *self)
++{
++    DictionaryObject   *this = ((DictionaryObject *) (self));
++
++    pyll_remove(&this->ref, &lastdict);
++    dict_unref(this->dict);
++
++    Py_DECREF(self);
++}
++
++    static PyObject *
++DictionaryGetattr(PyObject *self, char *name)
++{
++    return Py_FindMethod(DictionaryMethods, self, name);
++}
++
++static void ListDestructor(PyObject *);
++static PyObject *ListGetattr(PyObject *, char *);
++
++static PySequenceMethods ListAsSeq = {
++    (PyInquiry)                        ListLength,
++    (binaryfunc)               0,
++    (PyIntArgFunc)             0,
++    (PyIntArgFunc)             ListItem,
++    (PyIntIntArgFunc)          ListSlice,
++    (PyIntObjArgProc)          ListAssItem,
++    (PyIntIntObjArgProc)       ListAssSlice,
++    (objobjproc)               0,
++#if PY_MAJOR_VERSION >= 2
++    (binaryfunc)               ListConcatInPlace,
++    0,
++#endif
++};
++
++static PyTypeObject ListType = {
++    PyObject_HEAD_INIT(0)
++    0,
++    "vimlist",
++    sizeof(ListObject),
++    0,
++
++    (destructor)  ListDestructor,
++    (printfunc)   0,
++    (getattrfunc) ListGetattr,
++    (setattrfunc) 0,
++    (cmpfunc)     0,
++    (reprfunc)    0,
++
++    0,                     /* as number */
++    &ListAsSeq,                    /* as sequence */
++    0,                     /* as mapping */
++
++    (hashfunc)    0,
++    (ternaryfunc) 0,
++    (reprfunc)    0,
++};
++
++    static void
++ListDestructor(PyObject *self)
++{
++    ListObject *this = ((ListObject *) (self));
++
++    pyll_remove(&this->ref, &lastlist);
++    list_unref(this->list);
++
++    Py_DECREF(self);
++}
++
++    static PyObject *
++ListGetattr(PyObject *self, char *name)
++{
++    return Py_FindMethod(ListMethods, self, name);
++}
++
++static void FunctionDestructor(PyObject *);
++static PyObject *FunctionGetattr(PyObject *, char *);
++
++static PyTypeObject FunctionType = {
++    PyObject_HEAD_INIT(0)
++    0,
++    "vimfunction",
++    sizeof(FunctionObject),
++    0,
++
++    (destructor)  FunctionDestructor,
++    (printfunc)   0,
++    (getattrfunc) FunctionGetattr,
++    (setattrfunc) 0,
++    (cmpfunc)     0,
++    (reprfunc)    0,
++
++    0,                     /* as number */
++    0,                     /* as sequence */
++    0,                     /* as mapping */
++
++    (hashfunc)    0,
++    (ternaryfunc) FunctionCall,
++    (reprfunc)    0,
++};
++
++    static void
++FunctionDestructor(PyObject *self)
++{
++    FunctionObject     *this = (FunctionObject *) (self);
++
++    func_unref(this->name);
++    PyMem_Del(this->name);
++
++    Py_DECREF(self);
++}
++
++    static PyObject *
++FunctionGetattr(PyObject *self, char *name)
++{
++    FunctionObject     *this = (FunctionObject *)(self);
++
++    if (strcmp(name, "name") == 0)
++       return PyString_FromString((char *)(this->name));
++    else
++       return Py_FindMethod(FunctionMethods, self, name);
++}
++
++    void
++do_pyeval (char_u *str, typval_T *rettv)
++{
++    DoPythonCommand(NULL, (char *) str, rettv);
++    switch(rettv->v_type)
++    {
++       case VAR_DICT: ++rettv->vval.v_dict->dv_refcount; break;
++       case VAR_LIST: ++rettv->vval.v_list->lv_refcount; break;
++       case VAR_FUNC: func_ref(rettv->vval.v_string);    break;
++    }
++}
+ 
+ /* Don't generate a prototype for the next function, it generates an error on
+  * newer Python versions. */
+@@ -1661,6 +1801,12 @@
+ }
+ #endif /* Python 1.4 */
+ 
++    void
++set_ref_in_python (int copyID)
++{
++    set_ref_in_py(copyID);
++}
++
+     static void
+ init_structs(void)
+ {
 diff -Naur vim73.orig/src/if_python3.c vim73/src/if_python3.c
---- vim73.orig/src/if_python3.c 2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/if_python3.c      2012-06-03 23:09:55.312070180 +0000
+--- vim73.orig/src/if_python3.c 2010-08-13 13:59:40.000000000 +0000
++++ vim73/src/if_python3.c      2012-07-20 20:31:17.787644787 +0000
 @@ -22,8 +22,8 @@
   * Adaptations to support both python3.x and python2.x
@@ -44749 +48392 @@
  #include "vim.h"
  
-@@ -68,19 +68,28 @@
+@@ -68,19 +68,31 @@
  
  static void init_structs(void);
@@ -44760 +48403 @@
 +#endif
 +
++/* Python 3 does not support CObjects, always use Capsules */
++#define PY_USE_CAPSULE
++
  #define PyInt Py_ssize_t
  #define PyString_Check(obj) PyUnicode_Check(obj)
 -#define PyString_AsString(obj) _PyUnicode_AsString(obj)
 -#define PyString_Size(obj) PyUnicode_GET_SIZE(obj)
-+#define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, CODEC_ERROR_HANDLER);
++#define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, CODEC_ERROR_HANDLER)
 +#define PyString_FreeBytes(obj) Py_XDECREF(bytes)
 +#define PyString_AsString(obj) PyBytes_AsString(obj)
@@ -44782 +48428 @@
  #  else
  #   define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
-@@ -88,7 +97,7 @@
+@@ -88,7 +100,7 @@
  #  define close_dll dlclose
  #  define symbol_from_dll dlsym
@@ -44791 +48437 @@
  #  define symbol_from_dll GetProcAddress
  # endif
-@@ -99,6 +108,7 @@
+@@ -99,6 +111,8 @@
  # define PyArg_Parse py3_PyArg_Parse
  # undef PyArg_ParseTuple
  # define PyArg_ParseTuple py3_PyArg_ParseTuple
 +# define PyMem_Free py3_PyMem_Free
++# define PyMem_Malloc py3_PyMem_Malloc
  # define PyDict_SetItemString py3_PyDict_SetItemString
  # define PyErr_BadArgument py3_PyErr_BadArgument
  # define PyErr_Clear py3_PyErr_Clear
-@@ -132,6 +142,7 @@
+@@ -118,29 +132,54 @@
+ # define PyList_New py3_PyList_New
+ # define PyList_SetItem py3_PyList_SetItem
+ # define PyList_Size py3_PyList_Size
++# define PySequence_Check py3_PySequence_Check
++# define PySequence_Size py3_PySequence_Size
++# define PySequence_GetItem py3_PySequence_GetItem
++# define PyTuple_Size py3_PyTuple_Size
++# define PyTuple_GetItem py3_PyTuple_GetItem
+ # define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx
+ # define PyImport_ImportModule py3_PyImport_ImportModule
++# define PyImport_AddModule py3_PyImport_AddModule
+ # define PyObject_Init py3__PyObject_Init
+ # define PyDict_New py3_PyDict_New
+ # define PyDict_GetItemString py3_PyDict_GetItemString
++# define PyDict_Next py3_PyDict_Next
++# define PyMapping_Check py3_PyMapping_Check
++# define PyMapping_Items py3_PyMapping_Items
++# define PyIter_Next py3_PyIter_Next
++# define PyObject_GetIter py3_PyObject_GetIter
+ # define PyModule_GetDict py3_PyModule_GetDict
+ #undef PyRun_SimpleString
+ # define PyRun_SimpleString py3_PyRun_SimpleString
++#undef PyRun_String
++# define PyRun_String py3_PyRun_String
+ # define PySys_SetObject py3_PySys_SetObject
+ # define PySys_SetArgv py3_PySys_SetArgv
+ # define PyType_Type (*py3_PyType_Type)
  # define PyType_Ready py3_PyType_Ready
  #undef Py_BuildValue
@@ -44807 +48481 @@
  # define Py_Finalize py3_Py_Finalize
  # define Py_IsInitialized py3_Py_IsInitialized
-@@ -139,8 +150,13 @@
+ # define _Py_NoneStruct (*py3__Py_NoneStruct)
++# define _PyObject_NextNotImplemented (*py3__PyObject_NextNotImplemented)
  # define PyModule_AddObject py3_PyModule_AddObject
  # define PyImport_AppendInittab py3_PyImport_AppendInittab
@@ -44815 +48490 @@
 +# undef PyBytes_AsString
 +# define PyBytes_AsString py3_PyBytes_AsString
++# undef PyBytes_FromString
++# define PyBytes_FromString py3_PyBytes_FromString
++# define PyFloat_FromDouble py3_PyFloat_FromDouble
++# define PyFloat_AsDouble py3_PyFloat_AsDouble
  # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr
  # define PySlice_Type (*py3_PySlice_Type)
++# define PyFloat_Type (*py3_PyFloat_Type)
 +# define PyErr_NewException py3_PyErr_NewException
  # ifdef Py_DEBUG
  #  define _Py_NegativeRefcount py3__Py_NegativeRefcount
  #  define _Py_RefTotal (*py3__Py_RefTotal)
-@@ -156,8 +172,8 @@
+@@ -156,8 +195,11 @@
  # define PyModule_Create2 py3_PyModule_Create2
  # undef PyUnicode_FromString
@@ -44829 +48509 @@
 +# undef PyUnicode_Decode
 +# define PyUnicode_Decode py3_PyUnicode_Decode
++# define PyType_IsSubtype py3_PyType_IsSubtype
++# define PyCapsule_New py3_PyCapsule_New
++# define PyCapsule_GetPointer py3_PyCapsule_GetPointer
  
  # ifdef Py_DEBUG
  #  undef PyObject_NEW
-@@ -170,6 +186,7 @@
+@@ -170,6 +212,7 @@
   * Pointers for dynamic link
   */
@@ -44840 +48523 @@
  static PyObject* (*py3_PyList_New)(Py_ssize_t size);
  static PyGILState_STATE (*py3_PyGILState_Ensure)(void);
-@@ -177,7 +194,7 @@
+@@ -177,27 +220,40 @@
  static int (*py3_PySys_SetObject)(char *, PyObject *);
  static PyObject* (*py3_PyList_Append)(PyObject *, PyObject *);
  static Py_ssize_t (*py3_PyList_Size)(PyObject *);
 -static int (*py3_PySlice_GetIndicesEx)(PySliceObject *r, Py_ssize_t length,
++static int (*py3_PySequence_Check)(PyObject *);
++static Py_ssize_t (*py3_PySequence_Size)(PyObject *);
++static PyObject* (*py3_PySequence_GetItem)(PyObject *, Py_ssize_t);
++static Py_ssize_t (*py3_PyTuple_Size)(PyObject *);
++static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
++static int (*py3_PyMapping_Check)(PyObject *);
++static PyObject* (*py3_PyMapping_Items)(PyObject *);
 +static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length,
                      Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, Py_ssize_t *slicelength);
  static PyObject* (*py3_PyErr_NoMemory)(void);
  static void (*py3_Py_Finalize)(void);
-@@ -197,7 +214,8 @@
+ static void (*py3_PyErr_SetString)(PyObject *, const char *);
+ static int (*py3_PyRun_SimpleString)(char *);
++static PyObject* (*py3_PyRun_String)(char *, int, PyObject *, PyObject *);
+ static PyObject* (*py3_PyList_GetItem)(PyObject *, Py_ssize_t);
+ static PyObject* (*py3_PyImport_ImportModule)(const char *);
++static PyObject* (*py3_PyImport_AddModule)(const char *);
+ static int (*py3_PyErr_BadArgument)(void);
+ static PyTypeObject* py3_PyType_Type;
+ static PyObject* (*py3_PyErr_Occurred)(void);
+ static PyObject* (*py3_PyModule_GetDict)(PyObject *);
+ static int (*py3_PyList_SetItem)(PyObject *, Py_ssize_t, PyObject *);
+ static PyObject* (*py3_PyDict_GetItemString)(PyObject *, const char *);
++static int (*py3_PyDict_Next)(PyObject *, Py_ssize_t *, PyObject **, PyObject **);
+ static PyObject* (*py3_PyLong_FromLong)(long);
+ static PyObject* (*py3_PyDict_New)(void);
++static PyObject* (*py3_PyIter_Next)(PyObject *);
++static PyObject* (*py3_PyObject_GetIter)(PyObject *);
+ static PyObject* (*py3_Py_BuildValue)(char *, ...);
  static int (*py3_PyType_Ready)(PyTypeObject *type);
  static int (*py3_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item);
@@ -44859 +48566 @@
  static void (*py3_PyErr_SetNone)(PyObject *);
  static void (*py3_PyEval_InitThreads)(void);
-@@ -205,6 +223,7 @@
+@@ -205,18 +261,30 @@
  static PyThreadState*(*py3_PyEval_SaveThread)(void);
  static int (*py3_PyArg_Parse)(PyObject *, char *, ...);
  static int (*py3_PyArg_ParseTuple)(PyObject *, char *, ...);
 +static int (*py3_PyMem_Free)(void *);
++static void* (*py3_PyMem_Malloc)(size_t);
  static int (*py3_Py_IsInitialized)(void);
  static void (*py3_PyErr_Clear)(void);
  static PyObject*(*py3__PyObject_Init)(PyObject *, PyTypeObject *);
-@@ -212,11 +231,14 @@
++static iternextfunc py3__PyObject_NextNotImplemented;
+ static PyObject* py3__Py_NoneStruct;
  static int (*py3_PyModule_AddObject)(PyObject *m, const char *name, PyObject *o);
  static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void));
@@ -44873 +48582 @@
 +static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors);
 +static char* (*py3_PyBytes_AsString)(PyObject *bytes);
++static PyObject* (*py3_PyBytes_FromString)(char *str);
++static PyObject* (*py3_PyFloat_FromDouble)(double num);
++static double (*py3_PyFloat_AsDouble)(PyObject *);
  static PyObject* (*py3_PyObject_GenericGetAttr)(PyObject *obj, PyObject *name);
  static PyObject* (*py3_PyModule_Create2)(struct PyModuleDef* module, int module_api_version);
@@ -44878 +48590 @@
  static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds);
  static PyTypeObject* py3_PySlice_Type;
++static PyTypeObject* py3_PyFloat_Type;
 +static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict);
++static PyObject* (*py3_PyCapsule_New)(void *, char *, PyCapsule_Destructor);
++static void* (*py3_PyCapsule_GetPointer)(PyObject *, char *);
  # ifdef Py_DEBUG
      static void (*py3__Py_NegativeRefcount)(const char *fname, int lineno, PyObject *op);
      static Py_ssize_t* py3__Py_RefTotal;
-@@ -254,8 +276,10 @@
+@@ -227,6 +295,7 @@
+     static void (*py3_PyObject_Free)(void*);
+     static void* (*py3_PyObject_Malloc)(size_t);
+ # endif
++static int (*py3_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *);
+ 
+ static HINSTANCE hinstPy3 = 0; /* Instance of python.dll */
+ 
+@@ -254,27 +323,42 @@
  } py3_funcname_table[] =
  {
@@ -44890 +48613 @@
      {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
 +    {"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free},
++    {"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc},
      {"PyList_New", (PYTHON_PROC*)&py3_PyList_New},
      {"PyGILState_Ensure", (PYTHON_PROC*)&py3_PyGILState_Ensure},
      {"PyGILState_Release", (PYTHON_PROC*)&py3_PyGILState_Release},
-@@ -286,7 +310,6 @@
+     {"PySys_SetObject", (PYTHON_PROC*)&py3_PySys_SetObject},
+     {"PyList_Append", (PYTHON_PROC*)&py3_PyList_Append},
+     {"PyList_Size", (PYTHON_PROC*)&py3_PyList_Size},
++    {"PySequence_Check", (PYTHON_PROC*)&py3_PySequence_Check},
++    {"PySequence_Size", (PYTHON_PROC*)&py3_PySequence_Size},
++    {"PySequence_GetItem", (PYTHON_PROC*)&py3_PySequence_GetItem},
++    {"PyTuple_Size", (PYTHON_PROC*)&py3_PyTuple_Size},
++    {"PyTuple_GetItem", (PYTHON_PROC*)&py3_PyTuple_GetItem},
+     {"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx},
+     {"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory},
+     {"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize},
+     {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString},
+     {"PyRun_SimpleString", (PYTHON_PROC*)&py3_PyRun_SimpleString},
++    {"PyRun_String", (PYTHON_PROC*)&py3_PyRun_String},
+     {"PyList_GetItem", (PYTHON_PROC*)&py3_PyList_GetItem},
+     {"PyImport_ImportModule", (PYTHON_PROC*)&py3_PyImport_ImportModule},
++    {"PyImport_AddModule", (PYTHON_PROC*)&py3_PyImport_AddModule},
+     {"PyErr_BadArgument", (PYTHON_PROC*)&py3_PyErr_BadArgument},
+     {"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type},
+     {"PyErr_Occurred", (PYTHON_PROC*)&py3_PyErr_Occurred},
+     {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict},
+     {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem},
+     {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString},
++    {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next},
++    {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check},
++    {"PyMapping_Items", (PYTHON_PROC*)&py3_PyMapping_Items},
++    {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next},
++    {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter},
+     {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong},
+     {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New},
+     {"Py_BuildValue", (PYTHON_PROC*)&py3_Py_BuildValue},
+@@ -286,19 +370,25 @@
      {"PyEval_RestoreThread", (PYTHON_PROC*)&py3_PyEval_RestoreThread},
      {"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread},
@@ -44899 +48654 @@
 -    {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
      {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized},
++    {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&py3__PyObject_NextNotImplemented},
      {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct},
      {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear},
-@@ -294,11 +317,13 @@
+     {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init},
      {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject},
      {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab},
      {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
 +    {"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString},
++    {"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString},
++    {"PyFloat_FromDouble", (PYTHON_PROC*)&py3_PyFloat_FromDouble},
++    {"PyFloat_AsDouble", (PYTHON_PROC*)&py3_PyFloat_AsDouble},
      {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr},
      {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2},
@@ -44911 +48670 @@
      {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew},
      {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type},
++    {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type},
 +    {"PyErr_NewException", (PYTHON_PROC*)&py3_PyErr_NewException},
  # ifdef Py_DEBUG
      {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount},
      {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal},
-@@ -334,15 +359,16 @@
+@@ -309,6 +399,9 @@
+     {"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc},
+     {"PyObject_Free", (PYTHON_PROC*)&py3_PyObject_Free},
+ # endif
++    {"PyType_IsSubtype", (PYTHON_PROC*)&py3_PyType_IsSubtype},
++    {"PyCapsule_New", (PYTHON_PROC*)&py3_PyCapsule_New},
++    {"PyCapsule_GetPointer", (PYTHON_PROC*)&py3_PyCapsule_GetPointer},
+     {"", NULL},
+ };
+ 
+@@ -334,15 +427,16 @@
  py3_runtime_link_init(char *libname, int verbose)
  {
@@ -44935 +48705 @@
      }
  # endif
-@@ -374,19 +400,24 @@
+@@ -374,19 +468,24 @@
      /* Load unicode functions separately as only the ucs2 or the ucs4 functions
       * will be present in the library. */
@@ -44967 +48737 @@
      else
      {
-@@ -437,6 +468,7 @@
+@@ -437,14 +536,45 @@
  static PyObject *BufferNew (buf_T *);
  static PyObject *WindowNew(win_T *);
@@ -44975 +48745 @@
  static PyTypeObject RangeType;
  
-@@ -539,14 +571,18 @@
++static int py3initialised = 0;
++
++#define PYINITIALISED py3initialised
++
++/* Add conversion from PyInt? */
++#define DICTKEY_GET(err) \
++    if (PyBytes_Check(keyObject)) \
++       key = (char_u *) PyBytes_AsString(keyObject); \
++    else if (PyUnicode_Check(keyObject)) \
++    { \
++       bytes = PyString_AsBytes(keyObject); \
++       if (bytes == NULL) \
++           return err; \
++       key = (char_u *) PyBytes_AsString(bytes); \
++       if (key == NULL) \
++           return err; \
++    } \
++    else \
++    { \
++       PyErr_SetString(PyExc_TypeError, _("only string keys are allowed")); \
++       return err; \
++    }
++#define DICTKEY_UNREF \
++    if (bytes != NULL) \
++       Py_XDECREF(bytes);
++
++#define DICTKEY_DECL PyObject *bytes = NULL;
++
+ /*
+  * Include the code shared with if_python.c
+  */
+ #include "if_py_both.h"
+ 
++#define PY3OBJ_DELETED(obj) (obj->ob_base.ob_refcnt<=0)
++
+     static void
+ call_PyObject_Free(void *p)
+ {
+@@ -474,6 +604,8 @@
+ static Py_ssize_t RangeStart;
+ static Py_ssize_t RangeEnd;
+ 
++static PyObject *globals;
++
+ static int PythonIO_Init(void);
+ static void PythonIO_Fini(void);
+ PyMODINIT_FUNC Py3Init_vim(void);
+@@ -482,8 +614,6 @@
+  * 1. Python interpreter main program.
+  */
+ 
+-static int py3initialised = 0;
+-
+ static PyGILState_STATE pygilstate = PyGILState_UNLOCKED;
+ 
+     void
+@@ -539,14 +669,18 @@
  
         init_structs();
@@ -44996 +48822 @@
  #ifdef DYNAMIC_PYTHON3
         get_py3_exceptions();
-@@ -560,8 +596,11 @@
+@@ -557,11 +691,16 @@
+ 
+        PyImport_AppendInittab("vim", Py3Init_vim);
+ 
++       globals = PyModule_GetDict(PyImport_AddModule("__main__"));
++
         /* Remove the element from sys.path that was added because of our
          * argv[0] value in Py3Init_vim().  Previously we used an empty
@@ -45010 +48841 @@
         // lock is created and acquired in PyEval_InitThreads() and thread
         // state is created in Py_Initialize()
-@@ -598,6 +637,8 @@
+@@ -590,7 +729,7 @@
+  * External interface
+  */
+     static void
+-DoPy3Command(exarg_T *eap, const char *cmd)
++DoPy3Command(exarg_T *eap, const char *cmd, typval_T *rettv)
+ {
+ #if defined(MACOS) && !defined(MACOS_X_UNIX)
+     GrafPtr            oldPort;
+@@ -598,6 +737,8 @@
  #if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
      char               *saved_locale;
@@ -45019 +48859 @@
  #if defined(MACOS) && !defined(MACOS_X_UNIX)
      GetPort(&oldPort);
-@@ -627,7 +668,14 @@
+@@ -608,8 +749,16 @@
+     if (Python3_Init())
+        goto theend;
+ 
+-    RangeStart = eap->line1;
+-    RangeEnd = eap->line2;
++    if (rettv == NULL)
++    {
++       RangeStart = eap->line1;
++       RangeEnd = eap->line2;
++    }
++    else
++    {
++       RangeStart = (PyInt) curwin->w_cursor.lnum;
++       RangeEnd = RangeStart;
++    }
+     Python_Release_Vim();          /* leave vim */
+ 
+ #if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
+@@ -627,7 +776,31 @@
  
      pygilstate = PyGILState_Ensure();
@@ -45030 +48889 @@
 +    cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", CODEC_ERROR_HANDLER);
 +    Py_XDECREF(cmdstr);
-+    PyRun_SimpleString(PyBytes_AsString(cmdbytes));
++    if (rettv == NULL)
++       PyRun_SimpleString(PyBytes_AsString(cmdbytes));
++    else
++    {
++       PyObject        *r;
++
++       r = PyRun_String(PyBytes_AsString(cmdbytes), Py_eval_input,
++                        globals, globals);
++       if (r == NULL)
++           EMSG(_("E860: Eval did not return a valid python 3 object"));
++       else
++       {
++           if (ConvertFromPyObject(r, rettv) == -1)
++               EMSG(_("E861: Failed to convert returned python 3 object to vim value"));
++           Py_DECREF(r);
++       }
++       PyErr_Clear();
++    }
 +    Py_XDECREF(cmdbytes);
  
      PyGILState_Release(pygilstate);
  
-@@ -686,7 +734,10 @@
+@@ -661,9 +834,9 @@
+     if (!eap->skip)
+     {
+        if (script == NULL)
+-           DoPy3Command(eap, (char *)eap->arg);
++           DoPy3Command(eap, (char *)eap->arg, NULL);
+        else
+-           DoPy3Command(eap, (char *)script);
++           DoPy3Command(eap, (char *)script, NULL);
+     }
+     vim_free(script);
+ }
+@@ -686,7 +859,10 @@
       * different options under Windows, meaning that stdio pointers aren't
       * compatible between the two. Yuk.
@@ -45047 +48935 @@
       * We need to escape any backslashes or single quotes in the file name, so that
       * Python won't mangle the file name.
-@@ -709,8 +760,8 @@
+@@ -709,8 +885,8 @@
             return;
         if (i==0)
@@ -45058 +48946 @@
         else
         {
-@@ -805,8 +856,8 @@
+@@ -721,7 +897,7 @@
+ 
+ 
+     /* Execute the file */
+-    DoPy3Command(eap, buffer);
++    DoPy3Command(eap, buffer, NULL);
+ }
+ 
+ /******************************************************
+@@ -751,14 +927,16 @@
+     if (PyUnicode_Check(nameobj))
+        name = _PyUnicode_AsString(nameobj);
+ 
+-    if (val == NULL) {
++    if (val == NULL)
++    {
+        PyErr_SetString(PyExc_AttributeError, _("can't delete OutputObject attributes"));
+        return -1;
+     }
+ 
+     if (strcmp(name, "softspace") == 0)
+     {
+-       if (!PyLong_Check(val)) {
++       if (!PyLong_Check(val))
++       {
+            PyErr_SetString(PyExc_TypeError, _("softspace must be an integer"));
+            return -1;
+        }
+@@ -805,8 +983,8 @@
  
  static Py_ssize_t BufferLength(PyObject *);
@@ -45069 +48985 @@
  
  /* Line range type - Implementation functions
-@@ -815,8 +866,9 @@
+@@ -815,8 +993,9 @@
  
  #define RangeType_Check(obj) ((obj)->ob_base.ob_type == &RangeType)
@@ -45080 +48996 @@
  /* Current objects type - Implementation functions
   * -----------------------------------------------
-@@ -828,7 +880,7 @@
+@@ -828,7 +1007,7 @@
      (ssizeargfunc)     0,                  /* sq_repeat,    x*n      */
      (ssizeargfunc)     BufferItem,         /* sq_item,      x[i]     */
@@ -45089 +49005 @@
      0,                                     /* sq_contains */
      0,                                     /* sq_inplace_concat */
-@@ -838,7 +890,7 @@
+@@ -838,7 +1017,7 @@
  PyMappingMethods BufferAsMapping = {
      /* mp_length       */ (lenfunc)BufferLength,
@@ -45098 +49014 @@
  
  
-@@ -890,6 +942,8 @@
+@@ -890,6 +1069,8 @@
  
      if (this->buf && this->buf != INVALID_BUFFER_VALUE)
@@ -45107 +49023 @@
  
      static PyObject *
-@@ -908,13 +962,18 @@
+@@ -908,13 +1089,18 @@
         return Py_BuildValue("s", this->buf->b_ffname);
      else if (strcmp(name, "number") == 0)
@@ -45128 +49044 @@
  {
      static char repr[100];
-@@ -968,15 +1027,6 @@
+@@ -968,37 +1154,64 @@
                (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count);
  }
@@ -45144 +49060 @@
  BufferSubscript(PyObject *self, PyObject* idx)
  {
-@@ -986,19 +1036,45 @@
-     } else if (PySlice_Check(idx)) {
+-    if (PyLong_Check(idx)) {
++    if (PyLong_Check(idx))
++    {
+        long _idx = PyLong_AsLong(idx);
+        return BufferItem(self,_idx);
+-    } else if (PySlice_Check(idx)) {
++    } else if (PySlice_Check(idx))
++    {
         Py_ssize_t start, stop, step, slicelen;
  
@@ -45152 +49074 @@
               (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
               &start, &stop,
-              &step, &slicelen) < 0) {
+-             &step, &slicelen) < 0) {
++             &step, &slicelen) < 0)
++       {
             return NULL;
         }
 -       return BufferSlice(self,start,stop+1);
+-    } else {
 +       return BufferSlice(self, start, stop);
-     } else {
++    }
++    else
++    {
         PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
         return NULL;
@@ -45166 +49093 @@
 +BufferAsSubscript(PyObject *self, PyObject* idx, PyObject* val)
 +{
-+    if (PyLong_Check(idx)) {
++    if (PyLong_Check(idx))
++    {
 +       long n = PyLong_AsLong(idx);
 +       return RBAsItem((BufferObject *)(self), n, val, 1,
 +                   (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
 +                   NULL);
-+    } else if (PySlice_Check(idx)) {
++    } else if (PySlice_Check(idx))
++    {
 +       Py_ssize_t start, stop, step, slicelen;
 +
@@ -45177 +49106 @@
 +             (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
 +             &start, &stop,
-+             &step, &slicelen) < 0) {
++             &step, &slicelen) < 0)
++       {
 +           return -1;
 +       }
@@ -45183 +49113 @@
 +                         (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count,
 +                         NULL);
-+    } else {
++    }
++    else
++    {
 +       PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
 +       return -1;
@@ -45192 +49124 @@
      (lenfunc)          RangeLength,     /* sq_length,    len(x)   */
      (binaryfunc)       0,               /* RangeConcat, sq_concat,  x+y   */
-@@ -1015,7 +1091,7 @@
+@@ -1015,7 +1228,7 @@
  PyMappingMethods RangeAsMapping = {
      /* mp_length       */ (lenfunc)RangeLength,
@@ -45201 +49133 @@
  
  /* Line range object - Implementation
-@@ -1025,6 +1101,7 @@
+@@ -1025,6 +1238,7 @@
  RangeDestructor(PyObject *self)
  {
@@ -45209 +49141 @@
  
      static PyObject *
-@@ -1053,6 +1130,15 @@
+@@ -1053,28 +1267,70 @@
                     &((RangeObject *)(self))->end);
  }
@@ -45225 +49157 @@
  RangeSubscript(PyObject *self, PyObject* idx)
  {
-@@ -1062,19 +1148,42 @@
-     } else if (PySlice_Check(idx)) {
+-    if (PyLong_Check(idx)) {
++    if (PyLong_Check(idx))
++    {
+        long _idx = PyLong_AsLong(idx);
+        return RangeItem(self,_idx);
+-    } else if (PySlice_Check(idx)) {
++    } else if (PySlice_Check(idx))
++    {
         Py_ssize_t start, stop, step, slicelen;
  
@@ -45233 +49171 @@
                 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
                 &start, &stop,
-                &step, &slicelen) < 0) {
+-               &step, &slicelen) < 0) {
++               &step, &slicelen) < 0)
++       {
             return NULL;
         }
 -       return RangeSlice(self,start,stop+1);
+-    } else {
 +       return RangeSlice(self, start, stop);
-     } else {
++    }
++    else
++    {
         PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
         return NULL;
@@ -45247 +49190 @@
 +RangeAsSubscript(PyObject *self, PyObject *idx, PyObject *val)
 +{
-+    if (PyLong_Check(idx)) {
++    if (PyLong_Check(idx))
++    {
 +       long n = PyLong_AsLong(idx);
 +       return RangeAsItem(self, n, val);
-+    } else if (PySlice_Check(idx)) {
++    } else if (PySlice_Check(idx))
++    {
 +       Py_ssize_t start, stop, step, slicelen;
 +
@@ -45256 +49201 @@
 +               ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
 +               &start, &stop,
-+               &step, &slicelen) < 0) {
++               &step, &slicelen) < 0)
++       {
 +           return -1;
 +       }
 +       return RangeAsSlice(self, start, stop, val);
-+    } else {
++    }
++    else
++    {
 +       PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
 +       return -1;
@@ -45270 +49218 @@
   */
  
-@@ -1152,6 +1261,8 @@
+@@ -1152,6 +1408,8 @@
  
      if (this->win && this->win != INVALID_WINDOW_VALUE)
@@ -45279 +49227 @@
  
      static PyObject *
-@@ -1343,8 +1454,11 @@
+@@ -1279,6 +1537,147 @@
+     }
+ }
+ 
++/* Dictionary object - Definitions
++ */
++
++static PyInt DictionaryLength(PyObject *);
++
++static PyMappingMethods DictionaryAsMapping = {
++    /* mp_length       */ (lenfunc) DictionaryLength,
++    /* mp_subscript     */ (binaryfunc) DictionaryItem,
++    /* mp_ass_subscript */ (objobjargproc) DictionaryAssItem,
++};
++
++static PyTypeObject DictionaryType;
++
++    static void
++DictionaryDestructor(PyObject *self)
++{
++    DictionaryObject *this = (DictionaryObject *)(self);
++
++    pyll_remove(&this->ref, &lastdict);
++    dict_unref(this->dict);
++
++    Py_TYPE(self)->tp_free((PyObject*)self);
++}
++
++/* List object - Definitions
++ */
++
++static PyInt ListLength(PyObject *);
++static PyObject *ListItem(PyObject *, Py_ssize_t);
++
++static PySequenceMethods ListAsSeq = {
++    (lenfunc)          ListLength,      /* sq_length,    len(x)   */
++    (binaryfunc)       0,               /* RangeConcat, sq_concat,  x+y   */
++    (ssizeargfunc)     0,               /* RangeRepeat, sq_repeat,  x*n   */
++    (ssizeargfunc)     ListItem,        /* sq_item,      x[i]     */
++    (void *)           0,               /* was_sq_slice,     x[i:j]   */
++    (ssizeobjargproc)  ListAssItem,     /* sq_as_item,  x[i]=v   */
++    (void *)           0,               /* was_sq_ass_slice, x[i:j]=v */
++    0,                                  /* sq_contains */
++    (binaryfunc)       ListConcatInPlace,/* sq_inplace_concat */
++    0,                                  /* sq_inplace_repeat */
++};
++
++static PyObject *ListSubscript(PyObject *, PyObject *);
++static Py_ssize_t ListAsSubscript(PyObject *, PyObject *, PyObject *);
++
++static PyMappingMethods ListAsMapping = {
++    /* mp_length       */ (lenfunc) ListLength,
++    /* mp_subscript     */ (binaryfunc) ListSubscript,
++    /* mp_ass_subscript */ (objobjargproc) ListAsSubscript,
++};
++
++static PyTypeObject ListType;
++
++    static PyObject *
++ListSubscript(PyObject *self, PyObject* idxObject)
++{
++    if (PyLong_Check(idxObject))
++    {
++       long idx = PyLong_AsLong(idxObject);
++       return ListItem(self, idx);
++    }
++    else if (PySlice_Check(idxObject))
++    {
++       Py_ssize_t start, stop, step, slicelen;
++
++       if (PySlice_GetIndicesEx(idxObject, ListLength(self), &start, &stop,
++                                &step, &slicelen) < 0)
++           return NULL;
++       return ListSlice(self, start, stop);
++    }
++    else
++    {
++       PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
++       return NULL;
++    }
++}
++
++    static Py_ssize_t
++ListAsSubscript(PyObject *self, PyObject *idxObject, PyObject *obj)
++{
++    if (PyLong_Check(idxObject))
++    {
++       long idx = PyLong_AsLong(idxObject);
++       return ListAssItem(self, idx, obj);
++    }
++    else if (PySlice_Check(idxObject))
++    {
++       Py_ssize_t start, stop, step, slicelen;
++
++       if (PySlice_GetIndicesEx(idxObject, ListLength(self), &start, &stop,
++                                &step, &slicelen) < 0)
++           return -1;
++       return ListAssSlice(self, start, stop, obj);
++    }
++    else
++    {
++       PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
++       return -1;
++    }
++}
++
++    static void
++ListDestructor(PyObject *self)
++{
++    ListObject *this = (ListObject *)(self);
++
++    pyll_remove(&this->ref, &lastlist);
++    list_unref(this->list);
++
++    Py_TYPE(self)->tp_free((PyObject*)self);
++}
++
++/* Function object - Definitions
++ */
++
++    static void
++FunctionDestructor(PyObject *self)
++{
++    FunctionObject     *this = (FunctionObject *) (self);
++
++    func_unref(this->name);
++    PyMem_Del(this->name);
++
++    Py_TYPE(self)->tp_free((PyObject*)self);
++}
++
++    static PyObject *
++FunctionGetattro(PyObject *self, PyObject *nameobj)
++{
++    FunctionObject     *this = (FunctionObject *)(self);
++    char       *name = "";
++    if (PyUnicode_Check(nameobj))
++       name = _PyUnicode_AsString(nameobj);
++
++    if (strcmp(name, "name") == 0)
++       return PyUnicode_FromString((char *)(this->name));
++
++    return PyObject_GenericGetAttr(self, nameobj);
++}
++
+ /* External interface
+  */
+ 
+@@ -1338,13 +1737,19 @@
+     PyType_Ready(&BufListType);
+     PyType_Ready(&WinListType);
+     PyType_Ready(&CurrentType);
++    PyType_Ready(&DictionaryType);
++    PyType_Ready(&ListType);
++    PyType_Ready(&FunctionType);
+ 
+     /* Set sys.argv[] to avoid a crash in warn(). */
      PySys_SetArgv(1, argv);
  
@@ -45292 +49396 @@
      PyModule_AddObject(mod, "error", VimError);
      Py_INCREF((PyObject *)(void *)&TheBufferList);
-@@ -1397,7 +1511,7 @@
+@@ -1397,12 +1802,30 @@
      }
      *p = '\0';
@@ -45301 +49405 @@
      vim_free(tmp);
      return result;
+ }
+ 
++    void
++do_py3eval (char_u *str, typval_T *rettv)
++{
++    DoPy3Command(NULL, (char *) str, rettv);
++    switch(rettv->v_type)
++    {
++       case VAR_DICT: ++rettv->vval.v_dict->dv_refcount; break;
++       case VAR_LIST: ++rettv->vval.v_list->lv_refcount; break;
++       case VAR_FUNC: func_ref(rettv->vval.v_string);    break;
++    }
++}
++
++    void
++set_ref_in_python3 (int copyID)
++{
++    set_ref_in_py(copyID);
++}
++
+     static void
+ init_structs(void)
+ {
+@@ -1484,6 +1907,35 @@
+     CurrentType.tp_flags = Py_TPFLAGS_DEFAULT;
+     CurrentType.tp_doc = "vim current object";
+ 
++    vim_memset(&DictionaryType, 0, sizeof(DictionaryType));
++    DictionaryType.tp_name = "vim.dictionary";
++    DictionaryType.tp_basicsize = sizeof(DictionaryObject);
++    DictionaryType.tp_dealloc = DictionaryDestructor;
++    DictionaryType.tp_as_mapping = &DictionaryAsMapping;
++    DictionaryType.tp_flags = Py_TPFLAGS_DEFAULT;
++    DictionaryType.tp_doc = "dictionary pushing modifications to vim structure";
++    DictionaryType.tp_methods = DictionaryMethods;
++
++    vim_memset(&ListType, 0, sizeof(ListType));
++    ListType.tp_name = "vim.list";
++    ListType.tp_dealloc = ListDestructor;
++    ListType.tp_basicsize = sizeof(ListObject);
++    ListType.tp_as_sequence = &ListAsSeq;
++    ListType.tp_as_mapping = &ListAsMapping;
++    ListType.tp_flags = Py_TPFLAGS_DEFAULT;
++    ListType.tp_doc = "list pushing modifications to vim structure";
++    ListType.tp_methods = ListMethods;
++
++    vim_memset(&FunctionType, 0, sizeof(FunctionType));
++    FunctionType.tp_name = "vim.list";
++    FunctionType.tp_basicsize = sizeof(FunctionObject);
++    FunctionType.tp_getattro = FunctionGetattro;
++    FunctionType.tp_dealloc = FunctionDestructor;
++    FunctionType.tp_call = FunctionCall;
++    FunctionType.tp_flags = Py_TPFLAGS_DEFAULT;
++    FunctionType.tp_doc = "object that calls vim function";
++    FunctionType.tp_methods = FunctionMethods;
++
+     vim_memset(&vimmodule, 0, sizeof(vimmodule));
+     vimmodule.m_name = "vim";
+     vimmodule.m_doc = vim_module_doc;
 diff -Naur vim73.orig/src/if_ruby.c vim73/src/if_ruby.c
---- vim73.orig/src/if_ruby.c    2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/if_ruby.c 2012-06-03 23:09:55.752081889 +0000
+--- vim73.orig/src/if_ruby.c    2010-06-30 19:33:12.000000000 +0000
++++ vim73/src/if_ruby.c 2012-07-20 20:31:15.810976706 +0000
 @@ -4,12 +4,17 @@
   *
@@ -45696 +49859 @@
  
 diff -Naur vim73.orig/src/if_sniff.c vim73/src/if_sniff.c
---- vim73.orig/src/if_sniff.c   2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/if_sniff.c        2012-06-03 23:09:53.508022172 +0000
+--- vim73.orig/src/if_sniff.c   2010-05-15 11:04:06.000000000 +0000
++++ vim73/src/if_sniff.c        2012-07-20 20:31:08.870971712 +0000
 @@ -9,7 +9,6 @@
  
@@ -45707 +49870 @@
  # include <assert.h>
 diff -Naur vim73.orig/src/if_tcl.c vim73/src/if_tcl.c
---- vim73.orig/src/if_tcl.c     2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/if_tcl.c  2012-06-03 23:09:55.492074972 +0000
+--- vim73.orig/src/if_tcl.c     2010-08-08 13:07:25.000000000 +0000
++++ vim73/src/if_tcl.c  2012-07-20 20:31:14.990976118 +0000
 @@ -74,18 +74,18 @@
  #endif
@@ -45935 +50098 @@
         line = (char *)Tcl_GetVar(tclinfo.interp, var_line, 0);
         if (line)
+diff -Naur vim73.orig/src/if_xcmdsrv.c vim73/src/if_xcmdsrv.c
+--- vim73.orig/src/if_xcmdsrv.c 2010-05-15 11:04:08.000000000 +0000
++++ vim73/src/if_xcmdsrv.c      2012-07-20 20:31:17.997644938 +0000
+@@ -572,61 +572,55 @@
+ {
+     time_t         start;
+     time_t         now;
+-    time_t         lastChk = 0;
+     XEvent         event;
+-    XPropertyEvent *e = (XPropertyEvent *)&event;
+-#   define SEND_MSEC_POLL 50
++
++#define UI_MSEC_DELAY 50
++#define SEND_MSEC_POLL 500
++#ifndef HAVE_SELECT
++    struct pollfd   fds;
++
++    fds.fd = ConnectionNumber(dpy);
++    fds.events = POLLIN;
++#else
++    fd_set         fds;
++    struct timeval  tv;
++
++    tv.tv_sec = 0;
++    tv.tv_usec =  SEND_MSEC_POLL * 1000;
++    FD_ZERO(&fds);
++    FD_SET(ConnectionNumber(dpy), &fds);
++#endif
+ 
+     time(&start);
+-    while (endCond(endData) == 0)
++    while (TRUE)
+     {
++       while (XCheckWindowEvent(dpy, commWindow, PropertyChangeMask, &event))
++           serverEventProc(dpy, &event);
++
++       if (endCond(endData) != 0)
++           break;
++       if (!WindowValid(dpy, w))
++           break;
+        time(&now);
+        if (seconds >= 0 && (now - start) >= seconds)
+            break;
+-       if (now != lastChk)
+-       {
+-           lastChk = now;
+-           if (!WindowValid(dpy, w))
+-               break;
+-           /*
+-            * Sometimes the PropertyChange event doesn't come.
+-            * This can be seen in eg: vim -c 'echo remote_expr("gvim", "3+2")'
+-            */
+-           serverEventProc(dpy, NULL);
+-       }
++
++       /* Just look out for the answer without calling back into Vim */
+        if (localLoop)
+        {
+-           /* Just look out for the answer without calling back into Vim */
+ #ifndef HAVE_SELECT
+-           struct pollfd   fds;
+-
+-           fds.fd = ConnectionNumber(dpy);
+-           fds.events = POLLIN;
+            if (poll(&fds, 1, SEND_MSEC_POLL) < 0)
+                break;
+ #else
+-           fd_set          fds;
+-           struct timeval  tv;
+-
+-           tv.tv_sec = 0;
+-           tv.tv_usec =  SEND_MSEC_POLL * 1000;
+-           FD_ZERO(&fds);
+-           FD_SET(ConnectionNumber(dpy), &fds);
+-           if (select(ConnectionNumber(dpy) + 1, &fds, NULL, NULL, &tv) < 0)
++           if (select(FD_SETSIZE, &fds, NULL, NULL, &tv) < 0)
+                break;
+ #endif
+-           while (XEventsQueued(dpy, QueuedAfterReading) > 0)
+-           {
+-               XNextEvent(dpy, &event);
+-               if (event.type == PropertyNotify && e->window == commWindow)
+-                   serverEventProc(dpy, &event);
+-           }
+        }
+        else
+        {
+            if (got_int)
+                break;
+-           ui_delay((long)SEND_MSEC_POLL, TRUE);
++           ui_delay((long)UI_MSEC_DELAY, TRUE);
+            ui_breakcheck();
+        }
+     }
+@@ -655,7 +649,6 @@
+        if (SendInit(dpy) < 0)
+            return NULL;
+     }
+-    ga_init2(&ga, 1, 100);
+ 
+     /*
+      * Read the registry property.
+@@ -1198,9 +1191,8 @@
+        if ((*p == 'c' || *p == 'k') && (p[1] == 0))
+        {
+            Window      resWindow;
+-           char_u      *name, *script, *serial, *end, *res;
++           char_u      *name, *script, *serial, *end;
+            Bool        asKeys = *p == 'k';
+-           garray_T    reply;
+            char_u      *enc;
+ 
+            /*
+@@ -1256,50 +1248,52 @@
+            if (script == NULL || name == NULL)
+                continue;
+ 
+-           /*
+-            * Initialize the result property, so that we're ready at any
+-            * time if we need to return an error.
+-            */
+-           if (resWindow != None)
+-           {
+-               ga_init2(&reply, 1, 100);
++            if (serverName != NULL && STRICMP(name, serverName) == 0)
++            {
++                script = serverConvert(enc, script, &tofree);
++                if (asKeys)
++                    server_to_input_buf(script);
++                else
++                {
++                    char_u      *res;
++
++                    res = eval_client_expr_to_string(script);
++                   if (resWindow != None)
++                   {
++                       garray_T    reply;
++
++                       /* Initialize the result property. */
++                       ga_init2(&reply, 1, 100);
+ #ifdef FEAT_MBYTE
+-               ga_grow(&reply, 50 + STRLEN(p_enc));
+-               sprintf(reply.ga_data, "%cr%c-E %s%c-s %s%c-r ",
++                       ga_grow(&reply, 50 + STRLEN(p_enc));
++                       sprintf(reply.ga_data, "%cr%c-E %s%c-s %s%c-r ",
+                                                   0, 0, p_enc, 0, serial, 0);
+-               reply.ga_len = 14 + STRLEN(p_enc) + STRLEN(serial);
++                       reply.ga_len = 14 + STRLEN(p_enc) + STRLEN(serial);
+ #else
+-               ga_grow(&reply, 50);
+-               sprintf(reply.ga_data, "%cr%c-s %s%c-r ", 0, 0, serial, 0);
+-               reply.ga_len = 10 + STRLEN(serial);
++                       ga_grow(&reply, 50);
++                       sprintf(reply.ga_data, "%cr%c-s %s%c-r ",
++                                                            0, 0, serial, 0);
++                       reply.ga_len = 10 + STRLEN(serial);
+ #endif
+-           }
+-           res = NULL;
+-           if (serverName != NULL && STRICMP(name, serverName) == 0)
+-           {
+-               script = serverConvert(enc, script, &tofree);
+-               if (asKeys)
+-                   server_to_input_buf(script);
+-               else
+-                   res = eval_client_expr_to_string(script);
+-               vim_free(tofree);
+-           }
+-           if (resWindow != None)
+-           {
+-               if (res != NULL)
+-                   ga_concat(&reply, res);
+-               else if (asKeys == 0)
+-               {
+-                   ga_concat(&reply, (char_u *)_(e_invexprmsg));
+-                   ga_append(&reply, 0);
+-                   ga_concat(&reply, (char_u *)"-c 1");
+-               }
+-               ga_append(&reply, NUL);
+-               (void)AppendPropCarefully(dpy, resWindow, commProperty,
+-                                          reply.ga_data, reply.ga_len);
+-               ga_clear(&reply);
+-           }
+-           vim_free(res);
++
++                       /* Evaluate the expression and return the result. */
++                       if (res != NULL)
++                           ga_concat(&reply, res);
++                       else
++                       {
++                           ga_concat(&reply, (char_u *)_(e_invexprmsg));
++                           ga_append(&reply, 0);
++                           ga_concat(&reply, (char_u *)"-c 1");
++                       }
++                       ga_append(&reply, NUL);
++                       (void)AppendPropCarefully(dpy, resWindow, commProperty,
++                                                reply.ga_data, reply.ga_len);
++                       ga_clear(&reply);
++                   }
++                    vim_free(res);
++                }
++                vim_free(tofree);
++            }
+        }
+        else if (*p == 'r' && p[1] == 0)
+        {
 diff -Naur vim73.orig/src/integration.c vim73/src/integration.c
---- vim73.orig/src/integration.c        2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/integration.c     2012-06-03 23:09:53.532022810 +0000
+--- vim73.orig/src/integration.c        2010-08-08 13:09:21.000000000 +0000
++++ vim73/src/integration.c     2012-07-20 20:31:08.974305120 +0000
 @@ -33,7 +33,6 @@
  #include <sys/un.h>
@@ -45947 +50316 @@
  #include <sys/param.h>
 diff -Naur vim73.orig/src/keymap.h vim73/src/keymap.h
---- vim73.orig/src/keymap.h     2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/keymap.h  2012-06-03 23:09:55.220067733 +0000
+--- vim73.orig/src/keymap.h     2010-07-25 13:14:04.000000000 +0000
++++ vim73/src/keymap.h  2012-07-20 20:31:14.177642201 +0000
 @@ -92,13 +92,13 @@
   */
@@ -45985 +50354 @@
  #define K_TEAROFF      TERMCAP2KEY(KS_TEAROFF, KE_FILLER)
 diff -Naur vim73.orig/src/link.sh vim73/src/link.sh
---- vim73.orig/src/link.sh      2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/link.sh   2012-06-03 23:09:53.304016743 +0000
+--- vim73.orig/src/link.sh      2010-07-21 19:43:29.000000000 +0000
++++ vim73/src/link.sh   2012-07-20 20:31:08.227637914 +0000
 @@ -5,7 +5,7 @@
  # libraries when they exist, but this doesn't mean they are needed for Vim.
@@ -46031 +50400 @@
  #
 diff -Naur vim73.orig/src/macros.h vim73/src/macros.h
---- vim73.orig/src/macros.h     2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/macros.h  2012-06-03 23:09:53.080010781 +0000
-@@ -285,3 +285,17 @@
+--- vim73.orig/src/macros.h     2010-07-17 19:41:21.000000000 +0000
++++ vim73/src/macros.h  2012-07-20 20:31:18.307645159 +0000
+@@ -259,6 +259,8 @@
+  * PTR2CHAR(): get character from pointer.
+  */
+ #ifdef FEAT_MBYTE
++/* Get the length of the character p points to */
++# define MB_PTR2LEN(p)         (has_mbyte ? (*mb_ptr2len)(p) : 1)
+ /* Advance multi-byte pointer, skip over composing chars. */
+ # define mb_ptr_adv(p)     p += has_mbyte ? (*mb_ptr2len)(p) : 1
+ /* Advance multi-byte pointer, do not skip over composing chars. */
+@@ -272,6 +274,7 @@
+ # define MB_CHARLEN(p)     (has_mbyte ? mb_charlen(p) : (int)STRLEN(p))
+ # define PTR2CHAR(p)       (has_mbyte ? mb_ptr2char(p) : (int)*(p))
+ #else
++# define MB_PTR2LEN(p)         1
+ # define mb_ptr_adv(p)         ++p
+ # define mb_cptr_adv(p)                ++p
+ # define mb_ptr_back(s, p)     --p
+@@ -285,3 +288,17 @@
  #else
  # define DO_AUTOCHDIR
@@ -46052 +50438 @@
 +#endif
 diff -Naur vim73.orig/src/main.c vim73/src/main.c
---- vim73.orig/src/main.c       2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/main.c    2012-06-03 23:09:55.792082954 +0000
+--- vim73.orig/src/main.c       2010-08-08 13:09:55.000000000 +0000
++++ vim73/src/main.c    2012-07-20 20:31:15.920976784 +0000
 @@ -7,10 +7,6 @@
   * See README.txt for an overview of the Vim source code.
@@ -46453 +50839 @@
   * When FEAT_FKMAP is defined, also compile the Farsi source code.
 diff -Naur vim73.orig/src/mark.c vim73/src/mark.c
---- vim73.orig/src/mark.c       2012-06-03 23:09:52.932006845 +0000
-+++ vim73/src/mark.c    2012-06-03 23:09:53.736028239 +0000
-@@ -1750,7 +1750,10 @@
+--- vim73.orig/src/mark.c       2010-08-13 09:14:35.000000000 +0000
++++ vim73/src/mark.c    2012-07-20 20:31:17.910978208 +0000
+@@ -98,6 +98,19 @@
+        return OK;
+     }
+ 
++#ifdef FEAT_VISUAL
++    if (c == '<')
++    {
++       curbuf->b_visual.vi_start = *pos;
++       return OK;
++    }
++    if (c == '>')
++    {
++       curbuf->b_visual.vi_end = *pos;
++       return OK;
++    }
++#endif
++
+ #ifndef EBCDIC
+     if (c > 'z')           /* some islower() and isupper() cannot handle
+                                characters above 127 */
+@@ -1750,7 +1763,10 @@
             {
                 if (line[1] != NUL)
@@ -46468 +50874 @@
                         case '"': curbuf->b_last_cursor = pos; break;
 diff -Naur vim73.orig/src/mbyte.c vim73/src/mbyte.c
---- vim73.orig/src/mbyte.c      2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/mbyte.c   2012-06-03 23:09:55.956087319 +0000
+--- vim73.orig/src/mbyte.c      2010-07-18 13:05:44.000000000 +0000
++++ vim73/src/mbyte.c   2012-07-20 20:31:16.520977215 +0000
 @@ -132,6 +132,7 @@
  static int dbcs_char2cells __ARGS((int c));
@@ -46922 +51328 @@
         if (input_style & XIMPreeditArea)
 diff -Naur vim73.orig/src/memfile.c vim73/src/memfile.c
---- vim73.orig/src/memfile.c    2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/memfile.c 2012-06-03 23:09:54.088037608 +0000
+--- vim73.orig/src/memfile.c    2010-06-21 02:59:57.000000000 +0000
++++ vim73/src/memfile.c 2012-07-20 20:31:10.797639769 +0000
 @@ -32,10 +32,6 @@
   * file is opened.
@@ -47334 +51740 @@
 diff -Naur vim73.orig/src/memfile_test.c vim73/src/memfile_test.c
 --- vim73.orig/src/memfile_test.c       1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/memfile_test.c    2012-06-03 23:09:53.800029943 +0000
++++ vim73/src/memfile_test.c    2012-07-20 20:31:09.837639076 +0000
 @@ -0,0 +1,145 @@
 +/* vi:set ts=8 sts=4 sw=4:
@@ -47482 +51888 @@
 +}
 diff -Naur vim73.orig/src/memline.c vim73/src/memline.c
---- vim73.orig/src/memline.c    2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/memline.c 2012-06-03 23:09:54.908059430 +0000
+--- vim73.orig/src/memline.c    2010-08-08 13:11:46.000000000 +0000
++++ vim73/src/memline.c 2012-07-20 20:31:13.220974846 +0000
 @@ -42,10 +42,6 @@
   *  mf_get().
@@ -47769 +52175 @@
                         if (process_still_running && choice >= 4)
 diff -Naur vim73.orig/src/menu.c vim73/src/menu.c
---- vim73.orig/src/menu.c       2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/menu.c    2012-06-03 23:09:53.876031965 +0000
+--- vim73.orig/src/menu.c       2010-07-14 14:49:01.000000000 +0000
++++ vim73/src/menu.c    2012-07-20 20:31:10.130972621 +0000
 @@ -1394,7 +1394,8 @@
      int                idx;
@@ -47816 +52222 @@
                 {
 diff -Naur vim73.orig/src/message.c vim73/src/message.c
---- vim73.orig/src/message.c    2012-06-03 23:09:52.956007482 +0000
-+++ vim73/src/message.c 2012-06-03 23:09:55.664079548 +0000
+--- vim73.orig/src/message.c    2010-08-04 18:10:02.000000000 +0000
++++ vim73/src/message.c 2012-07-20 20:31:15.594309884 +0000
 @@ -39,7 +39,6 @@
  static void msg_screen_putchar __ARGS((int c, int attr));
@@ -48408 +52814 @@
         case 2: return VIM_NO;
 diff -Naur vim73.orig/src/misc1.c vim73/src/misc1.c
---- vim73.orig/src/misc1.c      2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/misc1.c   2012-06-03 23:09:55.940086894 +0000
+--- vim73.orig/src/misc1.c      2010-08-15 11:24:05.000000000 +0000
++++ vim73/src/misc1.c   2012-07-20 20:31:17.904311537 +0000
 @@ -363,7 +363,7 @@
  
@@ -48428 +52834 @@
             todo -= (int)curbuf->b_p_ts;
             ++ind_len;
-@@ -1561,6 +1561,9 @@
+@@ -423,27 +423,36 @@
+ {
+     colnr_T    col;
+     pos_T      pos;
+-    regmmatch_T        regmatch;
++
++    regmatch_T regmatch;
++    int                lead_len = 0;   /* length of comment leader */
+ 
+     if (lnum > curbuf->b_ml.ml_line_count)
+        return -1;
+     pos.lnum = 0;
++
++#ifdef FEAT_COMMENTS
++    /* In format_lines() (i.e. not insert mode), fo+=q is needed too...  */
++    if ((State & INSERT) || has_format_option(FO_Q_COMS))
++       lead_len = get_leader_len(ml_get(lnum), NULL, FALSE, TRUE);
++#endif
+     regmatch.regprog = vim_regcomp(curbuf->b_p_flp, RE_MAGIC);
+     if (regmatch.regprog != NULL)
+     {
+-       regmatch.rmm_ic = FALSE;
+-       regmatch.rmm_maxcol = 0;
+-       if (vim_regexec_multi(&regmatch, curwin, curbuf, lnum,
+-                                                           (colnr_T)0, NULL))
++       regmatch.rm_ic = FALSE;
++
++       /* vim_regexec() expects a pointer to a line.  This lets us
++        * start matching for the flp beyond any comment leader...  */
++       if (vim_regexec(&regmatch, ml_get(lnum) + lead_len, (colnr_T)0))
+        {
+-           pos.lnum = regmatch.endpos[0].lnum + lnum;
+-           pos.col = regmatch.endpos[0].col;
++           pos.lnum = lnum;
++           pos.col = (colnr_T)(*regmatch.endp - ml_get(lnum));
+ #ifdef FEAT_VIRTUALEDIT
+            pos.coladd = 0;
+ #endif
+        }
+-       vim_free(regmatch.regprog);
+     }
++    vim_free(regmatch.regprog);
+ 
+     if (pos.lnum == 0 || *ml_get_pos(&pos) == NUL)
+        return -1;
+@@ -502,14 +511,18 @@
+  *         OPENLINE_DO_COM     format comments
+  *         OPENLINE_KEEPTRAIL  keep trailing spaces
+  *         OPENLINE_MARKFIX    adjust mark positions after the line break
++ *         OPENLINE_COM_LIST   format comments with list or 2nd line indent
++ *
++ * "second_line_indent": indent for after ^^D in Insert mode or if flag
++ *                       OPENLINE_COM_LIST
+  *
+  * Return TRUE for success, FALSE for failure
+  */
+     int
+-open_line(dir, flags, old_indent)
++open_line(dir, flags, second_line_indent)
+     int                dir;            /* FORWARD or BACKWARD */
+     int                flags;
+-    int                old_indent;     /* indent for after ^^D in Insert mode */
++    int                second_line_indent;
+ {
+     char_u     *saved_line;            /* copy of the original line */
+     char_u     *next_line = NULL;      /* copy of the next line */
+@@ -650,8 +663,8 @@
+         * count white space on current line
+         */
+        newindent = get_indent_str(saved_line, (int)curbuf->b_p_ts);
+-       if (newindent == 0)
+-           newindent = old_indent;     /* for ^^D command in insert mode */
++       if (newindent == 0 && !(flags & OPENLINE_COM_LIST))
++           newindent = second_line_indent; /* for ^^D command in insert mode */
+ 
+ #ifdef FEAT_SMARTINDENT
+        /*
+@@ -671,7 +684,7 @@
+            ptr = saved_line;
+ # ifdef FEAT_COMMENTS
+            if (flags & OPENLINE_DO_COM)
+-               lead_len = get_leader_len(ptr, NULL, FALSE);
++               lead_len = get_leader_len(ptr, NULL, FALSE, TRUE);
+            else
+                lead_len = 0;
+ # endif
+@@ -693,7 +706,7 @@
+                }
+ # ifdef FEAT_COMMENTS
+                if (flags & OPENLINE_DO_COM)
+-                   lead_len = get_leader_len(ptr, NULL, FALSE);
++                   lead_len = get_leader_len(ptr, NULL, FALSE, TRUE);
+                else
+                    lead_len = 0;
+                if (lead_len > 0)
+@@ -836,7 +849,7 @@
+      */
+     end_comment_pending = NUL;
+     if (flags & OPENLINE_DO_COM)
+-       lead_len = get_leader_len(saved_line, &lead_flags, dir == BACKWARD);
++       lead_len = get_leader_len(saved_line, &lead_flags, dir == BACKWARD, TRUE);
+     else
+        lead_len = 0;
+     if (lead_len > 0)
+@@ -1007,9 +1020,9 @@
+        }
+        if (lead_len)
+        {
+-           /* allocate buffer (may concatenate p_exta later) */
+-           leader = alloc(lead_len + lead_repl_len + extra_space +
+-                                                             extra_len + 1);
++           /* allocate buffer (may concatenate p_extra later) */
++           leader = alloc(lead_len + lead_repl_len + extra_space + extra_len
++                    + (second_line_indent > 0 ? second_line_indent : 0) + 1);
+            allocated = leader;             /* remember to free it later */
+ 
+            if (leader == NULL)
+@@ -1304,6 +1317,21 @@
+     /* concatenate leader and p_extra, if there is a leader */
+     if (lead_len)
+     {
++       if (flags & OPENLINE_COM_LIST && second_line_indent > 0)
++       {
++           int i;
++           int padding = second_line_indent
++                                         - (newindent + (int)STRLEN(leader));
++
++           /* Here whitespace is inserted after the comment char.
++            * Below, set_indent(newindent, SIN_INSERT) will insert the
++            * whitespace needed before the comment char. */
++           for (i = 0; i < padding; i++)
++           {
++               STRCAT(leader, " ");
++               newcol++;
++           }
++       }
+        STRCAT(leader, p_extra);
+        p_extra = leader;
+        did_ai = TRUE;      /* So truncating blanks works with comments */
+@@ -1548,28 +1576,35 @@
+  * When "flags" is not NULL, it is set to point to the flags of the recognized
+  * comment leader.
+  * "backward" must be true for the "O" command.
++ * If "include_space" is set, include trailing whitespace while calculating the
++ * length.
+  */
+     int
+-get_leader_len(line, flags, backward)
++get_leader_len(line, flags, backward, include_space)
+     char_u     *line;
+     char_u     **flags;
+     int                backward;
++    int                include_space;
+ {
+     int                i, j;
++    int                result;
+     int                got_com = FALSE;
+     int                found_one;
      char_u     part_buf[COM_MAX_LEN];  /* buffer for one option part */
      char_u     *string;                /* pointer to comment string */
@@ -48436 +52999 @@
 +    char_u     *saved_flags = NULL;
  
-     i = 0;
+-    i = 0;
++    result = i = 0;
      while (vim_iswhite(line[i]))    /* leading white space is ignored */
-@@ -1569,7 +1572,7 @@
+        ++i;
+ 
      /*
       * Repeat to match several nested comment strings.
@@ -48447 +53012 @@
         /*
          * scan through the 'comments' option for a match
-@@ -1577,82 +1580,104 @@
+@@ -1577,29 +1612,161 @@
         found_one = FALSE;
         for (list = curbuf->b_p_com; *list; )
@@ -48489 +53054 @@
                 continue;
  
--           /*
--            * Line contents and string must match.
 +           /* Line contents and string must match.
-             * When string starts with white space, must have some white space
-             * (but the amount does not need to match, there might be a mix of
--            * TABs and spaces).
--            */
++            * When string starts with white space, must have some white space
++            * (but the amount does not need to match, there might be a mix of
 +            * TABs and spaces). */
-            if (vim_iswhite(string[0]))
-            {
-                if (i == 0 || !vim_iswhite(line[i - 1]))
--                   continue;
++           if (vim_iswhite(string[0]))
++           {
++               if (i == 0 || !vim_iswhite(line[i - 1]))
 +                   continue;  /* missing shite space */
-                while (vim_iswhite(string[0]))
-                    ++string;
-            }
-            for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j)
-                ;
-            if (string[j] != NUL)
--               continue;
++               while (vim_iswhite(string[0]))
++                   ++string;
++           }
++           for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j)
++               ;
++           if (string[j] != NUL)
 +               continue;  /* string doesn't match */
- 
--           /*
--            * When 'b' flag used, there must be white space or an
--            * end-of-line after the string in the line.
--            */
++
 +           /* When 'b' flag used, there must be white space or an
 +            * end-of-line after the string in the line. */
-            if (vim_strchr(part_buf, COM_BLANK) != NULL
-                           && !vim_iswhite(line[i + j]) && line[i + j] != NUL)
-                continue;
- 
--           /*
--            * We have found a match, stop searching.
--            */
--           i += j;
--           got_com = TRUE;
++           if (vim_strchr(part_buf, COM_BLANK) != NULL
++                          && !vim_iswhite(line[i + j]) && line[i + j] != NUL)
++               continue;
++
 +           /* We have found a match, stop searching unless this is a middle
 +            * comment. The middle comment can be a substring of the end
@@ -48547 +53097 @@
 +           if (middle_match_len == 0)
 +               i += j;
-            found_one = TRUE;
-            break;
-        }
- 
--       /*
--        * No match found, stop scanning.
--        */
++           found_one = TRUE;
++           break;
++       }
++
 +       if (middle_match_len != 0)
 +       {
@@ -48565 +53112 @@
 +
 +       /* No match found, stop scanning. */
-        if (!found_one)
++       if (!found_one)
++           break;
++
++       result = i;
++
++       /* Include any trailing white space. */
++       while (vim_iswhite(line[i]))
++           ++i;
++
++       if (include_space)
++           result = i;
++
++       /* If this comment doesn't nest, stop here. */
++       got_com = TRUE;
++       if (vim_strchr(part_buf, COM_NEST) == NULL)
++           break;
++    }
++    return result;
++}
++
++/*
++ * Return the offset at which the last comment in line starts. If there is no
++ * comment in the whole line, -1 is returned.
++ *
++ * When "flags" is not null, it is set to point to the flags describing the
++ * recognized comment leader.
++ */
++    int
++get_last_leader_offset(line, flags)
++    char_u     *line;
++    char_u     **flags;
++{
++    int                result = -1;
++    int                i, j;
++    int                lower_check_bound = 0;
++    char_u     *string;
++    char_u     *com_leader;
++    char_u     *com_flags;
++    char_u     *list;
++    int                found_one;
++    char_u     part_buf[COM_MAX_LEN];  /* buffer for one option part */
++
++    /*
++     * Repeat to match several nested comment strings.
++     */
++    i = (int)STRLEN(line);
++    while (--i >= lower_check_bound)
++    {
++       /*
++        * scan through the 'comments' option for a match
++        */
++       found_one = FALSE;
++       for (list = curbuf->b_p_com; *list; )
++       {
++           char_u *flags_save = list;
++
++           /*
++            * Get one option part into part_buf[].  Advance list to next one.
++            * put string at start of string.
++            */
++           (void)copy_option_part(&list, part_buf, COM_MAX_LEN, ",");
++           string = vim_strchr(part_buf, ':');
++           if (string == NULL) /* If everything is fine, this cannot actually
++                                * happen. */
++           {
++               continue;
++           }
++           *string++ = NUL;    /* Isolate flags from string. */
++           com_leader = string;
++
+            /*
+             * Line contents and string must match.
+             * When string starts with white space, must have some white space
+@@ -1614,7 +1781,7 @@
+                    ++string;
+            }
+            for (j = 0; string[j] != NUL && string[j] == line[i + j]; ++j)
+-               ;
++               /* do nothing */;
+            if (string[j] != NUL)
+                continue;
+ 
+@@ -1623,37 +1790,77 @@
+             * end-of-line after the string in the line.
+             */
+            if (vim_strchr(part_buf, COM_BLANK) != NULL
+-                          && !vim_iswhite(line[i + j]) && line[i + j] != NUL)
++                   && !vim_iswhite(line[i + j]) && line[i + j] != NUL)
++           {
+                continue;
++           }
+ 
+            /*
+             * We have found a match, stop searching.
+             */
+-           i += j;
+-           got_com = TRUE;
+            found_one = TRUE;
++
++           if (flags)
++               *flags = flags_save;
++           com_flags = flags_save;
++
             break;
+        }
+ 
+-       /*
+-        * No match found, stop scanning.
+-        */
+-       if (!found_one)
+-           break;
++       if (found_one)
++       {
++           char_u  part_buf2[COM_MAX_LEN];     /* buffer for one option part */
++           int     len1, len2, off;
  
 -       /*
 -        * Include any trailing white space.
 -        */
-+       /* Include any trailing white space. */
-        while (vim_iswhite(line[i]))
-            ++i;
+-       while (vim_iswhite(line[i]))
+-           ++i;
++           result = i;
++           /*
++            * If this comment nests, continue searching.
++            */
++           if (vim_strchr(part_buf, COM_NEST) != NULL)
++               continue;
  
 -       /*
 -        * If this comment doesn't nest, stop here.
 -        */
-+       /* If this comment doesn't nest, stop here. */
-+       got_com = TRUE;
-        if (vim_strchr(part_buf, COM_NEST) == NULL)
-            break;
+-       if (vim_strchr(part_buf, COM_NEST) == NULL)
+-           break;
++           lower_check_bound = i;
++
++           /* Let's verify whether the comment leader found is a substring
++            * of other comment leaders. If it is, let's adjust the
++            * lower_check_bound so that we make sure that we have determined
++            * the comment leader correctly.
++            */
++
++           while (vim_iswhite(*com_leader))
++               ++com_leader;
++           len1 = (int)STRLEN(com_leader);
++
++           for (list = curbuf->b_p_com; *list; )
++           {
++               char_u *flags_save = list;
++
++               (void)copy_option_part(&list, part_buf2, COM_MAX_LEN, ",");
++               if (flags_save == com_flags)
++                   continue;
++               string = vim_strchr(part_buf2, ':');
++               ++string;
++               while (vim_iswhite(*string))
++                   ++string;
++               len2 = (int)STRLEN(string);
++               if (len2 == 0)
++                   continue;
++
++               /* Now we have to verify whether string ends with a substring
++                * beginning the com_leader. */
++               for (off = (len2 > i ? i : len2); off > 0 && off + len1 > len2;)
++               {
++                   --off;
++                   if (!STRNCMP(string + off, com_leader, len2 - off))
++                   {
++                       if (i - off < lower_check_bound)
++                           lower_check_bound = i - off;
++                   }
++               }
++           }
++       }
      }
-+
-     return (got_com ? i : 0);
+-    return (got_com ? i : 0);
++    return result;
  }
  #endif
-@@ -1907,7 +1932,7 @@
+ 
+@@ -1907,7 +2114,7 @@
      int                c;
  {
@@ -48596 +53300 @@
  
      n = (*mb_char2bytes)(c, buf);
-@@ -2919,7 +2944,7 @@
+@@ -2919,7 +3126,7 @@
      buf_T      *buf;
      int                ff;     /* also reset 'fileformat' */
@@ -48605 +53309 @@
         buf->b_changed = 0;
         ml_setflags(buf);
-@@ -3080,8 +3105,9 @@
+@@ -3080,8 +3287,9 @@
      int
  get_keystroke()
@@ -48617 +53321 @@
      int                n;
      int                save_mapped_ctrl_c = mapped_ctrl_c;
-@@ -3093,12 +3119,29 @@
+@@ -3093,12 +3301,29 @@
         cursor_on();
         out_flush();
@@ -48629 +53333 @@
 +       else if (maxlen < 10)
 +       {
-+           /* Need some more space. This migth happen when receiving a long
++           /* Need some more space. This might happen when receiving a long
 +            * escape sequence. */
 +           buflen += 100;
@@ -48652 +53356 @@
         {
             /* Replace zero and CSI by a special key code. */
-@@ -3110,14 +3153,23 @@
+@@ -3110,14 +3335,23 @@
             ++waited;       /* keep track of the waiting time */
  
@@ -48680 +53384 @@
  
         /* Handle modifier and/or special key code. */
-@@ -3169,7 +3221,7 @@
+@@ -3169,7 +3403,7 @@
         {
             if (MB_BYTE2LEN(n) > len)
@@ -48689 +53393 @@
         }
  #endif
-@@ -3179,6 +3231,7 @@
+@@ -3179,6 +3413,7 @@
  #endif
         break;
@@ -48697 +53401 @@
      mapped_ctrl_c = save_mapped_ctrl_c;
      return n;
-@@ -3323,19 +3376,23 @@
+@@ -3323,19 +3558,23 @@
         if (pn == 1)
         {
@@ -48726 +53430 @@
         {
             set_keep_msg(msg_buf, 0);
-@@ -3492,7 +3549,7 @@
+@@ -3492,7 +3731,7 @@
      if (enc_utf8 && var != NULL)
      {
@@ -48735 +53439 @@
         /* Convert from active codepage to UTF-8.  Other conversions are
          * not done, because they would fail for non-ASCII characters. */
-@@ -3859,11 +3916,13 @@
+@@ -3859,11 +4098,13 @@
   * Vim's version of getenv().
   * Special handling of $HOME, $VIM and $VIMRUNTIME.
@@ -48750 +53454 @@
      char_u     *p;
      char_u     *pend;
-@@ -3885,7 +3944,7 @@
+@@ -3885,7 +4126,7 @@
         if (enc_utf8)
         {
@@ -48759 +53463 @@
             /* Convert from active codepage to UTF-8.  Other conversions are
              * not done, because they would fail for non-ASCII characters. */
-@@ -3929,7 +3988,7 @@
+@@ -3929,7 +4170,7 @@
             if (enc_utf8)
             {
@@ -48768 +53472 @@
                 /* Convert from active codepage to UTF-8.  Other conversions
                  * are not done, because they would fail for non-ASCII
-@@ -3937,7 +3996,7 @@
+@@ -3937,7 +4178,7 @@
                 acp_to_enc(p, (int)STRLEN(p), &pp, &len);
                 if (pp != NULL)
@@ -48777 +53481 @@
                     p = pp;
                     *mustfree = TRUE;
-@@ -4074,17 +4133,6 @@
+@@ -4074,17 +4315,6 @@
         {
             vim_setenv((char_u *)"VIMRUNTIME", p);
@@ -48795 +53499 @@
         else
         {
-@@ -4162,6 +4210,22 @@
+@@ -4162,6 +4392,22 @@
         putenv((char *)envbuf);
      }
@@ -48818 +53522 @@
  
  #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
-@@ -4549,25 +4613,21 @@
+@@ -4220,7 +4466,7 @@
+ {
+     size_t     dirlen = 0, envlen = 0;
+     size_t     len;
+-    char_u     *homedir_env;
++    char_u     *homedir_env, *homedir_env_orig;
+     char_u     *p;
+ 
+     if (src == NULL)
+@@ -4246,13 +4492,31 @@
+        dirlen = STRLEN(homedir);
+ 
+ #ifdef VMS
+-    homedir_env = mch_getenv((char_u *)"SYS$LOGIN");
++    homedir_env_orig = homedir_env = mch_getenv((char_u *)"SYS$LOGIN");
+ #else
+-    homedir_env = mch_getenv((char_u *)"HOME");
++    homedir_env_orig = homedir_env = mch_getenv((char_u *)"HOME");
+ #endif
+-
++    /* Empty is the same as not set. */
+     if (homedir_env != NULL && *homedir_env == NUL)
+        homedir_env = NULL;
++
++#if defined(FEAT_MODIFY_FNAME) || defined(WIN3264)
++    if (homedir_env != NULL && vim_strchr(homedir_env, '~') != NULL)
++    {
++       int     usedlen = 0;
++       int     flen;
++       char_u  *fbuf = NULL;
++
++       flen = (int)STRLEN(homedir_env);
++       (void)modify_fname((char_u *)":p", &usedlen,
++                                                 &homedir_env, &fbuf, &flen);
++       flen = (int)STRLEN(homedir_env);
++       if (flen > 0 && vim_ispathsep(homedir_env[flen - 1]))
++           /* Remove the trailing / that is added to a directory. */
++           homedir_env[flen - 1] = NUL;
++    }
++#endif
++
+     if (homedir_env != NULL)
+        envlen = STRLEN(homedir_env);
+ 
+@@ -4306,6 +4570,9 @@
+     /* if (dstlen == 0) out of space, what to do??? */
+ 
+     *dst = NUL;
++
++    if (homedir_env != homedir_env_orig)
++       vim_free(homedir_env);
+ }
+ 
+ /*
+@@ -4549,25 +4816,21 @@
  vim_ispathsep(c)
      int c;
@@ -48852 +53610 @@
  
  #if defined(FEAT_SEARCHPATH) || defined(PROTO)
-@@ -4907,11 +4967,12 @@
+@@ -4752,8 +5015,8 @@
+     char_u  *
+ FullName_save(fname, force)
+     char_u     *fname;
+-    int                force;      /* force expansion, even when it already looks
+-                              like a full path name */
++    int                force;          /* force expansion, even when it already looks
++                                * like a full path name */
+ {
+     char_u     *buf;
+     char_u     *new_fname = NULL;
+@@ -4907,11 +5170,12 @@
  static int     cin_islinecomment __ARGS((char_u *));
  static int     cin_isterminated __ARGS((char_u *, int, int));
@@ -48866 +53635 @@
  static int     cin_isbreak __ARGS((char_u *));
  static int     cin_is_cpp_baseclass __ARGS((colnr_T *col));
-@@ -4923,6 +4984,7 @@
+@@ -4923,6 +5187,7 @@
  static int     corr_ind_maxparen __ARGS((int ind_maxparen, pos_T *startpos));
  static int     find_last_paren __ARGS((char_u *l, int start, int end));
@@ -48874 +53643 @@
  static int     ind_hash_comment = 0;   /* # starts a comment */
  
-@@ -4968,7 +5030,7 @@
+@@ -4968,7 +5233,7 @@
  }
  
@@ -48883 +53652 @@
   */
      static int
-@@ -5101,6 +5163,9 @@
+@@ -5101,6 +5366,9 @@
      if (STRNCMP(s, "typedef", 7) == 0 && !vim_isIDc(s[7]))
         s = cin_skipcomment(s + 7);
@@ -48893 +53662 @@
         return TRUE;
  
-@@ -5185,6 +5250,50 @@
+@@ -5185,6 +5453,50 @@
      return (*(s = cin_skipcomment(s + i)) == ':' && s[1] != ':');
  }
@@ -48944 +53713 @@
   * Return a pointer to the first non-empty non-comment character after a ':'.
   * Return NULL if not found.
-@@ -5383,8 +5492,7 @@
+@@ -5383,8 +5695,7 @@
  cin_ispreproc(s)
      char_u *s;
@@ -48954 +53723 @@
      return FALSE;
  }
-@@ -5444,8 +5552,11 @@
+@@ -5444,8 +5755,11 @@
  }
  
@@ -48967 +53736 @@
   * both apply in order to determine initializations).
   */
-@@ -5455,21 +5566,35 @@
+@@ -5455,21 +5769,35 @@
      int                incl_open;      /* include '{' at the end as terminator */
      int                incl_comma;     /* recognize a trailing comma */
@@ -49006 +53775 @@
         if (*s)
             s++;
-@@ -5485,21 +5610,41 @@
+@@ -5485,21 +5813,41 @@
   * "sp" points to a string with the line.  When looking at other lines it must
   * be restored to the line.  When it's NULL fetch lines here.
@@ -49049 +53818 @@
      {
         if (cin_iscomment(s))   /* ignore comments */
-@@ -5525,18 +5670,38 @@
+@@ -5525,18 +5873,38 @@
                 retval = TRUE;
             goto done;
@@ -49092 +53861 @@
  
  done:
-@@ -5607,6 +5772,52 @@
+@@ -5607,6 +5975,52 @@
  }
  
@@ -49145 +53914 @@
   *    do
   *       nothing;
-@@ -5754,7 +5965,9 @@
+@@ -5754,7 +6168,9 @@
                 continue;
         }
@@ -49156 +53925 @@
             if (s[1] == ':')
             {
-@@ -5958,7 +6171,7 @@
+@@ -5958,7 +6374,7 @@
  
  /*
@@ -49165 +53934 @@
      static pos_T *
  find_match_paren(ind_maxparen, ind_maxcomment)     /* XXX */
-@@ -6008,7 +6221,7 @@
+@@ -6008,7 +6424,7 @@
  
  /*
@@ -49174 +53943 @@
      static int
  find_last_paren(l, start, end)
-@@ -6021,7 +6234,7 @@
+@@ -6021,7 +6437,7 @@
  
      curwin->w_cursor.col = 0;              /* default is start of line */
@@ -49183 +53952 @@
         i = (int)(cin_skipcomment(l + i) - l); /* ignore parens in comments */
         i = (int)(skip_string(l + i) - l);    /* ignore parens in quotes */
-@@ -6222,6 +6435,17 @@
+@@ -6222,6 +6638,17 @@
       */
      int ind_keep_case_label = 0;
@@ -49201 +53970 @@
      int                amount;
      int                scope_amount;
-@@ -6262,8 +6486,10 @@
+@@ -6257,19 +6684,23 @@
+     int                whilelevel;
+     linenr_T   lnum;
+     char_u     *options;
++    char_u     *digits;
+     int                fraction = 0;       /* init for GCC */
+     int                divider;
      int                n;
      int                iscase;
@@ -49212 +53987 @@
      for (options = curbuf->b_p_cino; *options; )
      {
-@@ -6335,6 +6561,8 @@
+        l = options++;
+        if (*options == '-')
+            ++options;
++       digits = options;           /* remember where the digits start */
+        n = getdigits(&options);
+        divider = 0;
+        if (*options == '.')        /* ".5s" means a fraction */
+@@ -6286,7 +6717,7 @@
+        }
+        if (*options == 's')        /* "2s" means two times 'shiftwidth' */
+        {
+-           if (n == 0 && fraction == 0)
++           if (options == digits)
+                n = curbuf->b_p_sw;     /* just "s" is one 'shiftwidth' */
+            else
+            {
+@@ -6335,6 +6766,8 @@
             case 'J': ind_js = n; break;
             case 'l': ind_keep_case_label = n; break;
@@ -49221 +54012 @@
         if (*options == ',')
             ++options;
-@@ -6424,6 +6652,8 @@
+@@ -6424,6 +6857,8 @@
         /* find how indented the line beginning the comment is */
         getvcol(curwin, trypos, &col, NULL, NULL);
@@ -49230 +54021 @@
         p = curbuf->b_p_com;
         while (*p != NUL)
-@@ -6636,6 +6866,33 @@
+@@ -6636,6 +7071,33 @@
         if (amount == -1)
         {
@@ -49264 +54055 @@
             amount = skip_label(our_paren_pos.lnum, &look, ind_maxcomment);
             look = skipwhite(look);
-@@ -6660,7 +6917,7 @@
+@@ -6660,7 +7122,7 @@
                 curwin->w_cursor.lnum = save_lnum;
                 look = ml_get(our_paren_pos.lnum) + look_col;
@@ -49273 +54064 @@
                                                     && ignore_paren_col == 0))
             {
-@@ -6731,7 +6988,8 @@
+@@ -6731,7 +7193,8 @@
             {
                 /* Line up with the start of the matching paren line. */
@@ -49283 +54074 @@
             {
                 if (cur_amount != MAXCOL)
-@@ -6764,11 +7022,15 @@
+@@ -6764,11 +7227,15 @@
                 {
                     curwin->w_cursor.lnum = our_paren_pos.lnum;
@@ -49302 +54093 @@
                 /*
                  * For a line starting with ')' use the minimum of the two
-@@ -6838,7 +7100,7 @@
+@@ -6838,7 +7305,7 @@
              *                  ldfd) {
              *              }
@@ -49311 +54102 @@
                 amount = get_indent();
             else
-@@ -6901,11 +7163,24 @@
+@@ -6901,11 +7368,24 @@
             if (start_brace == BRACE_IN_COL0)       /* '{' is in column 0 */
             {
@@ -49336 +54127 @@
                 {
                     /* Compensate for adding ind_open_extra later. */
-@@ -7014,7 +7289,8 @@
+@@ -7014,7 +7494,8 @@
                          * (it's a variable declaration).
                          */
@@ -49346 +54137 @@
                             /* if the line is terminated with another ','
                              * it is a continued variable initialization.
-@@ -7076,12 +7352,59 @@
+@@ -7076,12 +7557,59 @@
                         else
                             amount += ind_continuation;
@@ -49411 +54202 @@
                     break;
                 }
-@@ -7466,17 +7789,25 @@
+@@ -7466,17 +7994,25 @@
  
                         /*
@@ -49444 +54235 @@
  
                     /*
-@@ -7757,8 +8088,8 @@
+@@ -7757,8 +8293,8 @@
                          * If we're at the end of a block, skip to the start of
                          * that block.
@@ -49455 +54246 @@
                                                             != NULL) /* XXX */
                         {
-@@ -7820,7 +8151,9 @@
+@@ -7820,7 +8356,9 @@
                 && vim_strchr(theline, '}') == NULL
                 && !cin_ends_in(theline, (char_u *)":", NULL)
@@ -49466 +54257 @@
         {
             amount = ind_func_type;
-@@ -7926,7 +8259,8 @@
+@@ -7926,7 +8464,8 @@
                  * If the line looks like a function declaration, and we're
                  * not in a comment, put it the left margin.
@@ -49476 +54267 @@
                 l = ml_get_curline();
  
-@@ -7947,11 +8281,35 @@
+@@ -7947,11 +8486,35 @@
                     break;
  
@@ -49513 +54304 @@
                     amount = ind_param;
                     break;
-@@ -8856,11 +9214,15 @@
+@@ -8856,11 +9419,15 @@
      }
  
@@ -49530 +54321 @@
         vim_free(buf);
         return 0;
-@@ -8928,7 +9290,10 @@
+@@ -8928,7 +9495,10 @@
          * all entries found with "matchname". */
         if ((p[0] != '.' || starts_with_dot)
@@ -49542 +54333 @@
  #ifdef WIN3264
             STRCPY(s, p);
-@@ -9096,6 +9461,7 @@
+@@ -9096,6 +9666,7 @@
  
      /*
@@ -49550 +54341 @@
       */
      p = buf;
-@@ -9115,7 +9481,12 @@
+@@ -9115,7 +9686,12 @@
             s = p + 1;
         }
@@ -49564 +54355 @@
  #ifdef FEAT_MBYTE
         if (has_mbyte)
-@@ -9132,7 +9503,7 @@
+@@ -9132,7 +9708,7 @@
      e = p;
      *e = NUL;
@@ -49573 +54364 @@
       * component. */
      for (p = buf + wildoff; p < s; ++p)
-@@ -9161,12 +9532,19 @@
+@@ -9161,12 +9737,19 @@
  #ifdef CASE_INSENSITIVE_FILENAME
      regmatch.rm_ic = TRUE;             /* Behave like Terminal.app */
@@ -49595 +54386 @@
         vim_free(buf);
         return 0;
-@@ -9196,7 +9574,10 @@
+@@ -9196,7 +9779,10 @@
             if (dp == NULL)
                 break;
@@ -49607 +54398 @@
                 STRCPY(s, dp->d_name);
                 len = STRLEN(buf);
-@@ -9317,7 +9698,8 @@
+@@ -9317,7 +9903,8 @@
             continue;  /* it's different when it's shorter */
  
@@ -49617 +54408 @@
      }
  
-@@ -9642,7 +10024,7 @@
+@@ -9642,7 +10229,7 @@
      if (paths == NULL)
         return 0;
@@ -49627 +54418 @@
         return 0;
 diff -Naur vim73.orig/src/misc2.c vim73/src/misc2.c
---- vim73.orig/src/misc2.c      2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/misc2.c   2012-06-03 23:09:55.524075823 +0000
+--- vim73.orig/src/misc2.c      2010-08-13 09:14:35.000000000 +0000
++++ vim73/src/misc2.c   2012-07-20 20:31:17.620978002 +0000
 @@ -200,7 +200,6 @@
         }
@@ -49722 +54513 @@
  #endif
  }
-@@ -1003,8 +1012,12 @@
+@@ -806,6 +815,7 @@
+ #else
+ # define KEEP_ROOM (2 * 8192L)
+ #endif
++#define KEEP_ROOM_KB (KEEP_ROOM / 1024L)
+ 
+ /*
+  * Note: if unsigned is 16 bits we can only allocate up to 64K with alloc().
+@@ -931,7 +941,7 @@
+            allocated = 0;
+ # endif
+            /* 3. check for available memory: call mch_avail_mem() */
+-           if (mch_avail_mem(TRUE) < KEEP_ROOM && !releasing)
++           if (mch_avail_mem(TRUE) < KEEP_ROOM_KB && !releasing)
+            {
+                free((char *)p);        /* System is low... no go! */
+                p = NULL;
+@@ -1003,8 +1013,12 @@
      {
         /* Don't hide this message */
@@ -49736 +54544 @@
  }
  
-@@ -1160,7 +1173,7 @@
+@@ -1160,7 +1174,7 @@
      for (buf = firstbuf; buf != NULL; )
      {
@@ -49745 +54553 @@
             buf = nextbuf;      /* didn't work, try next one */
         else
-@@ -1223,7 +1236,7 @@
+@@ -1223,7 +1237,7 @@
  #endif
  
@@ -49754 +54562 @@
      char_u *
  vim_strsave(string)
-@@ -1239,6 +1252,12 @@
+@@ -1239,6 +1253,12 @@
      return p;
  }
@@ -49767 +54575 @@
  vim_strnsave(string, len)
      char_u     *string;
-@@ -1540,7 +1559,7 @@
+@@ -1540,7 +1560,7 @@
             if (enc_utf8)
             {
@@ -49776 +54584 @@
  
                 c = utf_ptr2char(p);
-@@ -1549,21 +1568,21 @@
+@@ -1549,21 +1569,21 @@
                 /* Reallocate string when byte count changes.  This is rare,
                  * thus it's OK to do another malloc()/free(). */
@@ -49803 +54611 @@
             else if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1)
                 p += l;         /* skip multi-byte character */
-@@ -1642,6 +1661,28 @@
+@@ -1642,6 +1662,28 @@
  }
  
@@ -49832 +54640 @@
   * "sep_chars".
   * The part is copied into "buf[maxlen]".
-@@ -2023,24 +2064,22 @@
+@@ -2023,24 +2065,22 @@
      garray_T   *gap;
      int                n;
@@ -49864 +54672 @@
      }
      return OK;
-@@ -2109,6 +2148,25 @@
+@@ -2109,6 +2149,25 @@
      }
  }
@@ -49890 +54698 @@
   * functions that use lookup tables for various things, generally to do with
   * special key codes.
-@@ -2356,10 +2414,21 @@
+@@ -2356,10 +2415,21 @@
      {'<',              (char_u *)"lt"},
  
@@ -49912 +54720 @@
      {K_LEFTMOUSE_NM,   (char_u *)"LeftMouseNM"},
      {K_LEFTDRAG,       (char_u *)"LeftDrag"},
-@@ -2698,6 +2767,7 @@
+@@ -2698,6 +2768,7 @@
      int                bit;
      int                key;
@@ -49920 +54728 @@
      src = *srcp;
      if (src[0] != '<')
-@@ -2710,26 +2780,32 @@
+@@ -2710,26 +2781,32 @@
         if (*bp == '-')
         {
@@ -49964 +54772 @@
         modifiers = 0x0;
         for (bp = src + 1; bp < last_dash; bp++)
-@@ -2748,16 +2824,32 @@
+@@ -2748,16 +2825,32 @@
          */
         if (bp >= last_dash)
@@ -50005 +54813 @@
  
             /*
-@@ -3131,17 +3223,31 @@
+@@ -3131,17 +3224,31 @@
             retval = mch_call_shell(cmd, opt);
         else
@@ -50040 +54848 @@
  #ifdef FEAT_GUI
         --hold_gui_events;
-@@ -3191,7 +3297,7 @@
+@@ -3191,7 +3298,7 @@
  #if defined(FEAT_MBYTE) || defined(PROTO)
  /*
@@ -50049 +54857 @@
   */
      int
-@@ -3199,7 +3305,7 @@
+@@ -3199,7 +3306,7 @@
      char_u     *b;
      char_u     *p;
@@ -50058 +54866 @@
  }
  #endif
-@@ -4210,6 +4316,8 @@
+@@ -4210,6 +4317,8 @@
  static int ff_path_in_stoplist __ARGS((char_u *, int, char_u **));
  #endif
@@ -50067 +54875 @@
  /*
   * if someone likes findfirst/findnext, here are the functions
-@@ -4506,6 +4614,11 @@
+@@ -4506,6 +4615,11 @@
         len = 0;
         while (*wc_part != NUL)
@@ -50079 +54887 @@
             {
                 ff_expand_buffer[len++] = *wc_part++;
-@@ -4551,6 +4664,12 @@
+@@ -4551,6 +4665,12 @@
      }
  
@@ -50092 +54900 @@
      add_pathsep(ff_expand_buffer);
      STRCAT(ff_expand_buffer, search_ctx->ffsc_fix_path);
-@@ -4597,9 +4716,8 @@
+@@ -4597,9 +4717,8 @@
      {
         if (r_ptr[0] == '\\' && r_ptr[1] == ';')
@@ -50104 +54912 @@
             r_ptr++;
         }
-@@ -4858,10 +4976,13 @@
+@@ -4858,10 +4977,13 @@
                         stackp->ffs_filearray_size = 0;
                 }
@@ -50119 +54927 @@
                 stackp->ffs_filearray_cur = 0;
                 stackp->ffs_stage = 0;
-@@ -6443,3 +6564,23 @@
+@@ -6443,3 +6565,23 @@
  #endif
  
@@ -50144 +54952 @@
 +#endif
 diff -Naur vim73.orig/src/move.c vim73/src/move.c
---- vim73.orig/src/move.c       2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/move.c    2012-06-03 23:09:55.652079228 +0000
+--- vim73.orig/src/move.c       2010-08-08 13:12:31.000000000 +0000
++++ vim73/src/move.c    2012-07-20 20:31:15.540976512 +0000
 @@ -362,7 +362,7 @@
  #endif
@@ -50235 +55043 @@
 diff -Naur vim73.orig/src/msvc2010.bat vim73/src/msvc2010.bat
 --- vim73.orig/src/msvc2010.bat 1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/msvc2010.bat      2012-06-03 23:09:54.252041972 +0000
++++ vim73/src/msvc2010.bat      2012-07-20 20:31:11.317640143 +0000
 @@ -0,0 +1,7 @@
 +@echo off
@@ -50245 +55053 @@
 +call "%VS100COMNTOOLS%%vsvars32.bat"
 diff -Naur vim73.orig/src/netbeans.c vim73/src/netbeans.c
---- vim73.orig/src/netbeans.c   2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/netbeans.c        2012-06-03 23:09:55.748081783 +0000
+--- vim73.orig/src/netbeans.c   2010-08-09 20:48:09.000000000 +0000
++++ vim73/src/netbeans.c        2012-07-20 20:31:15.804310035 +0000
 @@ -14,12 +14,15 @@
   * which are *between* characters, whereas vim uses line number
@@ -50901 +55709 @@
  
 diff -Naur vim73.orig/src/normal.c vim73/src/normal.c
---- vim73.orig/src/normal.c     2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/normal.c  2012-06-03 23:09:55.900085828 +0000
+--- vim73.orig/src/normal.c     2010-07-31 13:25:19.000000000 +0000
++++ vim73/src/normal.c  2012-07-20 20:31:18.050978309 +0000
 @@ -20,15 +20,18 @@
   */
@@ -51012 +55820 @@
  # ifdef FEAT_VIRTUALEDIT
      int                    include_line_break = FALSE;
+@@ -1419,7 +1451,7 @@
+      * This could call do_pending_operator() recursively, but that's OK
+      * because gui_yank will be TRUE for the nested call.
+      */
+-    if (clip_star.available
++    if ((clip_star.available || clip_plus.available)
+            && oap->op_type != OP_NOP
+            && !gui_yank
+ # ifdef FEAT_VISUAL
 @@ -1517,22 +1549,31 @@
  #ifdef FEAT_VISUAL
@@ -51134 +55951 @@
                 }
             }
+@@ -1910,7 +1968,7 @@
+                beep_flush();
+            else
+            {
+-               (void)do_join(oap->line_count, oap->op_type == OP_JOIN, TRUE);
++               (void)do_join(oap->line_count, oap->op_type == OP_JOIN, TRUE, TRUE);
+                auto_format(FALSE, TRUE);
+            }
+            break;
 @@ -1920,7 +1978,10 @@
             VIsual_reselect = FALSE;        /* don't reselect now */
@@ -51223 +56049 @@
  #else
      EMSG(_("E775: Eval feature not available"));
+@@ -4342,7 +4426,7 @@
+            break;
+        }
+ #ifdef FEAT_COMMENTS
+-       if (get_leader_len(ml_get_curline(), NULL, FALSE) > 0)
++       if (get_leader_len(ml_get_curline(), NULL, FALSE, TRUE) > 0)
+        {
+            /* Ignore this line, continue at start of next line. */
+            ++curwin->w_cursor.lnum;
 @@ -4501,6 +4585,7 @@
                 }
@@ -51347 +56182 @@
      }
  }
-@@ -8524,7 +8643,7 @@
+@@ -8274,10 +8393,12 @@
+ 
+ #ifdef FEAT_WINDOWS
+     case 't':
+-       goto_tabpage((int)cap->count0);
++       if (!checkclearop(oap))
++           goto_tabpage((int)cap->count0);
+        break;
+     case 'T':
+-       goto_tabpage(-(int)cap->count1);
++       if (!checkclearop(oap))
++           goto_tabpage(-(int)cap->count1);
+        break;
+ #endif
+ 
+@@ -8524,7 +8645,7 @@
      else
         curwin->w_curswant = 0;
@@ -51356 +56206 @@
  }
  
-@@ -8736,7 +8855,7 @@
+@@ -8736,7 +8857,7 @@
         {
             --pp->col;
@@ -51365 +56215 @@
         }
         else if (pp->lnum > 1)
-@@ -9261,7 +9380,7 @@
+@@ -9205,7 +9326,7 @@
+        {
+            prep_redo(cap->oap->regname, cap->count0,
+                         NUL, cap->cmdchar, NUL, NUL, cap->nchar);
+-           (void)do_join(cap->count0, cap->nchar == NUL, TRUE);
++           (void)do_join(cap->count0, cap->nchar == NUL, TRUE, TRUE);
+        }
+     }
+ }
+@@ -9261,7 +9382,7 @@
  # ifdef FEAT_CLIPBOARD
             adjust_clip_reg(&regname);
@@ -51375 +56234 @@
  # endif
 diff -Naur vim73.orig/src/ops.c vim73/src/ops.c
---- vim73.orig/src/ops.c        2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/ops.c     2012-06-03 23:09:55.844084339 +0000
-@@ -1584,9 +1584,11 @@
+--- vim73.orig/src/ops.c        2010-08-01 12:16:08.000000000 +0000
++++ vim73/src/ops.c     2012-07-20 20:31:18.057644980 +0000
+@@ -112,6 +112,9 @@
+ # endif
+ #endif
+ static void    dis_msg __ARGS((char_u *p, int skip_esc));
++#if defined(FEAT_COMMENTS) || defined(PROTO)
++static char_u  *skip_comment __ARGS((char_u *line, int process, int include_space, int *is_comment));
++#endif
+ #ifdef FEAT_VISUAL
+ static void    block_prep __ARGS((oparg_T *oap, struct block_def *, linenr_T, int));
+ #endif
+@@ -959,8 +962,14 @@
+      * selection too. */
+     if (name == '*' && clip_star.available)
+     {
+-       if (clip_isautosel())
+-           clip_update_selection();
++       if (clip_isautosel_star())
++           clip_update_selection(&clip_star);
++       may_get_selection(name);
++    }
++    if (name == '+' && clip_plus.available)
++    {
++       if (clip_isautosel_plus())
++           clip_update_selection(&clip_plus);
+        may_get_selection(name);
+     }
+ #endif
+@@ -1584,9 +1593,11 @@
  adjust_clip_reg(rp)
      int                *rp;
@@ -51392 +56278 @@
         *rp = 0;
      if (!clip_plus.available && *rp == '+')
-@@ -1646,9 +1648,12 @@
+@@ -1646,9 +1657,12 @@
             && !oap->block_mode
  #endif
@@ -51406 +56292 @@
         if (*ptr == NUL && inindent(0))
             oap->motion_type = MLINE;
-@@ -1715,9 +1720,14 @@
+@@ -1715,9 +1729,14 @@
                 did_yank = TRUE;
         }
@@ -51417 +56303 @@
 +       if ((
 +#ifdef FEAT_CLIPBOARD
-+            ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') ||
-+            ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') ||
++           ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') ||
++           ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') ||
 +#endif
 +           oap->regname == 0) && oap->motion_type != MLINE
@@ -51424 +56310 @@
         {
             oap->regname = '-';
-@@ -1918,38 +1928,66 @@
+@@ -1918,38 +1937,66 @@
                     curwin->w_cursor.coladd = 0;
             }
@@ -51495 +56381 @@
 +           }
 +           if (curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count)
-+               (void)do_join(2, FALSE, FALSE);
++               (void)do_join(2, FALSE, FALSE, FALSE);
         }
      }
  
-@@ -2569,7 +2607,8 @@
+@@ -2569,7 +2616,8 @@
         firstline = ml_get(oap->start.lnum) + bd.textcol;
         if (oap->op_type == OP_APPEND)
@@ -51509 +56395 @@
             ins_text = vim_strnsave(firstline, (int)ins_len);
             if (ins_text != NULL)
-@@ -2842,6 +2881,9 @@
+@@ -2842,6 +2890,9 @@
      char_u             *p;
      char_u             *pnew;
@@ -51519 +56405 @@
                                     /* check for read-only register */
      if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE))
-@@ -3000,6 +3042,8 @@
+@@ -3000,6 +3051,8 @@
                         }
  #endif
@@ -51528 +56414 @@
  #ifdef FEAT_VIRTUALEDIT
                             || is_oneChar
-@@ -3008,8 +3052,6 @@
+@@ -3008,8 +3061,6 @@
                         bd.textlen = 0;
                     else
@@ -51537 +56423 @@
                     }
                     bd.textstart = p + startcol;
-@@ -3115,7 +3157,8 @@
+@@ -3115,7 +3166,8 @@
       */
      if (clip_star.available
@@ -51547 +56433 @@
         if (curr != &(y_regs[STAR_REGISTER]))
             /* Copy the text from register 0 to the clipboard register. */
-@@ -3123,6 +3166,9 @@
+@@ -3123,6 +3175,9 @@
  
         clip_own_selection(&clip_star);
@@ -51557 +56443 @@
  
  # ifdef FEAT_X11
-@@ -3130,12 +3176,18 @@
+@@ -3130,12 +3185,19 @@
       * If we were yanking to the '+' register, send result to selection.
       * Also copy to the '*' register, in case auto-select is off.
@@ -51575 +56461 @@
         clip_gen_set_selection(&clip_plus);
 -       if (!clip_isautosel())
-+       if (!clip_isautosel() && !did_star && curr == &(y_regs[PLUS_REGISTER]))
++       if (!clip_isautosel_star() && !did_star
++                                         && curr == &(y_regs[PLUS_REGISTER]))
         {
             copy_yank_reg(&(y_regs[STAR_REGISTER]));
             clip_own_selection(&clip_star);
-@@ -3293,8 +3345,8 @@
+@@ -3293,8 +3355,8 @@
         if (regname == '=')
         {
@@ -51590 +56477 @@
             {
                 y_size = 0;
-@@ -3310,7 +3362,7 @@
+@@ -3310,7 +3372,7 @@
                         if (y_array != NULL)
                             *ptr = NUL;
@@ -51599 +56486 @@
                         {
                             y_type = MLINE;
-@@ -3979,7 +4031,12 @@
+@@ -3979,7 +4041,12 @@
      for (i = -1; i < NUM_REGISTERS && !got_int; ++i)
      {
@@ -51613 +56500 @@
  
  #ifdef FEAT_CLIPBOARD
-@@ -4153,9 +4210,10 @@
+@@ -4140,22 +4207,101 @@
+     ui_breakcheck();
+ }
+ 
++#if defined(FEAT_COMMENTS) || defined(PROTO)
++/*
++ * If "process" is TRUE and the line begins with a comment leader (possibly
++ * after some white space), return a pointer to the text after it. Put a boolean
++ * value indicating whether the line ends with an unclosed comment in
++ * "is_comment".
++ * line - line to be processed,
++ * process - if FALSE, will only check whether the line ends with an unclosed
++ *          comment,
++ * include_space - whether to also skip space following the comment leader,
++ * is_comment - will indicate whether the current line ends with an unclosed
++ *             comment.
++ */
++    static char_u *
++skip_comment(line, process, include_space, is_comment)
++    char_u   *line;
++    int      process;
++    int             include_space;
++    int      *is_comment;
++{
++    char_u *comment_flags = NULL;
++    int    lead_len;
++    int    leader_offset = get_last_leader_offset(line, &comment_flags);
++
++    *is_comment = FALSE;
++    if (leader_offset != -1)
++    {
++       /* Let's check whether the line ends with an unclosed comment.
++        * If the last comment leader has COM_END in flags, there's no comment.
++        */
++       while (*comment_flags)
++       {
++           if (*comment_flags == COM_END
++                   || *comment_flags == ':')
++               break;
++           ++comment_flags;
++       }
++       if (*comment_flags != COM_END)
++           *is_comment = TRUE;
++    }
++
++    if (process == FALSE)
++       return line;
++
++    lead_len = get_leader_len(line, &comment_flags, FALSE, include_space);
++
++    if (lead_len == 0)
++       return line;
++
++    /* Find:
++     * - COM_END,
++     * - colon,
++     * whichever comes first.
++     */
++    while (*comment_flags)
++    {
++       if (*comment_flags == COM_END
++               || *comment_flags == ':')
++       {
++           break;
++       }
++       ++comment_flags;
++    }
++
++    /* If we found a colon, it means that we are not processing a line
++     * starting with a closing part of a three-part comment. That's good,
++     * because we don't want to remove those as this would be annoying.
++     */
++    if (*comment_flags == ':' || *comment_flags == NUL)
++       line += lead_len;
++
++    return line;
++}
++#endif
++
+ /*
+  * Join 'count' lines (minimal 2) at cursor position.
+  * When "save_undo" is TRUE save lines for undo first.
++ * Set "use_formatoptions" to FALSE when e.g. processing
++ * backspace and comment leaders should not be removed.
+  *
+  * return FAIL for failure, OK otherwise
+  */
+     int
+-do_join(count, insert_space, save_undo)
++do_join(count, insert_space, save_undo, use_formatoptions)
+     long    count;
+     int            insert_space;
      int            save_undo;
++    int            use_formatoptions UNUSED;
  {
      char_u     *curr = NULL;
@@ -51625 +56604 @@
      int                endcurr2 = NUL;
      int                currsize = 0;   /* size of the current line */
-@@ -4181,7 +4239,7 @@
+@@ -4163,6 +4309,13 @@
+     linenr_T   t;
+     colnr_T    col = 0;
+     int                ret = OK;
++#if defined(FEAT_COMMENTS) || defined(PROTO)
++    int                *comments = NULL;
++    int                remove_comments = (use_formatoptions == TRUE)
++                                 && has_format_option(FO_REMOVE_COMS);
++    int                prev_was_comment;
++#endif
++
+ 
+     if (save_undo && u_save((linenr_T)(curwin->w_cursor.lnum - 1),
+                            (linenr_T)(curwin->w_cursor.lnum + count)) == FAIL)
+@@ -4174,6 +4327,17 @@
+     spaces = lalloc_clear((long_u)count, TRUE);
+     if (spaces == NULL)
+        return FAIL;
++#if defined(FEAT_COMMENTS) || defined(PROTO)
++    if (remove_comments)
++    {
++       comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE);
++       if (comments == NULL)
++       {
++           vim_free(spaces);
++           return FAIL;
++       }
++    }
++#endif
+ 
+     /*
+      * Don't move anything, just compute the final line length
+@@ -4181,7 +4345,26 @@
       */
      for (t = 0; t < count; ++t)
@@ -51631 +56642 @@
 -       curr = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
 +       curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
++#if defined(FEAT_COMMENTS) || defined(PROTO)
++       if (remove_comments)
++       {
++           /* We don't want to remove the comment leader if the
++            * previous line is not a comment. */
++           if (t > 0 && prev_was_comment)
++           {
++
++               char_u *new_curr = skip_comment(curr, TRUE, insert_space,
++                                                          &prev_was_comment);
++               comments[t] = (int)(new_curr - curr);
++               curr = new_curr;
++           }
++           else
++               curr = skip_comment(curr, FALSE, insert_space,
++                                                          &prev_was_comment);
++       }
++#endif
++
         if (insert_space && t > 0)
         {
             curr = skipwhite(curr);
-@@ -4265,10 +4323,10 @@
+@@ -4265,10 +4448,14 @@
             copy_spaces(cend, (size_t)(spaces[t]));
         }
@@ -51644 +56674 @@
 -       curr = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1));
 +       curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1));
++#if defined(FEAT_COMMENTS) || defined(PROTO)
++       if (remove_comments)
++           curr += comments[t - 1];
++#endif
         if (insert_space && t > 1)
             curr = skipwhite(curr);
         currsize = (int)STRLEN(curr);
-@@ -4388,7 +4446,7 @@
+@@ -4306,6 +4493,10 @@
+ 
+ theend:
+     vim_free(spaces);
++#if defined(FEAT_COMMENTS) || defined(PROTO)
++    if (remove_comments)
++       vim_free(comments);
++#endif
+     return ret;
+ }
+ 
+@@ -4388,7 +4579,7 @@
  #endif
  
@@ -51656 +56701 @@
      void
  op_format(oap, keep_cursor)
-@@ -5712,7 +5770,9 @@
+@@ -4539,9 +4730,11 @@
+     char_u     *leader_flags = NULL;   /* flags for leader of current line */
+     char_u     *next_leader_flags;     /* flags for leader of next line */
+     int                do_comments;            /* format comments */
++    int                do_comments_list = 0;   /* format comments with 'n' or '2' */
+ #endif
+     int                advance = TRUE;
+-    int                second_indent = -1;
++    int                second_indent = -1;     /* indent for second line (comment
++                                        * aware) */
+     int                do_second_indent;
+     int                do_number_indent;
+     int                do_trail_white;
+@@ -4644,18 +4837,46 @@
+            if (first_par_line
+                    && (do_second_indent || do_number_indent)
+                    && prev_is_end_par
+-                   && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count
++                   && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count)
++           {
++               if (do_second_indent && !lineempty(curwin->w_cursor.lnum + 1))
++               {
+ #ifdef FEAT_COMMENTS
+-                   && leader_len == 0
+-                   && next_leader_len == 0
++                   if (leader_len == 0 && next_leader_len == 0)
++                   {
++                       /* no comment found */
+ #endif
+-                   )
+-           {
+-               if (do_second_indent
+-                       && !lineempty(curwin->w_cursor.lnum + 1))
+-                   second_indent = get_indent_lnum(curwin->w_cursor.lnum + 1);
++                       second_indent =
++                                  get_indent_lnum(curwin->w_cursor.lnum + 1);
++#ifdef FEAT_COMMENTS
++                   }
++                   else
++                   {
++                       second_indent = next_leader_len;
++                       do_comments_list = 1;
++                   }
++#endif
++               }
+                else if (do_number_indent)
+-                   second_indent = get_number_indent(curwin->w_cursor.lnum);
++               {
++#ifdef FEAT_COMMENTS
++                   if (leader_len == 0 && next_leader_len == 0)
++                   {
++                       /* no comment found */
++#endif
++                       second_indent =
++                                    get_number_indent(curwin->w_cursor.lnum);
++#ifdef FEAT_COMMENTS
++                   }
++                   else
++                   {
++                       /* get_number_indent() is now "comment aware"... */
++                       second_indent =
++                                    get_number_indent(curwin->w_cursor.lnum);
++                       do_comments_list = 1;
++                   }
++#endif
++               }
+            }
+ 
+            /*
+@@ -4694,6 +4915,8 @@
+                insertchar(NUL, INSCHAR_FORMAT
+ #ifdef FEAT_COMMENTS
+                        + (do_comments ? INSCHAR_DO_COM : 0)
++                       + (do_comments && do_comments_list
++                                                      ? INSCHAR_COM_LIST : 0)
+ #endif
+                        + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent);
+                State = old_State;
+@@ -4730,7 +4953,7 @@
+                                                      (long)-next_leader_len);
+ #endif
+                curwin->w_cursor.lnum--;
+-               if (do_join(2, TRUE, FALSE) == FAIL)
++               if (do_join(2, TRUE, FALSE, FALSE) == FAIL)
+                {
+                    beep_flush();
+                    break;
+@@ -4786,7 +5009,7 @@
+ 
+     ptr = ml_get(lnum);
+     if (do_comments)
+-       *leader_len = get_leader_len(ptr, leader_flags, FALSE);
++       *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE);
+     else
+        *leader_len = 0;
+ 
+@@ -5712,7 +5935,9 @@
      }
  }
@@ -51667 +56808 @@
  clip_yank_selection(type, str, len, cbd)
      int                type;
-@@ -6069,9 +6129,6 @@
+@@ -6069,9 +6294,6 @@
      if (yank_type == MBLOCK)
         yank_type = MAUTO;
@@ -51677 +56818 @@
  
  # ifdef FEAT_CLIPBOARD
-@@ -6092,13 +6149,14 @@
+@@ -6092,13 +6314,14 @@
   * is appended.
   */
@@ -51694 +56835 @@
      long       start;
      long       i;
-@@ -6115,6 +6173,12 @@
+@@ -6115,6 +6338,12 @@
      if (y_ptr->y_array == NULL)                /* NULL means empty register */
         y_ptr->y_size = 0;
@@ -51707 +56848 @@
       * Count the number of lines within the string
       */
-@@ -6261,7 +6325,7 @@
+@@ -6236,7 +6465,7 @@
+     long       chars = 0;
+     int                is_word = 0;
+ 
+-    for (i = 0; line[i] && i < limit; )
++    for (i = 0; i < limit && line[i] != NUL; )
+     {
+        if (is_word)
+        {
+@@ -6261,7 +6490,7 @@
      *wc += words;
  
@@ -51717 +56867 @@
         chars += eol_size;
 diff -Naur vim73.orig/src/option.c vim73/src/option.c
---- vim73.orig/src/option.c     2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/option.c  2012-06-03 23:09:55.676079868 +0000
+--- vim73.orig/src/option.c     2010-08-04 18:49:18.000000000 +0000
++++ vim73/src/option.c  2012-07-20 20:31:18.180978402 +0000
 @@ -140,9 +140,6 @@
  #define PV_MOD         OPT_BUF(BV_MOD)
@@ -51944 +57094 @@
  #ifdef FEAT_WILDMENU
                             (char_u *)&p_wmnu, PV_NONE,
+@@ -3145,7 +3154,7 @@
+        {
+ #ifdef HAVE_AVAIL_MEM
+            /* Use amount of memory available at this moment. */
+-           n = (mch_avail_mem(FALSE) >> 11);
++           n = (mch_avail_mem(FALSE) >> 1);
+ #else
+ # ifdef HAVE_TOTAL_MEM
+            /* Use amount of memory available to Vim. */
 @@ -3843,6 +3852,8 @@
  # ifndef OS2   /* Always use bourne shell style redirection if we reach this */
@@ -52072 +57231 @@
      check_string_option(&buf->b_p_cinw);
  #endif
+@@ -6635,7 +6702,7 @@
+     {
+        for (s = *varp; *s;)
+        {
+-           while(*s == ',' || *s == ' ')
++           while (*s == ',' || *s == ' ')
+                s++;
+            if (!*s)
+                break;
 @@ -6999,8 +7066,10 @@
      }
@@ -52095 +57263 @@
      {
         if (*s == '-' || *s == '+')
-@@ -7304,7 +7376,7 @@
+@@ -7304,8 +7376,9 @@
      static char_u *
  check_clipboard_option()
  {
 -    int                new_unnamed = FALSE;
+-    int                new_autoselect = FALSE;
 +    int                new_unnamed = 0;
-     int                new_autoselect = FALSE;
++    int                new_autoselect_star = FALSE;
++    int                new_autoselect_plus = FALSE;
      int                new_autoselectml = FALSE;
      int                new_html = FALSE;
-@@ -7316,9 +7388,15 @@
+     regprog_T  *new_exclude_prog = NULL;
+@@ -7316,17 +7389,29 @@
      {
         if (STRNCMP(p, "unnamed", 7) == 0 && (p[7] == ',' || p[7] == NUL))
@@ -52112 +57283 @@
             p += 7;
         }
-+        else if (STRNCMP(p, "unnamedplus", 11) == 0
++       else if (STRNCMP(p, "unnamedplus", 11) == 0
 +                                           && (p[11] == ',' || p[11] == NUL))
 +       {
@@ -52119 +57290 @@
 +       }
         else if (STRNCMP(p, "autoselect", 10) == 0
-                                        && (p[10] == ',' || p[10] == NUL))
+-                                       && (p[10] == ',' || p[10] == NUL))
++                                           && (p[10] == ',' || p[10] == NUL))
         {
-@@ -7483,14 +7561,36 @@
+-           new_autoselect = TRUE;
++           new_autoselect_star = TRUE;
+            p += 10;
+        }
++       else if (STRNCMP(p, "autoselectplus", 14) == 0
++                                           && (p[14] == ',' || p[14] == NUL))
++       {
++           new_autoselect_plus = TRUE;
++           p += 14;
++       }
+        else if (STRNCMP(p, "autoselectml", 12) == 0
+-                                       && (p[12] == ',' || p[12] == NUL))
++                                           && (p[12] == ',' || p[12] == NUL))
+        {
+            new_autoselectml = TRUE;
+            p += 12;
+@@ -7355,7 +7440,8 @@
+     if (errmsg == NULL)
+     {
+        clip_unnamed = new_unnamed;
+-       clip_autoselect = new_autoselect;
++       clip_autoselect_star = new_autoselect_star;
++       clip_autoselect_plus = new_autoselect_plus;
+        clip_autoselectml = new_autoselectml;
+        clip_html = new_html;
+        vim_free(clip_exclude_prog);
+@@ -7483,14 +7569,36 @@
         compatible_set();
      }
@@ -52161 +57359 @@
         /* If 'relativenumber' is set, reset 'number'. */
         if ((int *)varp == &curwin->w_p_nu && curwin->w_p_nu)
-@@ -7735,8 +7835,6 @@
+@@ -7735,8 +7843,6 @@
      {
         if (curwin->w_p_wrap)
@@ -52170 +57368 @@
  
  #ifdef FEAT_WINDOWS
-@@ -7763,9 +7861,9 @@
+@@ -7763,9 +7869,9 @@
  #ifdef FEAT_BEVAL
      else if ((int *)varp == &p_beval)
@@ -52182 +57380 @@
      }
  #endif
-@@ -7798,6 +7896,10 @@
+@@ -7798,6 +7904,10 @@
         /* Only de-activate it here, it will be enabled when changing mode. */
         if (p_imdisable)
@@ -52193 +57391 @@
  #endif
  
-@@ -7959,31 +8061,8 @@
+@@ -7959,31 +8069,8 @@
             curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
  # endif
@@ -52225 +57423 @@
  
      /*
-@@ -7993,7 +8072,9 @@
+@@ -7993,7 +8080,9 @@
      options[opt_idx].flags |= P_WAS_SET;
  
@@ -52236 +57434 @@
  
      return NULL;
-@@ -8508,8 +8589,9 @@
+@@ -8508,8 +8597,9 @@
      options[opt_idx].flags |= P_WAS_SET;
  
@@ -52248 +57446 @@
  
      return errmsg;
-@@ -8523,8 +8605,8 @@
+@@ -8523,8 +8613,8 @@
      long_u     flags;
  {
@@ -52259 +57457 @@
  #ifdef FEAT_WINDOWS
      if ((flags & P_RSTAT) || all)      /* mark all status lines dirty */
-@@ -8535,7 +8617,7 @@
+@@ -8535,7 +8625,7 @@
         changed_window_setting();
      if (flags & P_RBUF)
@@ -52268 +57466 @@
      else if (all)
         redraw_all_later(NOT_VALID);
-@@ -9172,7 +9254,7 @@
+@@ -9172,7 +9262,7 @@
      int                expand;
  {
@@ -52277 +57475 @@
      if (fprintf(fd, "%s %s=", cmd, name) < 0)
         return FAIL;
-@@ -9190,9 +9272,16 @@
+@@ -9190,9 +9280,16 @@
         }
         else if (expand)
@@ -52294 +57492 @@
         else if (put_escstr(fd, *valuep, 2) == FAIL)
             return FAIL;
-@@ -9645,9 +9734,6 @@
+@@ -9645,9 +9742,6 @@
         case PV_MA:     return (char_u *)&(curbuf->b_p_ma);
         case PV_MOD:    return (char_u *)&(curbuf->b_changed);
@@ -52304 +57502 @@
  #ifdef FEAT_TEXTOBJ
         case PV_QE:     return (char_u *)&(curbuf->b_p_qe);
-@@ -9756,6 +9842,9 @@
+@@ -9756,6 +9850,9 @@
  #ifdef FEAT_SCROLLBIND
      to->wo_scb = from->wo_scb;
@@ -52314 +57512 @@
      to->wo_spell = from->wo_spell;
  #endif
-@@ -9995,9 +10084,6 @@
+@@ -9995,9 +10092,6 @@
             /* Don't copy 'filetype', it must be detected */
             buf->b_p_ft = empty_option;
@@ -52324 +57522 @@
  #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
             buf->b_p_cinw = vim_strsave(p_cinw);
-@@ -10011,7 +10097,7 @@
+@@ -10011,7 +10105,7 @@
             buf->b_p_smc = p_smc;
  #endif
@@ -52333 +57531 @@
             buf->b_s.b_p_spf = vim_strsave(p_spf);
             buf->b_s.b_p_spl = vim_strsave(p_spl);
-@@ -10877,7 +10963,8 @@
+@@ -10877,7 +10971,8 @@
  shortmess(x)
      int            x;
@@ -52343 +57541 @@
                 && vim_strchr((char_u *)SHM_A, x) != NULL));
  }
-@@ -11284,16 +11371,19 @@
+@@ -11284,16 +11379,19 @@
   * from when editing started (save_file_ff() called).
   * Also when 'endofline' was changed and 'binary' is set, or when 'bomb' was
@@ -52367 +57565 @@
         return FALSE;
 diff -Naur vim73.orig/src/option.h vim73/src/option.h
---- vim73.orig/src/option.h     2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/option.h  2012-06-03 23:09:55.460074120 +0000
+--- vim73.orig/src/option.h     2010-07-25 14:15:02.000000000 +0000
++++ vim73/src/option.h  2012-07-20 20:31:18.070978324 +0000
 @@ -33,7 +33,7 @@
  #     ifdef EBCDIC
@@ -52378 +57576 @@
  #    endif
  #   endif
-@@ -169,10 +169,12 @@
+@@ -104,10 +104,11 @@
+ #define FO_ONE_LETTER  '1'
+ #define FO_WHITE_PAR   'w'     /* trailing white space continues paragr. */
+ #define FO_AUTO                'a'     /* automatic formatting */
++#define FO_REMOVE_COMS 'j'     /* remove comment leaders when joining lines */
+ 
+ #define DFLT_FO_VI     "vt"
+ #define DFLT_FO_VIM    "tcq"
+-#define FO_ALL         "tcroq2vlb1mMBn,aw"     /* for do_set() */
++#define FO_ALL         "tcroq2vlb1mMBn,awj"    /* for do_set() */
+ 
+ /* characters for the p_cpo option: */
+ #define CPO_ALTREAD    'a'     /* ":read" sets alternate file name */
+@@ -169,10 +170,12 @@
  #define CPO_SUBPERCENT '/'     /* % in :s string uses previous one */
  #define CPO_BACKSL     '\\'    /* \ is not special in [] */
@@ -52393 +57604 @@
  /* characters for p_ww option: */
  #define WW_ALL         "bshl<>[],~"
-@@ -391,6 +393,7 @@
+@@ -226,6 +229,7 @@
+ #define GO_MENUS       'm'             /* use menu bar */
+ #define GO_NOSYSMENU   'M'             /* don't source system menu */
+ #define GO_POINTER     'p'             /* pointer enter/leave callbacks */
++#define GO_ASELPLUS    'P'             /* autoselectPlus */
+ #define GO_RIGHT       'r'             /* use right scrollbar */
+ #define GO_VRIGHT      'R'             /* right scrollbar with vert split */
+ #define GO_TEAROFF     't'             /* add tear-off menu items */
+@@ -391,6 +395,7 @@
  EXTERN char_u  *p_cpo;         /* 'cpoptions' */
  #ifdef FEAT_CSCOPE
@@ -52401 +57620 @@
  EXTERN char_u  *p_csqf;        /* 'cscopequickfix' */
  #  define      CSQF_CMDS   "sgdctefi"
-@@ -709,6 +712,7 @@
+@@ -709,6 +714,7 @@
  #endif
  EXTERN char_u  *p_shq;         /* 'shellquote' */
@@ -52409 +57628 @@
  #ifdef AMIGA
  EXTERN long    p_st;           /* 'shelltype' */
-@@ -816,7 +820,7 @@
+@@ -816,7 +822,7 @@
  EXTERN char_u  *p_ttym;        /* 'ttymouse' */
  EXTERN unsigned ttym_flags;
@@ -52418 +57637 @@
  # define TTYM_XTERM            0x01
  # define TTYM_XTERM2           0x02
-@@ -824,6 +828,7 @@
+@@ -824,6 +830,7 @@
  # define TTYM_NETTERM          0x08
  # define TTYM_JSBTERM          0x10
@@ -52426 +57645 @@
  EXTERN char_u  *p_udir;        /* 'undodir' */
  EXTERN long    p_ul;           /* 'undolevels' */
-@@ -854,7 +859,11 @@
+@@ -854,7 +861,11 @@
  # define VE_ONEMORE    8
  #endif
@@ -52439 +57658 @@
  #ifdef FEAT_CMDL_COMPL
  EXTERN char_u  *p_wop;         /* 'wildoptions' */
-@@ -872,6 +881,7 @@
+@@ -872,6 +883,7 @@
  EXTERN char_u  *p_ww;          /* 'whichwrap' */
  EXTERN long    p_wc;           /* 'wildchar' */
@@ -52447 +57666 @@
  #ifdef FEAT_WILDMENU
  EXTERN int     p_wmnu;         /* 'wildmenu' */
-@@ -979,9 +989,6 @@
+@@ -979,9 +991,6 @@
      , BV_MOD
      , BV_MPS
@@ -52458 +57677 @@
  #endif
 diff -Naur vim73.orig/src/os_amiga.c vim73/src/os_amiga.c
---- vim73.orig/src/os_amiga.c   2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/os_amiga.c        2012-06-03 23:09:54.876058577 +0000
+--- vim73.orig/src/os_amiga.c   2010-05-15 11:04:08.000000000 +0000
++++ vim73/src/os_amiga.c        2012-07-20 20:31:17.630978008 +0000
+@@ -191,16 +191,16 @@
+ }
+ 
+ /*
+- * Return amount of memory still available.
++ * Return amount of memory still available in Kbyte.
+  */
+     long_u
+ mch_avail_mem(special)
+     int            special;
+ {
+ #ifdef __amigaos4__
+-    return (long_u)AvailMem(MEMF_ANY);
++    return (long_u)AvailMem(MEMF_ANY) >> 10;
+ #else
+-    return (long_u)AvailMem(special ? (long)MEMF_CHIP : (long)MEMF_ANY);
++    return (long_u)(AvailMem(special ? (long)MEMF_CHIP : (long)MEMF_ANY)) >> 10;
+ #endif
+ }
+ 
 @@ -1022,7 +1022,7 @@
  
@@ -52470 +57709 @@
      id = (struct InfoData *)(((long)id_a + 3L) & ~3L);
 diff -Naur vim73.orig/src/os_mac_conv.c vim73/src/os_mac_conv.c
---- vim73.orig/src/os_mac_conv.c        2012-06-03 23:09:52.932006845 +0000
-+++ vim73/src/os_mac_conv.c     2012-06-03 23:09:54.876058577 +0000
+--- vim73.orig/src/os_mac_conv.c        2010-07-14 11:50:20.000000000 +0000
++++ vim73/src/os_mac_conv.c     2012-07-20 20:31:13.047641389 +0000
 @@ -14,6 +14,8 @@
   */
@@ -52491 +57730 @@
       * there is an incomplete byte sequence.  Only do up to 6 bytes to avoid
 diff -Naur vim73.orig/src/os_macosx.m vim73/src/os_macosx.m
---- vim73.orig/src/os_macosx.m  2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/os_macosx.m       2012-06-03 23:09:54.356044740 +0000
+--- vim73.orig/src/os_macosx.m  2010-08-15 10:56:50.000000000 +0000
++++ vim73/src/os_macosx.m       2012-07-20 20:31:11.617640360 +0000
 @@ -15,6 +15,11 @@
      Error: MACOS 9 is no longer supported in Vim 7
@@ -52560 +57799 @@
      int len = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
 diff -Naur vim73.orig/src/os_msdos.c vim73/src/os_msdos.c
---- vim73.orig/src/os_msdos.c   2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/os_msdos.c        2012-06-03 23:09:54.320043782 +0000
+--- vim73.orig/src/os_msdos.c   2010-05-15 11:04:07.000000000 +0000
++++ vim73/src/os_msdos.c        2012-07-20 20:31:17.634311344 +0000
 @@ -21,7 +21,6 @@
   * Some functions are also used for Win16 (MS-Windows 3.1).
@@ -52570 +57809 @@
  
  #include <conio.h>
+@@ -551,15 +550,15 @@
+ #endif
+ 
+ /*
+- * Return amount of memory currently available.
++ * Return amount of memory currently available in Kbyte.
+  */
+     long_u
+ mch_avail_mem(int special)
+ {
+ #ifdef DJGPP
+-    return _go32_dpmi_remaining_virtual_memory();
++    return _go32_dpmi_remaining_virtual_memory() >> 10;
+ #else
+-    return coreleft();
++    return coreleft() >> 10;
+ #endif
+ }
+ 
 @@ -2233,7 +2232,7 @@
      void
@@ -52595 +57853 @@
         /* Did we get anything? */
 diff -Naur vim73.orig/src/os_mswin.c vim73/src/os_mswin.c
---- vim73.orig/src/os_mswin.c   2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/os_mswin.c        2012-06-03 23:09:54.944060388 +0000
+--- vim73.orig/src/os_mswin.c   2010-07-27 19:39:05.000000000 +0000
++++ vim73/src/os_mswin.c        2012-07-20 20:31:13.320974919 +0000
 @@ -22,7 +22,6 @@
  # endif
@@ -53019 +58277 @@
  
 diff -Naur vim73.orig/src/os_qnx.c vim73/src/os_qnx.c
---- vim73.orig/src/os_qnx.c     2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/os_qnx.c  2012-06-03 23:09:54.784056130 +0000
+--- vim73.orig/src/os_qnx.c     2010-05-24 09:42:44.000000000 +0000
++++ vim73/src/os_qnx.c  2012-07-20 20:31:12.814307887 +0000
 @@ -24,10 +24,10 @@
  #if defined(FEAT_GUI_PHOTON)
@@ -53185 +58443 @@
  #endif
 diff -Naur vim73.orig/src/os_riscos.c vim73/src/os_riscos.c
---- vim73.orig/src/os_riscos.c  2012-06-03 23:09:52.940007057 +0000
+--- vim73.orig/src/os_riscos.c  2010-05-15 11:04:08.000000000 +0000
 +++ vim73/src/os_riscos.c       1970-01-01 00:00:00.000000000 +0000
 @@ -1,1292 +0,0 @@
@@ -54481 +59739 @@
 -}
 diff -Naur vim73.orig/src/os_riscos.h vim73/src/os_riscos.h
---- vim73.orig/src/os_riscos.h  2012-06-03 23:09:52.940007057 +0000
+--- vim73.orig/src/os_riscos.h  2010-05-23 12:16:06.000000000 +0000
 +++ vim73/src/os_riscos.h       1970-01-01 00:00:00.000000000 +0000
 @@ -1,166 +0,0 @@
@@ -54651 +59909 @@
 -#define mch_setenv(name, val, x) setenv(name, val, x)
 diff -Naur vim73.orig/src/os_unix.c vim73/src/os_unix.c
---- vim73.orig/src/os_unix.c    2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/os_unix.c 2012-06-03 23:09:55.740081571 +0000
+--- vim73.orig/src/os_unix.c    2010-08-08 13:14:04.000000000 +0000
++++ vim73/src/os_unix.c 2012-07-20 20:31:15.784310019 +0000
 @@ -154,6 +154,13 @@
  
@@ -55265 +60523 @@
         return FALSE;
 diff -Naur vim73.orig/src/os_unix.h vim73/src/os_unix.h
---- vim73.orig/src/os_unix.h    2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/os_unix.h 2012-06-03 23:09:53.744028453 +0000
+--- vim73.orig/src/os_unix.h    2010-05-23 12:16:14.000000000 +0000
++++ vim73/src/os_unix.h 2012-07-20 20:31:09.687638968 +0000
 @@ -184,10 +184,6 @@
  
@@ -55279 +60537 @@
  #endif
 diff -Naur vim73.orig/src/os_win16.c vim73/src/os_win16.c
---- vim73.orig/src/os_win16.c   2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/os_win16.c        2012-06-03 23:09:54.876058577 +0000
+--- vim73.orig/src/os_win16.c   2010-06-26 04:03:31.000000000 +0000
++++ vim73/src/os_win16.c        2012-07-20 20:31:17.634311344 +0000
 @@ -20,13 +20,11 @@
  # pragma warn -obs
@@ -55307 +60565 @@
                 {
                     PostQuitMessage(msg.wParam);
+@@ -381,13 +379,13 @@
+ 
+ 
+ /*
+- * How much memory is available?
++ * How much memory is available in Kbyte?
+  */
+     long_u
+ mch_avail_mem(
+     int special)
+ {
+-    return GetFreeSpace(0);
++    return GetFreeSpace(0) >> 10;
+ }
+ 
+ 
 diff -Naur vim73.orig/src/os_win32.c vim73/src/os_win32.c
---- vim73.orig/src/os_win32.c   2012-06-03 23:09:52.956007482 +0000
-+++ vim73/src/os_win32.c        2012-06-03 23:09:55.524075823 +0000
+--- vim73.orig/src/os_win32.c   2010-07-14 14:49:36.000000000 +0000
++++ vim73/src/os_win32.c        2012-07-20 20:31:18.294311815 +0000
 @@ -20,7 +20,6 @@
   * Roger Knobbe <rogerk@wonderware.com> did the initial port of Vim 3.0.
@@ -55341 +60615 @@
  /* Win32 Console handles for input and output */
  static HANDLE g_hConIn  = INVALID_HANDLE_VALUE;
-@@ -206,42 +212,96 @@
+@@ -206,55 +212,109 @@
  static int suppress_winsize = 1;       /* don't fiddle with console */
  #endif
@@ -55419 +60693 @@
 +    int            l = (int)STRLEN(p);
 +    int            n;
-+
+ 
+-       did_set_PATH = TRUE;
 +    while (*p != NUL)
 +    {
@@ -55431 +60706 @@
 +       p += n;
 +       l -= n;
-+    }
-+}
-+
+     }
+ }
+ 
 +/*
 + * Load library "name".
@@ -55442 +60717 @@
 +    HINSTANCE dll = NULL;
 +    char old_dir[MAXPATHL];
- 
--       did_set_PATH = TRUE;
++
 +    if (exe_path == NULL)
 +       get_exe_name();
@@ -55454 +60728 @@
 +       dll = LoadLibrary(name);
 +       mch_chdir(old_dir);
-     }
++    }
 +    return dll;
- }
- 
++}
++
  #if defined(DYNAMIC_GETTEXT) || defined(PROTO)
-@@ -254,7 +314,7 @@
+ # ifndef GETTEXT_DLL
+ #  define GETTEXT_DLL "libintl.dll"
+ # endif
+-/* Dummy funcitons */
++/* Dummy functions */
+ static char *null_libintl_gettext(const char *);
+ static char *null_libintl_textdomain(const char *);
  static char *null_libintl_bindtextdomain(const char *, const char *);
  static char *null_libintl_bind_textdomain_codeset(const char *, const char *);
@@ -55541 +60821 @@
      }
  }
+@@ -1342,7 +1409,7 @@
+ 
+ 
+ /*
+- * mch_inchar(): low-level input funcion.
++ * mch_inchar(): low-level input function.
+  * Get one or more characters from the keyboard or the mouse.
+  * If time == 0, do not wait for characters.
+  * If time == n, wait a short time for characters.
 @@ -1615,6 +1682,35 @@
      return TRUE;
@@ -55872 +61161 @@
 +    ret = PeekNamedPipe(g_hChildStd_OUT_Rd, /* pipe to query */
 +                       NULL,               /* optional buffer */
-+                       0,                  /* buffe size */
++                       0,                  /* buffer size */
 +                       NULL,               /* number of read bytes */
 +                       &availableBytes,    /* available bytes total */
@@ -55879 +61168 @@
 +    repeatCount = 0;
 +    /* We got real data in the pipe, read it */
-+    while (ret != 0 && availableBytes > 0 && availableBytes > 0)
++    while (ret != 0 && availableBytes > 0)
 +    {
 +       repeatCount++;
@@ -56059 +61348 @@
 +                 NULL,                 /* Thread security attributes */
 +
-+                 // this command can be litigeous, handle inheritence was
++                 // this command can be litigious, handle inheritance was
 +                 // deactivated for pending temp file, but, if we deactivate
 +                 // it, the pipes don't work for some reason.
@@ -56532 +61821 @@
             )
      {
+@@ -4273,18 +4992,34 @@
+ 
+ 
+ /*
+- * How much memory is available?
++ * How much memory is available in Kbyte?
+  * Return sum of available physical and page file memory.
+  */
+ /*ARGSUSED*/
+     long_u
+ mch_avail_mem(int special)
+ {
+-    MEMORYSTATUS       ms;
++#ifdef MEMORYSTATUSEX
++    PlatformId();
++    if (g_PlatformId == VER_PLATFORM_WIN32_NT)
++    {
++       MEMORYSTATUSEX  ms;
++
++       /* Need to use GlobalMemoryStatusEx() when there is more memory than
++        * what fits in 32 bits. But it's not always available. */
++       ms.dwLength = sizeof(MEMORYSTATUSEX);
++       GlobalMemoryStatusEx(&ms);
++       return (long_u)((ms.ullAvailPhys + ms.ullAvailPageFile) >> 10);
++    }
++    else
++#endif
++    {
++       MEMORYSTATUS    ms;
+ 
+-    ms.dwLength = sizeof(MEMORYSTATUS);
+-    GlobalMemoryStatus(&ms);
+-    return (long_u) (ms.dwAvailPhys + ms.dwAvailPageFile);
++       ms.dwLength = sizeof(MEMORYSTATUS);
++       GlobalMemoryStatus(&ms);
++       return (long_u)((ms.dwAvailPhys + ms.dwAvailPageFile) >> 10);
++    }
+ }
+ 
+ #ifdef FEAT_MBYTE
 diff -Naur vim73.orig/src/os_win32.h vim73/src/os_win32.h
---- vim73.orig/src/os_win32.h   2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/os_win32.h        2012-06-03 23:09:54.588050913 +0000
+--- vim73.orig/src/os_win32.h   2010-05-31 19:50:24.000000000 +0000
++++ vim73/src/os_win32.h        2012-07-20 20:31:12.314307528 +0000
 @@ -191,5 +191,19 @@
  #ifdef __BORLANDC__
@@ -56557 +61886 @@
  #endif
 diff -Naur vim73.orig/src/popupmnu.c vim73/src/popupmnu.c
---- vim73.orig/src/popupmnu.c   2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/popupmnu.c        2012-06-03 23:09:53.272015892 +0000
+--- vim73.orig/src/popupmnu.c   2010-08-08 13:14:58.000000000 +0000
++++ vim73/src/popupmnu.c        2012-07-20 20:31:08.150971192 +0000
 @@ -558,8 +558,11 @@
             win_T       *curwin_save = curwin;
@@ -56573 +61902 @@
  
 diff -Naur vim73.orig/src/proto/buffer.pro vim73/src/proto/buffer.pro
---- vim73.orig/src/proto/buffer.pro     2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/proto/buffer.pro  2012-06-03 23:09:55.472074438 +0000
+--- vim73.orig/src/proto/buffer.pro     2010-08-15 12:30:19.000000000 +0000
++++ vim73/src/proto/buffer.pro  2012-07-20 20:31:18.014311616 +0000
 @@ -1,7 +1,7 @@
  /* buffer.c */
@@ -56584 +61913 @@
  void buf_freeall __ARGS((buf_T *buf, int flags));
  void goto_buffer __ARGS((exarg_T *eap, int start, int dir, int count));
+@@ -60,6 +60,7 @@
+ int buf_findsign_id __ARGS((buf_T *buf, linenr_T lnum));
+ int buf_findsigntype_id __ARGS((buf_T *buf, linenr_T lnum, int typenr));
+ int buf_signcount __ARGS((buf_T *buf, linenr_T lnum));
++void buf_delete_signs __ARGS((buf_T *buf));
+ void buf_delete_all_signs __ARGS((void));
+ void sign_list_placed __ARGS((buf_T *rbuf));
+ void sign_mark_adjust __ARGS((linenr_T line1, linenr_T line2, long amount, long amount_after));
 diff -Naur vim73.orig/src/proto/edit.pro vim73/src/proto/edit.pro
---- vim73.orig/src/proto/edit.pro       2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/edit.pro    2012-06-03 23:09:55.816083593 +0000
+--- vim73.orig/src/proto/edit.pro       2010-08-15 12:30:22.000000000 +0000
++++ vim73/src/proto/edit.pro    2012-07-20 20:31:16.054310214 +0000
 @@ -39,4 +39,5 @@
  int hkmap __ARGS((int c));
@@ -56594 +61931 @@
  /* vim: set ft=c : */
 diff -Naur vim73.orig/src/proto/eval.pro vim73/src/proto/eval.pro
---- vim73.orig/src/proto/eval.pro       2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/eval.pro    2012-06-03 23:09:54.748055172 +0000
+--- vim73.orig/src/proto/eval.pro       2010-08-15 12:30:23.000000000 +0000
++++ vim73/src/proto/eval.pro    2012-07-20 20:31:18.257645124 +0000
 @@ -23,6 +23,7 @@
  list_T *eval_spell_expr __ARGS((char_u *badword, char_u *expr));
@@ -56604 +61941 @@
  long call_func_retnr __ARGS((char_u *func, int argc, char_u **argv, int safe));
  void *call_func_retlist __ARGS((char_u *func, int argc, char_u **argv, int safe));
-@@ -52,6 +53,7 @@
+@@ -45,13 +46,23 @@
+ list_T *list_alloc __ARGS((void));
+ void list_unref __ARGS((list_T *l));
+ void list_free __ARGS((list_T *l, int recurse));
++listitem_T *listitem_alloc __ARGS((void));
++void listitem_remove __ARGS((list_T *l, listitem_T *item));
+ dictitem_T *dict_lookup __ARGS((hashitem_T *hi));
++listitem_T *list_find __ARGS((list_T *l, long n));
+ char_u *list_find_str __ARGS((list_T *l, long idx));
++void list_append __ARGS((list_T *l, listitem_T *item));
+ int list_append_tv __ARGS((list_T *l, typval_T *tv));
+ int list_append_dict __ARGS((list_T *list, dict_T *dict));
  int list_append_string __ARGS((list_T *l, char_u *str, int len));
++int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));
++void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));
  int garbage_collect __ARGS((void));
++void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));
++void set_ref_in_list __ARGS((list_T *l, int copyID));
++void set_ref_in_item __ARGS((typval_T *tv, int copyID));
  dict_T *dict_alloc __ARGS((void));
 +void dict_unref __ARGS((dict_T *d));
@@ -56612 +61965 @@
  void dictitem_free __ARGS((dictitem_T *item));
  int dict_add __ARGS((dict_T *d, dictitem_T *item));
+@@ -62,6 +73,7 @@
+ long get_dict_number __ARGS((dict_T *d, char_u *key));
+ char_u *get_function_name __ARGS((expand_T *xp, int idx));
+ char_u *get_expr_name __ARGS((expand_T *xp, int idx));
++int func_call __ARGS((char_u *name, typval_T *args, dict_T *selfdict, typval_T *rettv));
+ long do_searchpair __ARGS((char_u *spat, char_u *mpat, char_u *epat, int dir, char_u *skip, int flags, pos_T *match_pos, linenr_T lnum_stop, long time_limit));
+ void set_vim_var_nr __ARGS((int idx, long val));
+ long get_vim_var_nr __ARGS((int idx));
+@@ -81,7 +93,7 @@
+ char_u *get_tv_string_chk __ARGS((typval_T *varp));
+ char_u *get_var_value __ARGS((char_u *name));
+ void new_script_vars __ARGS((scid_T id));
+-void init_var_dict __ARGS((dict_T *dict, dictitem_T *dict_var));
++void init_var_dict __ARGS((dict_T *dict, dictitem_T *dict_var, int scope));
+ void vars_clear __ARGS((hashtab_T *ht));
+ void copy_tv __ARGS((typval_T *from, typval_T *to));
+ void ex_echo __ARGS((exarg_T *eap));
+@@ -92,6 +104,8 @@
+ void func_dump_profile __ARGS((FILE *fd));
+ char_u *get_user_func_name __ARGS((expand_T *xp, int idx));
+ void ex_delfunction __ARGS((exarg_T *eap));
++void func_unref __ARGS((char_u *name));
++void func_ref __ARGS((char_u *name));
+ void ex_return __ARGS((exarg_T *eap));
+ int do_return __ARGS((exarg_T *eap, int reanimate, int is_cmd, void *rettv));
+ void discard_pending_return __ARGS((void *rettv));
 diff -Naur vim73.orig/src/proto/ex_cmds.pro vim73/src/proto/ex_cmds.pro
---- vim73.orig/src/proto/ex_cmds.pro    2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/ex_cmds.pro 2012-06-03 23:09:55.780082635 +0000
+--- vim73.orig/src/proto/ex_cmds.pro    2010-08-15 12:30:24.000000000 +0000
++++ vim73/src/proto/ex_cmds.pro 2012-07-20 20:31:15.897643435 +0000
 @@ -23,6 +23,7 @@
  void ex_update __ARGS((exarg_T *eap));
@@ -56624 +62003 @@
  int not_writing __ARGS((void));
 diff -Naur vim73.orig/src/proto/ex_cmds2.pro vim73/src/proto/ex_cmds2.pro
---- vim73.orig/src/proto/ex_cmds2.pro   2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/ex_cmds2.pro        2012-06-03 23:09:54.204040695 +0000
+--- vim73.orig/src/proto/ex_cmds2.pro   2010-08-15 12:30:25.000000000 +0000
++++ vim73/src/proto/ex_cmds2.pro        2012-07-20 20:31:17.374311158 +0000
+@@ -42,7 +42,7 @@
+ int check_fname __ARGS((void));
+ int buf_write_all __ARGS((buf_T *buf, int forceit));
+ int get_arglist __ARGS((garray_T *gap, char_u *str));
+-int get_arglist_exp __ARGS((char_u *str, int *fcountp, char_u ***fnamesp));
++int get_arglist_exp __ARGS((char_u *str, int *fcountp, char_u ***fnamesp, int wig));
+ void set_arglist __ARGS((char_u *str));
+ void check_arg_idx __ARGS((win_T *win));
+ void ex_args __ARGS((exarg_T *eap));
 @@ -83,5 +83,7 @@
  char_u *get_mess_lang __ARGS((void));
@@ -56635 +62023 @@
  /* vim: set ft=c : */
 diff -Naur vim73.orig/src/proto/ex_docmd.pro vim73/src/proto/ex_docmd.pro
---- vim73.orig/src/proto/ex_docmd.pro   2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/ex_docmd.pro        2012-06-03 23:09:55.316070287 +0000
+--- vim73.orig/src/proto/ex_docmd.pro   2010-08-15 12:30:26.000000000 +0000
++++ vim73/src/proto/ex_docmd.pro        2012-07-20 20:31:14.470975744 +0000
 @@ -1,7 +1,7 @@
  /* ex_docmd.c */
@@ -56647 +62035 @@
  int checkforcmd __ARGS((char_u **pp, char *cmd, int len));
 diff -Naur vim73.orig/src/proto/ex_getln.pro vim73/src/proto/ex_getln.pro
---- vim73.orig/src/proto/ex_getln.pro   2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/ex_getln.pro        2012-06-03 23:09:54.204040695 +0000
+--- vim73.orig/src/proto/ex_getln.pro   2010-08-15 12:30:27.000000000 +0000
++++ vim73/src/proto/ex_getln.pro        2012-07-20 20:31:11.154306693 +0000
 @@ -31,7 +31,7 @@
  char_u *addstar __ARGS((char_u *fname, int len, int context));
@@ -56659 +62047 @@
  int get_histtype __ARGS((char_u *name));
 diff -Naur vim73.orig/src/proto/fileio.pro vim73/src/proto/fileio.pro
---- vim73.orig/src/proto/fileio.pro     2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/fileio.pro  2012-06-03 23:09:55.536076142 +0000
+--- vim73.orig/src/proto/fileio.pro     2010-08-15 12:30:28.000000000 +0000
++++ vim73/src/proto/fileio.pro  2012-07-20 20:31:15.164309576 +0000
 @@ -35,6 +35,7 @@
  void do_autocmd __ARGS((char_u *arg, int forceit));
@@ -56685 +62073 @@
  /* vim: set ft=c : */
 diff -Naur vim73.orig/src/proto/getchar.pro vim73/src/proto/getchar.pro
---- vim73.orig/src/proto/getchar.pro    2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/getchar.pro 2012-06-03 23:09:55.352071245 +0000
+--- vim73.orig/src/proto/getchar.pro    2010-08-15 12:30:29.000000000 +0000
++++ vim73/src/proto/getchar.pro 2012-07-20 20:31:14.557642473 +0000
 @@ -4,8 +4,9 @@
  char_u *get_inserted __ARGS((void));
@@ -56716 +62104 @@
  /* vim: set ft=c : */
 diff -Naur vim73.orig/src/proto/gui_athena.pro vim73/src/proto/gui_athena.pro
---- vim73.orig/src/proto/gui_athena.pro 2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/gui_athena.pro      2012-06-03 23:09:53.620025153 +0000
+--- vim73.orig/src/proto/gui_athena.pro 2010-08-15 12:31:06.000000000 +0000
++++ vim73/src/proto/gui_athena.pro      2012-07-20 20:31:09.297638687 +0000
 @@ -27,5 +27,5 @@
  void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
@@ -56726 +62114 @@
  /* vim: set ft=c : */
 diff -Naur vim73.orig/src/proto/gui_gtk.pro vim73/src/proto/gui_gtk.pro
---- vim73.orig/src/proto/gui_gtk.pro    2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/gui_gtk.pro 2012-06-03 23:09:53.620025153 +0000
+--- vim73.orig/src/proto/gui_gtk.pro    2010-08-15 12:31:03.000000000 +0000
++++ vim73/src/proto/gui_gtk.pro 2012-07-20 20:31:09.297638687 +0000
 @@ -13,7 +13,7 @@
  void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
@@ -56738 +62126 @@
  void gui_mch_find_dialog __ARGS((exarg_T *eap));
 diff -Naur vim73.orig/src/proto/gui_gtk_x11.pro vim73/src/proto/gui_gtk_x11.pro
---- vim73.orig/src/proto/gui_gtk_x11.pro        2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/gui_gtk_x11.pro     2012-06-03 23:09:55.860084763 +0000
+--- vim73.orig/src/proto/gui_gtk_x11.pro        2010-08-15 12:31:07.000000000 +0000
++++ vim73/src/proto/gui_gtk_x11.pro     2012-07-20 20:31:16.160976957 +0000
 @@ -4,6 +4,7 @@
  void gui_mch_set_blinking __ARGS((long waittime, long on, long off));
@@ -56757 +62145 @@
  void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
 diff -Naur vim73.orig/src/proto/gui_mac.pro vim73/src/proto/gui_mac.pro
---- vim73.orig/src/proto/gui_mac.pro    2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/gui_mac.pro 2012-06-03 23:09:53.620025153 +0000
+--- vim73.orig/src/proto/gui_mac.pro    2010-08-14 19:40:45.000000000 +0000
++++ vim73/src/proto/gui_mac.pro 2012-07-20 20:31:09.297638687 +0000
 @@ -81,7 +81,7 @@
  int gui_mch_get_mouse_y __ARGS((void));
@@ -56769 +62157 @@
  void gui_mch_show_tabline __ARGS((int showit));
 diff -Naur vim73.orig/src/proto/gui_motif.pro vim73/src/proto/gui_motif.pro
---- vim73.orig/src/proto/gui_motif.pro  2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/gui_motif.pro       2012-06-03 23:09:53.620025153 +0000
+--- vim73.orig/src/proto/gui_motif.pro  2010-08-15 12:31:04.000000000 +0000
++++ vim73/src/proto/gui_motif.pro       2012-07-20 20:31:09.297638687 +0000
 @@ -29,7 +29,7 @@
  void gui_mch_set_scrollbar_colors __ARGS((scrollbar_T *sb));
@@ -56781 +62169 @@
  void gui_mch_show_toolbar __ARGS((int showit));
 diff -Naur vim73.orig/src/proto/gui_photon.pro vim73/src/proto/gui_photon.pro
---- vim73.orig/src/proto/gui_photon.pro 2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/gui_photon.pro      2012-06-03 23:09:53.620025153 +0000
+--- vim73.orig/src/proto/gui_photon.pro 2010-08-15 12:31:10.000000000 +0000
++++ vim73/src/proto/gui_photon.pro      2012-07-20 20:31:09.297638687 +0000
 @@ -8,7 +8,7 @@
  void gui_mch_update __ARGS((void));
@@ -56793 +62181 @@
  void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
 diff -Naur vim73.orig/src/proto/gui_riscos.pro vim73/src/proto/gui_riscos.pro
---- vim73.orig/src/proto/gui_riscos.pro 2012-06-03 23:09:52.944007163 +0000
+--- vim73.orig/src/proto/gui_riscos.pro 2010-05-15 11:04:08.000000000 +0000
 +++ vim73/src/proto/gui_riscos.pro      1970-01-01 00:00:00.000000000 +0000
 @@ -1,66 +0,0 @@
@@ -56863 +62251 @@
 -/* vim: set ft=c : */
 diff -Naur vim73.orig/src/proto/gui_w16.pro vim73/src/proto/gui_w16.pro
---- vim73.orig/src/proto/gui_w16.pro    2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/gui_w16.pro 2012-06-03 23:09:53.620025153 +0000
+--- vim73.orig/src/proto/gui_w16.pro    2010-08-15 12:31:09.000000000 +0000
++++ vim73/src/proto/gui_w16.pro 2012-07-20 20:31:09.300972023 +0000
 @@ -74,6 +74,6 @@
  void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
@@ -56874 +62262 @@
  /* vim: set ft=c : */
 diff -Naur vim73.orig/src/proto/gui_w32.pro vim73/src/proto/gui_w32.pro
---- vim73.orig/src/proto/gui_w32.pro    2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/gui_w32.pro 2012-06-03 23:09:53.620025153 +0000
+--- vim73.orig/src/proto/gui_w32.pro    2010-08-15 12:31:09.000000000 +0000
++++ vim73/src/proto/gui_w32.pro 2012-07-20 20:31:09.300972023 +0000
 @@ -81,7 +81,7 @@
  void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
@@ -56886 +62274 @@
  void *gui_mch_register_sign __ARGS((char_u *signfile));
 diff -Naur vim73.orig/src/proto/if_lua.pro vim73/src/proto/if_lua.pro
---- vim73.orig/src/proto/if_lua.pro     2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/proto/if_lua.pro  2012-06-03 23:09:55.704080614 +0000
+--- vim73.orig/src/proto/if_lua.pro     2010-07-22 19:29:02.000000000 +0000
++++ vim73/src/proto/if_lua.pro  2012-07-20 20:31:15.690976620 +0000
 @@ -6,4 +6,6 @@
  void ex_luafile __ARGS((exarg_T *eap));
@@ -56896 +62284 @@
  /* vim: set ft=c : */
 diff -Naur vim73.orig/src/proto/if_mzsch.pro vim73/src/proto/if_mzsch.pro
---- vim73.orig/src/proto/if_mzsch.pro   2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/if_mzsch.pro        2012-06-03 23:09:55.416072949 +0000
+--- vim73.orig/src/proto/if_mzsch.pro   2010-05-15 11:04:08.000000000 +0000
++++ vim73/src/proto/if_mzsch.pro        2012-07-20 20:31:14.807642652 +0000
 @@ -14,6 +14,7 @@
  void mzvim_reset_timer __ARGS((void));
@@ -56907 +62295 @@
 +int vim_main2 __ARGS((int argc, char **argv));
  /* vim: set ft=c : */
+diff -Naur vim73.orig/src/proto/if_python.pro vim73/src/proto/if_python.pro
+--- vim73.orig/src/proto/if_python.pro  2010-08-15 12:30:35.000000000 +0000
++++ vim73/src/proto/if_python.pro       2012-07-20 20:31:17.334311130 +0000
+@@ -6,4 +6,6 @@
+ void ex_pyfile __ARGS((exarg_T *eap));
+ void python_buffer_free __ARGS((buf_T *buf));
+ void python_window_free __ARGS((win_T *win));
++void do_pyeval __ARGS((char_u *str, typval_T *rettv));
++void set_ref_in_python __ARGS((int copyID));
+ /* vim: set ft=c : */
+diff -Naur vim73.orig/src/proto/if_python3.pro vim73/src/proto/if_python3.pro
+--- vim73.orig/src/proto/if_python3.pro 2010-08-15 12:30:36.000000000 +0000
++++ vim73/src/proto/if_python3.pro      2012-07-20 20:31:17.337644466 +0000
+@@ -6,4 +6,6 @@
+ void ex_py3file __ARGS((exarg_T *eap));
+ void python3_buffer_free __ARGS((buf_T *buf));
+ void python3_window_free __ARGS((win_T *win));
++void do_py3eval __ARGS((char_u *str, typval_T *rettv));
++void set_ref_in_python3 __ARGS((int copyID));
+ /* vim: set ft=c : */
 diff -Naur vim73.orig/src/proto/mbyte.pro vim73/src/proto/mbyte.pro
---- vim73.orig/src/proto/mbyte.pro      2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/mbyte.pro   2012-06-03 23:09:54.572050488 +0000
+--- vim73.orig/src/proto/mbyte.pro      2010-08-15 12:30:44.000000000 +0000
++++ vim73/src/proto/mbyte.pro   2012-07-20 20:31:12.267640827 +0000
 @@ -2,6 +2,7 @@
  int enc_canon_props __ARGS((char_u *name));
@@ -56928 +62336 @@
  int mb_charlen_len __ARGS((char_u *str, int len));
 diff -Naur vim73.orig/src/proto/message.pro vim73/src/proto/message.pro
---- vim73.orig/src/proto/message.pro    2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/message.pro 2012-06-03 23:09:55.664079548 +0000
+--- vim73.orig/src/proto/message.pro    2010-08-15 12:30:41.000000000 +0000
++++ vim73/src/proto/message.pro 2012-07-20 20:31:15.597643219 +0000
 @@ -4,7 +4,7 @@
  int msg_attr __ARGS((char_u *s, int attr));
@@ -56964 +62372 @@
  int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
  int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
+diff -Naur vim73.orig/src/proto/misc1.pro vim73/src/proto/misc1.pro
+--- vim73.orig/src/proto/misc1.pro      2010-08-15 12:30:42.000000000 +0000
++++ vim73/src/proto/misc1.pro   2012-07-20 20:31:16.614310614 +0000
+@@ -6,7 +6,8 @@
+ int set_indent __ARGS((int size, int flags));
+ int get_number_indent __ARGS((linenr_T lnum));
+ int open_line __ARGS((int dir, int flags, int old_indent));
+-int get_leader_len __ARGS((char_u *line, char_u **flags, int backward));
++int get_leader_len __ARGS((char_u *line, char_u **flags, int backward, int do_skip_space));
++int get_last_leader_offset __ARGS((char_u *line, char_u **flags));
+ int plines __ARGS((linenr_T lnum));
+ int plines_win __ARGS((win_T *wp, linenr_T lnum, int winheight));
+ int plines_nofill __ARGS((linenr_T lnum));
 diff -Naur vim73.orig/src/proto/misc2.pro vim73/src/proto/misc2.pro
---- vim73.orig/src/proto/misc2.pro      2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/misc2.pro   2012-06-03 23:09:55.148065818 +0000
+--- vim73.orig/src/proto/misc2.pro      2010-08-15 12:30:42.000000000 +0000
++++ vim73/src/proto/misc2.pro   2012-07-20 20:31:13.947642036 +0000
 @@ -14,6 +14,7 @@
  linenr_T get_cursor_rel_lnum __ARGS((win_T *wp, linenr_T lnum));
@@ -56997 +62418 @@
 +int has_non_ascii __ARGS((char_u *s));
  /* vim: set ft=c : */
+diff -Naur vim73.orig/src/proto/ops.pro vim73/src/proto/ops.pro
+--- vim73.orig/src/proto/ops.pro        2010-08-15 12:30:45.000000000 +0000
++++ vim73/src/proto/ops.pro     2012-07-20 20:31:16.614310614 +0000
+@@ -36,7 +36,7 @@
+ int preprocs_left __ARGS((void));
+ int get_register_name __ARGS((int num));
+ void ex_display __ARGS((exarg_T *eap));
+-int do_join __ARGS((long count, int insert_space, int save_undo));
++int do_join __ARGS((long count, int insert_space, int save_undo, int use_formatoptions));
+ void op_format __ARGS((oparg_T *oap, int keep_cursor));
+ void op_formatexpr __ARGS((oparg_T *oap));
+ int fex_format __ARGS((linenr_T lnum, long count, int c));
 diff -Naur vim73.orig/src/proto/option.pro vim73/src/proto/option.pro
---- vim73.orig/src/proto/option.pro     2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/option.pro  2012-06-03 23:09:53.628025365 +0000
+--- vim73.orig/src/proto/option.pro     2010-08-15 12:30:46.000000000 +0000
++++ vim73/src/proto/option.pro  2012-07-20 20:31:09.320972037 +0000
 @@ -54,6 +54,6 @@
  int option_was_set __ARGS((char_u *name));
@@ -57009 +62442 @@
  /* vim: set ft=c : */
 diff -Naur vim73.orig/src/proto/os_riscos.pro vim73/src/proto/os_riscos.pro
---- vim73.orig/src/proto/os_riscos.pro  2012-06-03 23:09:52.944007163 +0000
+--- vim73.orig/src/proto/os_riscos.pro  2010-08-15 12:31:16.000000000 +0000
 +++ vim73/src/proto/os_riscos.pro       1970-01-01 00:00:00.000000000 +0000
 @@ -1,49 +0,0 @@
@@ -57062 +62495 @@
 -/* vim: set ft=c : */
 diff -Naur vim73.orig/src/proto/os_win32.pro vim73/src/proto/os_win32.pro
---- vim73.orig/src/proto/os_win32.pro   2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/os_win32.pro        2012-06-03 23:09:54.016035691 +0000
+--- vim73.orig/src/proto/os_win32.pro   2010-08-15 12:31:14.000000000 +0000
++++ vim73/src/proto/os_win32.pro        2012-07-20 20:31:10.627639646 +0000
 @@ -1,4 +1,5 @@
  /* os_win32.c */
@@ -57081 +62514 @@
  int mch_nodetype __ARGS((char_u *name));
 diff -Naur vim73.orig/src/proto/term.pro vim73/src/proto/term.pro
---- vim73.orig/src/proto/term.pro       2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/term.pro    2012-06-03 23:09:55.364071565 +0000
+--- vim73.orig/src/proto/term.pro       2010-08-15 12:30:56.000000000 +0000
++++ vim73/src/proto/term.pro    2012-07-20 20:31:14.587642496 +0000
 @@ -50,7 +50,7 @@
  char_u *get_termcode __ARGS((int i));
@@ -57092 +62525 @@
  int find_term_bykeys __ARGS((char_u *src));
  void show_termcodes __ARGS((void));
+diff -Naur vim73.orig/src/proto/ui.pro vim73/src/proto/ui.pro
+--- vim73.orig/src/proto/ui.pro 2010-08-15 12:30:57.000000000 +0000
++++ vim73/src/proto/ui.pro      2012-07-20 20:31:18.070978324 +0000
+@@ -11,17 +11,17 @@
+ void ui_new_shellsize __ARGS((void));
+ void ui_breakcheck __ARGS((void));
+ void clip_init __ARGS((int can_use));
+-void clip_update_selection __ARGS((void));
++void clip_update_selection __ARGS((VimClipboard *clip));
+ void clip_own_selection __ARGS((VimClipboard *cbd));
+ void clip_lose_selection __ARGS((VimClipboard *cbd));
+-void clip_copy_selection __ARGS((void));
+ void clip_auto_select __ARGS((void));
+-int clip_isautosel __ARGS((void));
++int clip_isautosel_star __ARGS((void));
++int clip_isautosel_plus __ARGS((void));
+ void clip_modeless __ARGS((int button, int is_click, int is_drag));
+ void clip_start_selection __ARGS((int col, int row, int repeated_click));
+ void clip_process_selection __ARGS((int button, int col, int row, int_u repeated_click));
+ void clip_may_redraw_selection __ARGS((int row, int col, int len));
+-void clip_clear_selection __ARGS((void));
++void clip_clear_selection __ARGS((VimClipboard *cbd));
+ void clip_may_clear_selection __ARGS((int row1, int row2));
+ void clip_scroll_selection __ARGS((int rows));
+ void clip_copy_modeless_selection __ARGS((int both));
 diff -Naur vim73.orig/src/proto/window.pro vim73/src/proto/window.pro
---- vim73.orig/src/proto/window.pro     2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/proto/window.pro  2012-06-03 23:09:55.484074758 +0000
+--- vim73.orig/src/proto/window.pro     2010-08-15 12:30:59.000000000 +0000
++++ vim73/src/proto/window.pro  2012-07-20 20:31:18.337645181 +0000
 @@ -1,13 +1,14 @@
  /* window.c */
@@ -57111 +62569 @@
  void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp));
  void win_free_all __ARGS((void));
+@@ -26,7 +27,7 @@
+ tabpage_T *find_tabpage __ARGS((int n));
+ int tabpage_index __ARGS((tabpage_T *ftp));
+ void goto_tabpage __ARGS((int n));
+-void goto_tabpage_tp __ARGS((tabpage_T *tp));
++void goto_tabpage_tp __ARGS((tabpage_T *tp, int trigger_autocmds));
+ void goto_tabpage_win __ARGS((tabpage_T *tp, win_T *wp));
+ void tabpage_move __ARGS((int nr));
+ void win_goto __ARGS((win_T *wp));
+@@ -50,6 +51,8 @@
+ void win_setminheight __ARGS((void));
+ void win_drag_status_line __ARGS((win_T *dragwin, int offset));
+ void win_drag_vsep_line __ARGS((win_T *dragwin, int offset));
++void win_new_height __ARGS((win_T *wp, int height));
++void win_new_width __ARGS((win_T *wp, int width));
+ void win_comp_scroll __ARGS((win_T *wp));
+ void command_height __ARGS((void));
+ void last_status __ARGS((int morewin));
 diff -Naur vim73.orig/src/proto.h vim73/src/proto.h
---- vim73.orig/src/proto.h      2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/proto.h   2012-06-03 23:09:54.096037821 +0000
+--- vim73.orig/src/proto.h      2010-07-17 15:28:51.000000000 +0000
++++ vim73/src/proto.h   2012-07-20 20:31:10.807639777 +0000
 @@ -62,9 +62,6 @@
  # ifdef __BEOS__
@@ -57135 +62611 @@
  #  endif
 diff -Naur vim73.orig/src/pty.c vim73/src/pty.c
---- vim73.orig/src/pty.c        2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/pty.c     2012-06-03 23:09:55.244068371 +0000
+--- vim73.orig/src/pty.c        2010-07-24 18:23:01.000000000 +0000
++++ vim73/src/pty.c     2012-07-20 20:31:14.287642279 +0000
 @@ -14,6 +14,10 @@
   * It has been modified to work better with Vim.
@@ -57188 +62664 @@
         close(f);
 diff -Naur vim73.orig/src/quickfix.c vim73/src/quickfix.c
---- vim73.orig/src/quickfix.c   2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/quickfix.c        2012-06-03 23:09:55.964087533 +0000
+--- vim73.orig/src/quickfix.c   2010-08-09 20:12:14.000000000 +0000
++++ vim73/src/quickfix.c        2012-07-20 20:31:17.374311158 +0000
 @@ -126,12 +126,14 @@
  static win_T   *qf_find_win __ARGS((qf_info_T *qi));
@@ -57591 +63067 @@
      }
      if (au_name != NULL)
+@@ -3122,7 +3189,7 @@
+            ;
+ 
+     /* parse the list of arguments */
+-    if (get_arglist_exp(p, &fcount, &fnames) == FAIL)
++    if (get_arglist_exp(p, &fcount, &fnames, TRUE) == FAIL)
+        goto theend;
+     if (fcount == 0)
+     {
 @@ -3130,6 +3197,11 @@
         goto theend;
@@ -57955 +63440 @@
         qf_jump(qi, 0, 0, FALSE);
 diff -Naur vim73.orig/src/regexp.c vim73/src/regexp.c
---- vim73.orig/src/regexp.c     2012-06-03 23:09:52.956007482 +0000
-+++ vim73/src/regexp.c  2012-06-03 23:09:54.512048891 +0000
+--- vim73.orig/src/regexp.c     2010-07-12 20:41:48.000000000 +0000
++++ vim73/src/regexp.c  2012-07-20 20:31:12.114307384 +0000
 @@ -666,8 +666,12 @@
  static void    regc __ARGS((int b));
@@ -58343 +63828 @@
             can_f_submatch = FALSE;
 diff -Naur vim73.orig/src/screen.c vim73/src/screen.c
---- vim73.orig/src/screen.c     2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/screen.c  2012-06-03 23:09:55.944087000 +0000
-@@ -764,9 +764,13 @@
+--- vim73.orig/src/screen.c     2010-08-13 13:21:27.000000000 +0000
++++ vim73/src/screen.c  2012-07-20 20:31:18.064311652 +0000
+@@ -89,6 +89,9 @@
+ 
+ #include "vim.h"
+ 
++#define MB_FILLER_CHAR '<'  /* character used when a double-width character
++                            * doesn't fit. */
++
+ /*
+  * The attributes that are actually active for writing to the screen.
+  */
+@@ -516,8 +519,10 @@
+ # endif
+ # ifdef FEAT_CLIPBOARD
+                /* When Visual area changed, may have to update selection. */
+-               if (clip_star.available && clip_isautosel())
+-                   clip_update_selection();
++               if (clip_star.available && clip_isautosel_star())
++                   clip_update_selection(&clip_star);
++               if (clip_plus.available && clip_isautosel_plus())
++                   clip_update_selection(&clip_plus);
+ # endif
+ #ifdef FEAT_GUI
+                /* Remove the cursor before starting to do anything, because
+@@ -764,9 +769,13 @@
             doit = TRUE;
      }
@@ -58362 +63870 @@
  
      /* update all windows that need updating */
-@@ -1633,11 +1637,11 @@
+@@ -807,8 +816,10 @@
+ 
+ #ifdef FEAT_CLIPBOARD
+     /* When Visual area changed, may have to update selection. */
+-    if (clip_star.available && clip_isautosel())
+-       clip_update_selection();
++    if (clip_star.available && clip_isautosel_star())
++       clip_update_selection(&clip_star);
++    if (clip_plus.available && clip_isautosel_plus())
++       clip_update_selection(&clip_plus);
+ #endif
+ 
+     win_update(wp);
+@@ -1633,11 +1644,11 @@
              * When at start of changed lines: May scroll following lines
              * up or down to minimize redrawing.
@@ -58376 +63897 @@
                 int             old_rows = 0;
                 int             new_rows = 0;
-@@ -1864,12 +1868,12 @@
+@@ -1864,12 +1875,12 @@
             if (row > wp->w_height)     /* past end of screen */
             {
@@ -58391 +63912 @@
             ++idx;
  #ifdef FEAT_FOLDING
-@@ -1986,7 +1990,7 @@
+@@ -1986,7 +1997,7 @@
             }
  #endif
@@ -58400 +63921 @@
  
         /* make sure the rest of the screen is blank */
-@@ -2001,7 +2005,7 @@
+@@ -2001,7 +2012,7 @@
      wp->w_old_botfill = wp->w_botfill;
  #endif
@@ -58409 +63930 @@
         /*
          * There is a trick with w_botline.  If we invalidate it on each
-@@ -2317,7 +2321,7 @@
+@@ -2317,7 +2328,7 @@
                 num = (long)lnum;
             else
@@ -58418 +63939 @@
             sprintf((char *)buf, "%*ld ", w, num);
  #ifdef FEAT_RIGHTLEFT
-@@ -2531,7 +2535,9 @@
+@@ -2531,7 +2542,9 @@
                 /* Visual block mode: highlight the chars part of the block */
                 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)W_WIDTH(wp))
@@ -58429 +63950 @@
                     else
                         len = W_WIDTH(wp) - txtcol;
-@@ -3405,9 +3411,9 @@
+@@ -2991,7 +3004,10 @@
+            area_highlighting = TRUE;
+            attr = hl_attr(HLF_V);
+ #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+-           if (clip_star.available && !clip_star.owned && clip_isautosel())
++           if ((clip_star.available && !clip_star.owned
++                                                    && clip_isautosel_star())
++                   || (clip_plus.available && !clip_plus.owned
++                                                   && clip_isautosel_plus()))
+                attr = hl_attr(HLF_VNC);
+ #endif
+        }
+@@ -3222,8 +3238,7 @@
+                /* no bad word found at line start, don't check until end of a
+                 * word */
+                spell_hlf = HLF_COUNT;
+-               word_end = (int)(spell_to_word_end(ptr, wp)
+-                                                                 - line + 1);
++               word_end = (int)(spell_to_word_end(ptr, wp) - line + 1);
+            }
+            else
+            {
+@@ -3405,9 +3420,9 @@
  # endif
                    )
@@ -58441 +63984 @@
  
                     /* Draw two cells with the sign value or blank. */
-@@ -3475,8 +3481,7 @@
+@@ -3475,8 +3490,7 @@
                             num = (long)lnum;
                         else
@@ -58451 +63994 @@
                         sprintf((char *)extra, "%*ld ",
                                                 number_width(wp), num);
-@@ -3496,9 +3501,11 @@
+@@ -3496,9 +3510,11 @@
                     char_attr = hl_attr(HLF_N);
  #ifdef FEAT_SYN_HL
@@ -58465 +64008 @@
                 }
             }
-@@ -3559,7 +3566,7 @@
+@@ -3559,7 +3575,7 @@
         }
  
@@ -58474 +64017 @@
  #ifdef FEAT_DIFF
                                    && filler_todo <= 0
-@@ -4253,7 +4260,7 @@
+@@ -4010,7 +4026,7 @@
+                if (n_skip > 0 && mb_l > 1 && n_extra == 0)
+                {
+                    n_extra = 1;
+-                   c_extra = '<';
++                   c_extra = MB_FILLER_CHAR;
+                    c = ' ';
+                    if (area_attr == 0 && search_attr == 0)
+                    {
+@@ -4253,7 +4269,7 @@
                 {
                     /* tab amount depends on current column */
@@ -58483 +64035 @@
                     mb_utf8 = FALSE;    /* don't draw as UTF-8 */
  #endif
-@@ -5366,6 +5373,12 @@
+@@ -4570,6 +4586,15 @@
+            c = lcs_prec;
+            lcs_prec_todo = NUL;
+ #ifdef FEAT_MBYTE
++           if (has_mbyte && (*mb_char2cells)(mb_c) > 1)
++           {
++               /* Double-width character being overwritten by the "precedes"
++                * character, need to fill up half the character. */
++               c_extra = MB_FILLER_CHAR;
++               n_extra = 1;
++               n_attr = 2;
++               extra_attr = hl_attr(HLF_AT);
++           }
+            mb_c = c;
+            if (enc_utf8 && (*mb_char2len)(c) > 1)
+            {
+@@ -5366,6 +5391,12 @@
  # define CHAR_CELLS 1
  #endif
@@ -58496 +64064 @@
      clip_may_clear_selection(row, row);
  # endif
-@@ -6436,6 +6449,8 @@
+@@ -6436,6 +6467,8 @@
      struct     stl_hlrec hltab[STL_MAX_ITEM];
      struct     stl_hlrec tabtab[STL_MAX_ITEM];
@@ -58505 +64073 @@
      /* setup environment for the task at hand */
      if (wp == NULL)
-@@ -6514,16 +6529,31 @@
+@@ -6514,16 +6547,31 @@
      if (maxwidth <= 0)
         return;
@@ -58540 +64108 @@
      {
  #ifdef FEAT_MBYTE
-@@ -6591,16 +6621,17 @@
+@@ -6591,16 +6639,17 @@
      int            row, col;
      int            attr;
@@ -58565 +64133 @@
  }
  
-@@ -7827,15 +7858,15 @@
+@@ -7827,15 +7876,15 @@
  
  /*
@@ -58585 +64153 @@
  }
  
-@@ -7850,8 +7881,8 @@
+@@ -7850,8 +7899,8 @@
   * final size of the shell is needed.
   */
@@ -58596 +64164 @@
      int                    new_row, old_row;
  #ifdef FEAT_GUI
-@@ -8047,7 +8078,7 @@
+@@ -8047,7 +8096,7 @@
              * (used when resizing the window at the "--more--" prompt or when
              * executing an external command, for the GUI).
@@ -58605 +64173 @@
                 (void)vim_memset(new_ScreenLines + new_row * Columns,
                                       ' ', (size_t)Columns * sizeof(schar_T));
-@@ -8137,7 +8168,7 @@
+@@ -8137,7 +8186,7 @@
      screen_Columns = Columns;
  
@@ -58614 +64182 @@
  
  #ifdef FEAT_GUI
+@@ -9018,7 +9067,7 @@
+            || (wp != NULL && wp->w_width != Columns)
+ # endif
+        )
+-       clip_clear_selection();
++       clip_clear_selection(&clip_star);
+     else
+        clip_scroll_selection(-line_count);
+ #endif
+@@ -9239,7 +9288,7 @@
+            || (wp != NULL && wp->w_width != Columns)
+ # endif
+        )
+-       clip_clear_selection();
++       clip_clear_selection(&clip_star);
+     else
+        clip_scroll_selection(line_count);
+ #endif
 diff -Naur vim73.orig/src/search.c vim73/src/search.c
---- vim73.orig/src/search.c     2012-06-03 23:09:52.956007482 +0000
-+++ vim73/src/search.c  2012-06-03 23:09:55.336070819 +0000
+--- vim73.orig/src/search.c     2010-07-14 14:49:41.000000000 +0000
++++ vim73/src/search.c  2012-07-20 20:31:18.304311823 +0000
 @@ -1161,12 +1161,20 @@
         {
@@ -58643 +64229 @@
  
         if (pat != NULL && *pat != NUL) /* look for (new) offset */
-@@ -1538,6 +1546,7 @@
+@@ -1538,8 +1546,9 @@
      int                        col;
      char_u             *p;
@@ -58649 +64235 @@
 +    int                        stop = TRUE;
  #ifdef FEAT_MBYTE
-     static char_u      bytes[MB_MAXBYTES];
+-    static char_u      bytes[MB_MAXBYTES];
++    static char_u      bytes[MB_MAXBYTES + 1];
      static int         bytelen = 1;    /* >1 for multi-byte char */
+ #endif
+ 
 @@ -1572,6 +1581,12 @@
         t_cmd = last_t_cmd;
@@ -58783 +64372 @@
  #ifdef FEAT_INS_EXPAND
         /* when CONT_SOL is set compare "ptr" with the beginning of the line
+@@ -4892,7 +4901,7 @@
+ #ifdef FEAT_COMMENTS
+                        if ((*line != '#' ||
+                                STRNCMP(skipwhite(line + 1), "define", 6) != 0)
+-                               && get_leader_len(line, NULL, FALSE))
++                               && get_leader_len(line, NULL, FALSE, TRUE))
+                            matched = FALSE;
+ 
+                        /*
 @@ -5075,9 +5084,7 @@
                         if (win_split(0, 0) == FAIL)
@@ -58794 +64392 @@
                     if (depth == -1)
                     {
+@@ -5134,7 +5141,7 @@
+                    && !(compl_cont_status & CONT_SOL)
+ #endif
+                    && *startp != NUL
+-                   && *(p = startp + 1) != NUL)
++                   && *(p = startp + MB_PTR2LEN(startp)) != NUL)
+                goto search_line;
+        }
+        line_breakcheck();
 @@ -5222,11 +5229,6 @@
      vim_free(regmatch.regprog);
@@ -58807 +64414 @@
      static void
 diff -Naur vim73.orig/src/spell.c vim73/src/spell.c
---- vim73.orig/src/spell.c      2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/spell.c   2012-06-03 23:09:55.960087426 +0000
+--- vim73.orig/src/spell.c      2010-08-01 13:43:01.000000000 +0000
++++ vim73/src/spell.c   2012-07-20 20:31:17.387644502 +0000
 @@ -303,10 +303,6 @@
   *                         few bytes as possible, see offset2bytes())
@@ -59135 +64742 @@
      return n;
  }
+@@ -8531,7 +8553,7 @@
+     }
+ 
+     /* Expand all the remaining arguments (e.g., $VIMRUNTIME). */
+-    if (get_arglist_exp(arg, &fcount, &fnames) == OK)
++    if (get_arglist_exp(arg, &fcount, &fnames, FALSE) == OK)
+     {
+        mkspell(fcount, fnames, ascii, eap->forceit, FALSE);
+        FreeWild(fcount, fnames);
 @@ -8548,7 +8570,7 @@
      spellinfo_T        *spin;
@@ -59556 +65172 @@
                         }
 diff -Naur vim73.orig/src/structs.h vim73/src/structs.h
---- vim73.orig/src/structs.h    2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/structs.h 2012-06-03 23:09:55.316070287 +0000
+--- vim73.orig/src/structs.h    2010-08-07 14:59:27.000000000 +0000
++++ vim73/src/structs.h 2012-07-20 20:31:18.260978460 +0000
 @@ -378,6 +378,35 @@
  typedef long               blocknr_T;
@@ -59659 +65275 @@
      int                m_noremap;      /* if non-zero no re-mapping for m_str */
      char       m_silent;       /* <silent> used, don't echo commands */
-@@ -1506,9 +1530,6 @@
+@@ -1082,6 +1106,11 @@
+ #define VAR_DICT    5  /* "v_dict" is used */
+ #define VAR_FLOAT   6  /* "v_float" is used */
+ 
++/* Values for "dv_scope". */
++#define VAR_SCOPE     1        /* a:, v:, s:, etc. scope dictionaries */
++#define VAR_DEF_SCOPE 2        /* l:, g: scope dictionaries: here funcrefs are not
++                          allowed to mask existing functions */
++
+ /* Values for "v_lock". */
+ #define VAR_LOCKED  1  /* locked with lock(), can use unlock() */
+ #define VAR_FIXED   2  /* locked forever */
+@@ -1157,6 +1186,7 @@
+     int                dv_copyID;      /* ID used by deepcopy() */
+     dict_T     *dv_copydict;   /* copied dict used by deepcopy() */
+     char       dv_lock;        /* zero, VAR_LOCKED, VAR_FIXED */
++    char       dv_scope;       /* zero, VAR_SCOPE, VAR_DEF_SCOPE */
+     dict_T     *dv_used_next;  /* next dict in used dicts list */
+     dict_T     *dv_used_prev;  /* previous dict in used dicts list */
+ };
+@@ -1177,6 +1207,10 @@
+ typedef struct qf_info_S qf_info_T;
+ #endif
+ 
++/*
++ * These are items normally related to a buffer.  But when using ":ownsyntax"
++ * a window may have its own instance.
++ */
+ typedef struct {
+ #ifdef FEAT_SYN_HL
+     hashtab_T  b_keywtab;              /* syntax keywords hash table */
+@@ -1266,6 +1300,10 @@
+     int                b_nwindows;     /* nr of windows open on this buffer */
+ 
+     int                b_flags;        /* various BF_ flags */
++#ifdef FEAT_AUTOCMD
++    int                b_closing;      /* buffer is being closed, don't let
++                                  autocommands close it too. */
++#endif
+ 
+     /*
+      * b_ffname has the full path of the file (NULL for no name).
+@@ -1506,9 +1544,6 @@
      int                b_p_ml_nobin;   /* b_p_ml saved for binary mode */
      int                b_p_ma;         /* 'modifiable' */
@@ -59669 +65327 @@
  #ifdef FEAT_TEXTOBJ
      char_u     *b_p_qe;        /* 'quoteescape' */
-@@ -1563,6 +1584,9 @@
+@@ -1563,6 +1598,9 @@
  
      /* end of buffer options */
@@ -59679 +65337 @@
      int                b_start_ffc;    /* first char of 'ff' when edit started */
  #ifdef FEAT_MBYTE
-@@ -1822,7 +1846,7 @@
+@@ -1822,13 +1860,17 @@
                                        often, keep it the first item!) */
  
@@ -59688 +65346 @@
  
  #ifdef FEAT_WINDOWS
-@@ -2339,11 +2363,6 @@
+     win_T      *w_prev;            /* link to previous window */
+     win_T      *w_next;            /* link to next window */
+ #endif
++#ifdef FEAT_AUTOCMD
++    int                w_closing;          /* window is being closed, don't let
++                                      autocommands close it too. */
++#endif
+ 
+     frame_T    *w_frame;           /* frame containing this window */
+ 
+@@ -2339,11 +2381,6 @@
      MenuHandle menu_handle;
      MenuHandle submenu_handle;
@@ -59701 +65369 @@
      PtWidget_t *submenu_id;
 diff -Naur vim73.orig/src/syntax.c vim73/src/syntax.c
---- vim73.orig/src/syntax.c     2012-06-03 23:09:52.948007269 +0000
-+++ vim73/src/syntax.c  2012-06-03 23:09:55.912086149 +0000
+--- vim73.orig/src/syntax.c     2010-08-08 13:17:03.000000000 +0000
++++ vim73/src/syntax.c  2012-07-20 20:31:18.317645167 +0000
 @@ -68,6 +68,8 @@
  
@@ -60014 +65682 @@
 +       CENT("Pmenu ctermbg=Magenta ctermfg=Black",
 +            "Pmenu ctermbg=Magenta ctermfg=Black guibg=Magenta"),
-+       CENT("PmenuSel ctermbg=DarkGrey ctermfg=Black",
-+            "PmenuSel ctermbg=DarkGrey ctermfg=Black guibg=DarkGrey"),
++       CENT("PmenuSel ctermbg=Black ctermfg=DarkGrey",
++            "PmenuSel ctermbg=Black ctermfg=DarkGrey guibg=DarkGrey"),
  #endif
         CENT("Title term=bold ctermfg=LightMagenta",
@@ -60067 +65735 @@
      ui_delay(cnt == 99 ? 40L : (long)cnt * 50L, FALSE);
 diff -Naur vim73.orig/src/tag.c vim73/src/tag.c
---- vim73.orig/src/tag.c        2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/tag.c     2012-06-03 23:09:55.200067199 +0000
+--- vim73.orig/src/tag.c        2010-08-10 07:25:22.000000000 +0000
++++ vim73/src/tag.c     2012-07-20 20:31:14.130975501 +0000
 @@ -11,10 +11,6 @@
   * Code to handle tags and the tag stack
@@ -60835 +66503 @@
  /*
 diff -Naur vim73.orig/src/term.c vim73/src/term.c
---- vim73.orig/src/term.c       2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/term.c    2012-06-03 23:09:55.364071565 +0000
+--- vim73.orig/src/term.c       2010-07-25 13:30:31.000000000 +0000
++++ vim73/src/term.c    2012-07-20 20:31:14.584309160 +0000
 @@ -52,7 +52,7 @@
  
@@ -61206 +66874 @@
      return -1;
 diff -Naur vim73.orig/src/termlib.c vim73/src/termlib.c
---- vim73.orig/src/termlib.c    2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/termlib.c 2012-06-03 23:09:54.100037927 +0000
+--- vim73.orig/src/termlib.c    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/termlib.c 2012-07-20 20:31:10.824306455 +0000
 @@ -13,7 +13,7 @@
  #include "vim.h"
@@ -61218 +66886 @@
  
 diff -Naur vim73.orig/src/testdir/Make_amiga.mak vim73/src/testdir/Make_amiga.mak
---- vim73.orig/src/testdir/Make_amiga.mak       2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/Make_amiga.mak    2012-06-03 23:09:55.708080720 +0000
-@@ -13,6 +13,7 @@
+--- vim73.orig/src/testdir/Make_amiga.mak       2010-08-04 14:34:34.000000000 +0000
++++ vim73/src/testdir/Make_amiga.mak    2012-07-20 20:31:17.337644466 +0000
+@@ -13,6 +13,8 @@
  # test25       uses symbolic link
  # test27       can't edit file with "*"
  # test52       only for Win32
 +# test85       no Lua interface
++# test86, 87   no Python interface
  
  SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                 test7.out test8.out test9.out \
-@@ -27,7 +28,9 @@
+@@ -27,7 +29,9 @@
                 test56.out test57.out test58.out test59.out test60.out \
                 test61.out test62.out test63.out test64.out test65.out \
@@ -61239 +66908 @@
  .SUFFIXES: .in .out
  
-@@ -120,3 +123,14 @@
+@@ -120,3 +124,14 @@
  test71.out: test71.in
  test72.out: test72.in
@@ -61255 +66924 @@
 +test84.out: test84.in
 diff -Naur vim73.orig/src/testdir/Make_dos.mak vim73/src/testdir/Make_dos.mak
---- vim73.orig/src/testdir/Make_dos.mak 2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/Make_dos.mak      2012-06-03 23:09:55.732081359 +0000
+--- vim73.orig/src/testdir/Make_dos.mak 2010-08-13 16:27:19.000000000 +0000
++++ vim73/src/testdir/Make_dos.mak      2012-07-20 20:31:17.337644466 +0000
 @@ -27,7 +27,10 @@
                 test30.out test31.out test32.out test33.out test34.out \
@@ -61265 +66934 @@
 +               test74.out test75.out test76.out test77.out test78.out \
 +               test79.out test80.out test81.out test82.out test83.out \
-+               test84.out test85.out
++               test84.out test85.out test86.out test87.out
  
  SCRIPTS32 =    test50.out test70.out
@@ -61280 +66949 @@
         -del *.out
 diff -Naur vim73.orig/src/testdir/Make_ming.mak vim73/src/testdir/Make_ming.mak
---- vim73.orig/src/testdir/Make_ming.mak        2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/Make_ming.mak     2012-06-03 23:09:55.732081359 +0000
+--- vim73.orig/src/testdir/Make_ming.mak        2010-08-04 14:34:47.000000000 +0000
++++ vim73/src/testdir/Make_ming.mak     2012-07-20 20:31:17.337644466 +0000
 @@ -47,7 +47,10 @@
                 test30.out test31.out test32.out test33.out test34.out \
@@ -61290 +66959 @@
 +               test74.out test75.out test76.out test77.out test78.out \
 +               test79.out test80.out test81.out test82.out test83.out \
-+               test84.out test85.out
++               test84.out test85.out test86.out test87.out
  
  SCRIPTS32 =    test50.out test70.out
@@ -61304 +66973 @@
         -$(DEL) *.out
 diff -Naur vim73.orig/src/testdir/Make_os2.mak vim73/src/testdir/Make_os2.mak
---- vim73.orig/src/testdir/Make_os2.mak 2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/Make_os2.mak      2012-06-03 23:09:55.708080720 +0000
-@@ -13,6 +13,7 @@
+--- vim73.orig/src/testdir/Make_os2.mak 2010-08-04 14:34:55.000000000 +0000
++++ vim73/src/testdir/Make_os2.mak      2012-07-20 20:31:17.337644466 +0000
+@@ -13,6 +13,8 @@
  # test25       uses symbolic link
  # test27       can't edit file with "*" in file name
  # test52       only for Win32
 +# test85       no Lua interface
++# test86, 87   no Python interface
  
  SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                 test7.out test8.out test9.out \
-@@ -27,7 +28,9 @@
+@@ -27,7 +29,9 @@
                 test56.out test57.out test58.out test59.out test60.out \
                 test61.out test62.out test63.out test64.out test65.out \
@@ -61326 +66996 @@
  
 diff -Naur vim73.orig/src/testdir/Make_vms.mms vim73/src/testdir/Make_vms.mms
---- vim73.orig/src/testdir/Make_vms.mms 2012-06-03 23:09:52.932006845 +0000
-+++ vim73/src/testdir/Make_vms.mms      2012-06-03 23:09:55.708080720 +0000
+--- vim73.orig/src/testdir/Make_vms.mms 2010-08-04 14:35:46.000000000 +0000
++++ vim73/src/testdir/Make_vms.mms      2012-07-20 20:31:15.700976626 +0000
 @@ -4,7 +4,7 @@
  # Authors:     Zoltan Arpadffy, <arpadffy@polarhome.com>
@@ -61357 +67027 @@
  SCRIPT_GUI = test16.out
 diff -Naur vim73.orig/src/testdir/Makefile vim73/src/testdir/Makefile
---- vim73.orig/src/testdir/Makefile     2012-06-03 23:09:52.932006845 +0000
-+++ vim73/src/testdir/Makefile  2012-06-03 23:09:55.708080720 +0000
+--- vim73.orig/src/testdir/Makefile     2010-08-15 12:56:30.000000000 +0000
++++ vim73/src/testdir/Makefile  2012-07-20 20:31:17.337644466 +0000
 @@ -10,6 +10,7 @@
  #   This will make testing about 10 times as slow.
@@ -61375 +67045 @@
 +               test74.out test75.out test76.out test77.out test78.out \
 +               test79.out test80.out test81.out test82.out test83.out \
-+               test84.out test85.out
++               test84.out test85.out test86.out test87.out
  
  SCRIPTS_GUI = test16.out
@@ -61398 +67068 @@
  
 diff -Naur vim73.orig/src/testdir/main.aap vim73/src/testdir/main.aap
---- vim73.orig/src/testdir/main.aap     2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/testdir/main.aap  2012-06-03 23:09:53.184013549 +0000
+--- vim73.orig/src/testdir/main.aap     2010-07-30 20:03:23.000000000 +0000
++++ vim73/src/testdir/main.aap  2012-07-20 20:31:07.820970952 +0000
 @@ -13,7 +13,7 @@
                 test33.out test34.out test35.out test36.out test37.out
@@ -61410 +67080 @@
  
 diff -Naur vim73.orig/src/testdir/test1.in vim73/src/testdir/test1.in
---- vim73.orig/src/testdir/test1.in     2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test1.in  2012-06-03 23:09:55.708080720 +0000
+--- vim73.orig/src/testdir/test1.in     2010-08-04 14:06:24.000000000 +0000
++++ vim73/src/testdir/test1.in  2012-07-20 20:31:15.697643290 +0000
 @@ -15,6 +15,7 @@
  be set like small.vim above.  mbyte.vim is sourced by tests that require the
@@ -61439 +67109 @@
  :if 1 | q! | endif
 diff -Naur vim73.orig/src/testdir/test10.in vim73/src/testdir/test10.in
---- vim73.orig/src/testdir/test10.in    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test10.in 2012-06-03 23:09:55.964087533 +0000
+--- vim73.orig/src/testdir/test10.in    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test10.in 2012-07-20 20:31:16.547643900 +0000
 @@ -2,56 +2,113 @@
  
@@ -61590 +67260 @@
  end of testfile
 diff -Naur vim73.orig/src/testdir/test10.ok vim73/src/testdir/test10.ok
---- vim73.orig/src/testdir/test10.ok    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test10.ok 2012-06-03 23:09:55.964087533 +0000
+--- vim73.orig/src/testdir/test10.ok    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test10.ok 2012-07-20 20:31:16.550977236 +0000
 @@ -1,23 +1,23 @@
  start of testfile
@@ -61638 +67308 @@
  end of testfile
 diff -Naur vim73.orig/src/testdir/test19.in vim73/src/testdir/test19.in
---- vim73.orig/src/testdir/test19.in    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test19.in 2012-06-03 23:09:54.700053894 +0000
+--- vim73.orig/src/testdir/test19.in    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test19.in 2012-07-20 20:31:12.597641065 +0000
 @@ -1,6 +1,7 @@
  Tests for "r<Tab>" with 'smarttab' and 'expandtab' set/not set.
@@ -61661 +67331 @@
  
 diff -Naur vim73.orig/src/testdir/test19.ok vim73/src/testdir/test19.ok
---- vim73.orig/src/testdir/test19.ok    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test19.ok 2012-06-03 23:09:54.696053787 +0000
+--- vim73.orig/src/testdir/test19.ok    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test19.ok 2012-07-20 20:31:12.590974393 +0000
 @@ -5,3 +5,5 @@
      a cde
@@ -61669 +67339 @@
 +{
 +        x
+diff -Naur vim73.orig/src/testdir/test29.in vim73/src/testdir/test29.in
+--- vim73.orig/src/testdir/test29.in    2010-08-01 13:38:24.000000000 +0000
++++ vim73/src/testdir/test29.in 2012-07-20 20:31:16.864310793 +0000
+@@ -4,16 +4,17 @@
+  and with 'cpoptions' flag 'j' set or not
+ 
+ STARTTEST
++:so small.vim
+ :set nocompatible viminfo+=nviminfo
+ :set nojoinspaces
+ :set cpoptions-=j
+ /firstline/
+-j"tdGpJjJjJjJjJjJjJjJjJjJjJjJjJjJj05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p:set cpoptions+=j
++j"td/^STARTTEST/-1
++PJjJjJjJjJjJjJjJjJjJjJjJjJjJj05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p:set cpoptions+=j
+ j05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p:set cpoptions-=j joinspaces
+ j"tpJjJjJjJjJjJjJjJjJjJjJjJjJjJj05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p:set cpoptions+=j
+ j05lmx2j06lmy2k4Jy3l$p`xyl$p`yy2l$p:set cpoptions-=j nojoinspaces compatible
+-j"tpJjJjJjJjJjJjJjJjJjJjJjJjJjJj4Jy3l$pjdG:?firstline?+1,$w! test.out
+-:qa!
++j"tpJjJjJjJjJjJjJjJjJjJjJjJjJjJj4Jy3l$pjd/STARTTEST/-2
+ ENDTEST
+ 
+ firstline
+@@ -54,3 +55,148 @@
+ hjkl iop!
+ ert
+ 
++STARTTEST
++/^{/+1
++:set comments=s1:/*,mb:*,ex:*/,://
++:set nojoinspaces fo=j
++:set backspace=eol,start
++:.,+3join
++j4J
++:.,+2join
++j3J
++:.,+2join
++j3J
++:.,+2join
++jj3J
++ENDTEST
++
++{
++
++/*
++ * Make sure the previous comment leader is not removed.
++ */
++
++/*
++ * Make sure the previous comment leader is not removed.
++ */
++
++// Should the next comment leader be left alone?
++// Yes.
++
++// Should the next comment leader be left alone?
++// Yes.
++
++/* Here the comment leader should be left intact. */
++// And so should this one.
++
++/* Here the comment leader should be left intact. */
++// And so should this one.
++
++if (condition) // Remove the next comment leader!
++               // OK, I will.
++    action();
++
++if (condition) // Remove the next comment leader!
++               // OK, I will.
++    action();
++}
++
++STARTTEST
++/^{/+1
++:set comments=sO:*\ -,mO:*\ \ ,exO:*/
++:set comments+=s1:/*,mb:*,ex:*/,://
++:set comments+=s1:>#,mb:#,ex:#<,:<
++:set cpoptions-=j joinspaces fo=j
++:set backspace=eol,start
++:.,+3join
++j4J
++:.,+8join
++j9J
++:.,+2join
++j3J
++:.,+2join
++j3J
++:.,+2join
++jj3J
++j:.,+2join
++jj3J
++j:.,+5join
++j6J
++oSome code!
+// Make sure backspacing does not remove this comment leader.0i
++ENDTEST
++
++{
++
++/*
++ * Make sure the previous comment leader is not removed.
++ */
++
++/*
++ * Make sure the previous comment leader is not removed.
++ */
++
++/* List:
++ * - item1
++ *   foo bar baz
++ *   foo bar baz
++ * - item2
++ *   foo bar baz
++ *   foo bar baz
++ */
++
++/* List:
++ * - item1
++ *   foo bar baz
++ *   foo bar baz
++ * - item2
++ *   foo bar baz
++ *   foo bar baz
++ */
++
++// Should the next comment leader be left alone?
++// Yes.
++
++// Should the next comment leader be left alone?
++// Yes.
++
++/* Here the comment leader should be left intact. */
++// And so should this one.
++
++/* Here the comment leader should be left intact. */
++// And so should this one.
++
++if (condition) // Remove the next comment leader!
++               // OK, I will.
++    action();
++
++if (condition) // Remove the next comment leader!
++               // OK, I will.
++    action();
++
++int i = 7 /* foo *// 3
++ // comment
++ ;
++
++int i = 7 /* foo *// 3
++ // comment
++ ;
++
++># Note that the last character of the ending comment leader (left angle
++ # bracket) is a comment leader itself. Make sure that this comment leader is
++ # not removed from the next line #<
++< On this line a new comment is opened which spans 2 lines. This comment should
++< retain its comment leader.
++
++># Note that the last character of the ending comment leader (left angle
++ # bracket) is a comment leader itself. Make sure that this comment leader is
++ # not removed from the next line #<
++< On this line a new comment is opened which spans 2 lines. This comment should
++< retain its comment leader.
++
++}
++
++STARTTEST
++:g/^STARTTEST/.,/^ENDTEST/d
++:?firstline?+1,$w! test.out
++:qa!
++ENDTEST
+diff -Naur vim73.orig/src/testdir/test29.ok vim73/src/testdir/test29.ok
+--- vim73.orig/src/testdir/test29.ok    2010-07-10 12:08:18.000000000 +0000
++++ vim73/src/testdir/test29.ok 2012-07-20 20:31:16.867644128 +0000
+@@ -47,3 +47,42 @@
+ asdfasdf       asdf
+ asdfasdf               asdf
+ zx cvn.  as dfg? hjkl iop! ert  a
++
++
++{
++/* Make sure the previous comment leader is not removed. */
++/* Make sure the previous comment leader is not removed. */
++// Should the next comment leader be left alone? Yes.
++// Should the next comment leader be left alone? Yes.
++/* Here the comment leader should be left intact. */ // And so should this one.
++/* Here the comment leader should be left intact. */ // And so should this one.
++if (condition) // Remove the next comment leader! OK, I will.
++    action();
++if (condition) // Remove the next comment leader! OK, I will.
++    action();
++}
++
++
++{
++/* Make sure the previous comment leader is not removed.  */
++/* Make sure the previous comment leader is not removed.  */
++/* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
++/* List: item1 foo bar baz foo bar baz item2 foo bar baz foo bar baz */
++// Should the next comment leader be left alone?  Yes.
++// Should the next comment leader be left alone?  Yes.
++/* Here the comment leader should be left intact. */ // And so should this one.
++/* Here the comment leader should be left intact. */ // And so should this one.
++if (condition) // Remove the next comment leader!  OK, I will.
++    action();
++if (condition) // Remove the next comment leader!  OK, I will.
++    action();
++int i = 7 /* foo *// 3 // comment
++ ;
++int i = 7 /* foo *// 3 // comment
++ ;
++># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader.
++># Note that the last character of the ending comment leader (left angle bracket) is a comment leader itself. Make sure that this comment leader is not removed from the next line #< < On this line a new comment is opened which spans 2 lines. This comment should retain its comment leader.
++
++Some code!// Make sure backspacing does not remove this comment leader.
++}
++
 diff -Naur vim73.orig/src/testdir/test3.in vim73/src/testdir/test3.in
---- vim73.orig/src/testdir/test3.in     2012-06-03 23:09:52.932006845 +0000
-+++ vim73/src/testdir/test3.in  2012-06-03 23:09:55.716080932 +0000
+--- vim73.orig/src/testdir/test3.in     2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test3.in  2012-07-20 20:31:16.854310787 +0000
 @@ -299,18 +299,25 @@
  
@@ -61774 +67664 @@
  
  STARTTEST
-@@ -1246,6 +1316,20 @@
+@@ -907,6 +977,24 @@
+ 
+ STARTTEST
+ :set cin
++:set cino=es,n0s
++/main
++=][
++ENDTEST
++
++main(void)
++{
++       /* Make sure that cino=X0s is not parsed like cino=Xs. */
++       if (cond)
++               foo();
++       else
++       {
++               bar();
++       }
++}
++
++STARTTEST
++:set cin
+ :set cino=
+ ]]=][
+ ENDTEST
+@@ -1246,6 +1334,20 @@
  };
  
@@ -61795 +67710 @@
  2kdd]]=][
  ENDTEST
-@@ -1315,6 +1399,626 @@
+@@ -1315,6 +1417,626 @@
  }
  
@@ -62423 +68338 @@
  ENDTEST
 diff -Naur vim73.orig/src/testdir/test3.ok vim73/src/testdir/test3.ok
---- vim73.orig/src/testdir/test3.ok     2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/testdir/test3.ok  2012-06-03 23:09:55.716080932 +0000
+--- vim73.orig/src/testdir/test3.ok     2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test3.ok  2012-07-20 20:31:16.854310787 +0000
 @@ -299,6 +299,13 @@
         maybe
@@ -62509 +68424 @@
  
  
-@@ -1127,6 +1197,16 @@
+@@ -870,6 +940,18 @@
+ }
+ 
+ 
++main(void)
++{
++       /* Make sure that cino=X0s is not parsed like cino=Xs. */
++       if (cond)
++               foo();
++       else
++       {
++               bar();
++       }
++}
++
++
+ {
+        do
+        {
+@@ -1127,6 +1209,16 @@
  };
  
@@ -62526 +68460 @@
  foo()
  {
-@@ -1183,3 +1263,532 @@
+@@ -1183,3 +1275,532 @@
                 foo;
  }
@@ -63060 +68994 @@
 +
 diff -Naur vim73.orig/src/testdir/test31.in vim73/src/testdir/test31.in
---- vim73.orig/src/testdir/test31.in    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test31.in 2012-06-03 23:09:55.440073587 +0000
+--- vim73.orig/src/testdir/test31.in    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test31.in 2012-07-20 20:31:14.857642689 +0000
 @@ -63,6 +63,12 @@
  :" write "testtext 1"
@@ -63076 +69010 @@
  
 diff -Naur vim73.orig/src/testdir/test31.ok vim73/src/testdir/test31.ok
---- vim73.orig/src/testdir/test31.ok    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test31.ok 2012-06-03 23:09:55.440073587 +0000
+--- vim73.orig/src/testdir/test31.ok    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test31.ok 2012-07-20 20:31:14.857642689 +0000
 @@ -9,3 +9,4 @@
  testtext 1
@@ -63083 +69017 @@
  testtext 1
 +testtext 2 2 2
+diff -Naur vim73.orig/src/testdir/test34.in vim73/src/testdir/test34.in
+--- vim73.orig/src/testdir/test34.in    2010-05-29 13:09:55.000000000 +0000
++++ vim73/src/testdir/test34.in 2012-07-20 20:31:18.260978460 +0000
+@@ -1,5 +1,6 @@
+ Test for user functions.
+ Also test an <expr> mapping calling a function.
++Also test that a builtin function cannot be replaced.
+ 
+ STARTTEST
+ :so small.vim
+@@ -58,7 +59,10 @@
+ ---*---
+ (one
+ (two
+-[(one again:$-5,$w! test.out
++[(one again:call append(line('$'), max([1, 2, 3]))
++:call extend(g:, {'max': function('min')})
++:call append(line('$'), max([1, 2, 3]))
++:$-7,$w! test.out
+ :delfunc Table
+ :delfunc Compute
+ :delfunc Expr1
 diff -Naur vim73.orig/src/testdir/test34.ok vim73/src/testdir/test34.ok
---- vim73.orig/src/testdir/test34.ok    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test34.ok 2012-06-03 23:09:54.864058259 +0000
-@@ -1,5 +1,5 @@
+--- vim73.orig/src/testdir/test34.ok    2010-05-29 13:11:12.000000000 +0000
++++ vim73/src/testdir/test34.ok 2012-07-20 20:31:18.260978460 +0000
+@@ -1,6 +1,8 @@
  xxx4asdf fail nop ok 9 333
 -XX111XX
@@ -63093 +69049 @@
  1. one
  2. two
+ 1. one again
++3
++3
 diff -Naur vim73.orig/src/testdir/test43.in vim73/src/testdir/test43.in
---- vim73.orig/src/testdir/test43.in    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test43.in 2012-06-03 23:09:55.288069543 +0000
+--- vim73.orig/src/testdir/test43.in    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test43.in 2012-07-20 20:31:14.397642358 +0000
 @@ -1,6 +1,7 @@
  Tests for regexp with various magic settings.
@@ -63124 +69083 @@
 +
 diff -Naur vim73.orig/src/testdir/test43.ok vim73/src/testdir/test43.ok
---- vim73.orig/src/testdir/test43.ok    2012-06-03 23:09:52.932006845 +0000
-+++ vim73/src/testdir/test43.ok 2012-06-03 23:09:55.132065390 +0000
+--- vim73.orig/src/testdir/test43.ok    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test43.ok 2012-07-20 20:31:13.914308679 +0000
 @@ -6,3 +6,6 @@
  6 x aa$ x
@@ -63134 +69093 @@
 +
 diff -Naur vim73.orig/src/testdir/test44.in vim73/src/testdir/test44.in
---- vim73.orig/src/testdir/test44.in    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test44.in 2012-06-03 23:09:54.512048891 +0000
+--- vim73.orig/src/testdir/test44.in    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test44.in 2012-07-20 20:31:12.114307384 +0000
 @@ -27,6 +27,8 @@
  x/\%U12345678
@@ -63158 +69117 @@
 ẇẘ xẋẍ yÜÿŷẏẙỳỷỹ zźŌşƶẑẕ
 diff -Naur vim73.orig/src/testdir/test44.ok vim73/src/testdir/test44.ok
---- vim73.orig/src/testdir/test44.ok    2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/testdir/test44.ok 2012-06-03 23:09:54.512048891 +0000
+--- vim73.orig/src/testdir/test44.ok    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test44.ok 2012-07-20 20:31:12.117640720 +0000
 @@ -14,6 +14,8 @@
  e y
@@ -63175 +69134 @@
  א
 diff -Naur vim73.orig/src/testdir/test49.vim vim73/src/testdir/test49.vim
---- vim73.orig/src/testdir/test49.vim   2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test49.vim        2012-06-03 23:09:53.108011527 +0000
+--- vim73.orig/src/testdir/test49.vim   2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test49.vim        2012-07-20 20:31:07.597637458 +0000
 @@ -1,6 +1,6 @@
  " Vim script language tests
@@ -63195 +69154 @@
                 endif
 diff -Naur vim73.orig/src/testdir/test55.in vim73/src/testdir/test55.in
---- vim73.orig/src/testdir/test55.in    2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/testdir/test55.in 2012-06-03 23:09:55.840084233 +0000
+--- vim73.orig/src/testdir/test55.in    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test55.in 2012-07-20 20:31:16.110976920 +0000
 @@ -342,7 +342,36 @@
  :$put =(d == d)
@@ -63235 +69194 @@
  :delfunc Test
 diff -Naur vim73.orig/src/testdir/test55.ok vim73/src/testdir/test55.ok
---- vim73.orig/src/testdir/test55.ok    2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/testdir/test55.ok 2012-06-03 23:09:55.840084233 +0000
+--- vim73.orig/src/testdir/test55.ok    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test55.ok 2012-07-20 20:31:16.110976920 +0000
 @@ -109,3 +109,9 @@
  1
@@ -63248 +69207 @@
 +{'a': {'b': 'B'}}
 diff -Naur vim73.orig/src/testdir/test57.in vim73/src/testdir/test57.in
---- vim73.orig/src/testdir/test57.in    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test57.in 2012-06-03 23:09:53.168013125 +0000
+--- vim73.orig/src/testdir/test57.in    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test57.in 2012-07-20 20:31:07.790970931 +0000
 @@ -53,15 +53,19 @@
  t02: numeric
@@ -63272 +69231 @@
  b321b
 diff -Naur vim73.orig/src/testdir/test57.ok vim73/src/testdir/test57.ok
---- vim73.orig/src/testdir/test57.ok    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test57.ok 2012-06-03 23:09:53.168013125 +0000
+--- vim73.orig/src/testdir/test57.ok    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test57.ok 2012-07-20 20:31:07.790970931 +0000
 @@ -21,6 +21,10 @@
  a
@@ -63286 +69245 @@
  b123
 diff -Naur vim73.orig/src/testdir/test61.in vim73/src/testdir/test61.in
---- vim73.orig/src/testdir/test61.in    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test61.in 2012-06-03 23:09:53.052010037 +0000
+--- vim73.orig/src/testdir/test61.in    2010-06-27 03:07:58.000000000 +0000
++++ vim73/src/testdir/test61.in 2012-07-20 20:31:07.427637334 +0000
 @@ -4,6 +4,10 @@
  Also tests :earlier and :later.
@@ -63300 +69259 @@
  x:set ul=100
 diff -Naur vim73.orig/src/testdir/test62.in vim73/src/testdir/test62.in
---- vim73.orig/src/testdir/test62.in    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test62.in 2012-06-03 23:09:55.584077418 +0000
-@@ -49,6 +49,49 @@
+--- vim73.orig/src/testdir/test62.in    2010-05-31 19:22:55.000000000 +0000
++++ vim73/src/testdir/test62.in 2012-07-20 20:31:17.930978224 +0000
+@@ -49,6 +49,77 @@
  :tabclose
  :call append(line('$'), test_status)
@@ -63349 +69308 @@
 +:endif
 +:"
++:"
++:for i in range(9) | tabnew | endfor
++1gt
++Go=tabpagenr()
+
+
++:tabmove 5
++i=tabpagenr()
+
+
++:tabmove -2
++i=tabpagenr()
+
+
++:tabmove +4
++i=tabpagenr()
+
+
++:tabmove
++i=tabpagenr()
+
+
++:tabmove -20
++i=tabpagenr()
+
+
++:tabmove +20
++i=tabpagenr()
+
+
++:3tabmove
++i=tabpagenr()
+
+
++:7tabmove 5
++i=tabpagenr()
+
+
++:let a='No error caught.'
++:try
++:tabmove foo
++:catch E474
++:let a='E474 caught.'
++:endtry
++i=a
+
++:"
  :"
  :/^Results/,$w! test.out
  :qa!
 diff -Naur vim73.orig/src/testdir/test62.ok vim73/src/testdir/test62.ok
---- vim73.orig/src/testdir/test62.ok    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test62.ok 2012-06-03 23:09:55.512075502 +0000
-@@ -5,3 +5,6 @@
+--- vim73.orig/src/testdir/test62.ok    2010-05-31 19:22:55.000000000 +0000
++++ vim73/src/testdir/test62.ok 2012-07-20 20:31:17.930978224 +0000
+@@ -5,3 +5,16 @@
  this is tab page 4
  gettabvar: pass
@@ -63362 +69368 @@
 +tab drop 2: pass
 +tab drop 3: pass
++1
++6
++4
++8
++10
++1
++10
++4
++6
++E474 caught.
 diff -Naur vim73.orig/src/testdir/test65.in vim73/src/testdir/test65.in
---- vim73.orig/src/testdir/test65.in    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test65.in 2012-06-03 23:09:55.036062835 +0000
+--- vim73.orig/src/testdir/test65.in    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test65.in 2012-07-20 20:31:13.614308463 +0000
 @@ -1,4 +1,4 @@
 -Test for floating point.
@@ -63396 +69412 @@
  
 diff -Naur vim73.orig/src/testdir/test65.ok vim73/src/testdir/test65.ok
---- vim73.orig/src/testdir/test65.ok    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test65.ok 2012-06-03 23:09:55.036062835 +0000
+--- vim73.orig/src/testdir/test65.ok    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test65.ok 2012-07-20 20:31:13.614308463 +0000
 @@ -54,3 +54,20 @@
  float2nr
@@ -63420 +69436 @@
 +0
 diff -Naur vim73.orig/src/testdir/test68.in vim73/src/testdir/test68.in
---- vim73.orig/src/testdir/test68.in    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test68.in 2012-06-03 23:09:53.136012273 +0000
-@@ -51,6 +51,17 @@
+--- vim73.orig/src/testdir/test68.in    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test68.in 2012-07-20 20:31:17.610977994 +0000
+@@ -51,6 +51,57 @@
  }
  
  STARTTEST
++/^{/+1
++:set tw=5 fo=tcn comments=:#
++A bjA b
++ENDTEST
++
++{
++  1 a
++# 1 a
++}
++
++STARTTEST
++/^{/+1
++:set tw=5 fo=qn comments=:#
++gwap
++ENDTEST
++
++{
++# 1 a b
++}
++
++STARTTEST
++/^{/+1
++:set tw=5 fo=q2 comments=:#
++gwap
++ENDTEST
++
++{
++# x
++#   a b
++}
++
++STARTTEST
 +/^{/+2
 +:set tw& fo=a
@@ -63435 +69483 @@
 +   2bb
 +}
++
++STARTTEST
++/^#/
++:setl tw=12 fo=tqnc comments=:#
++A foobar
++ENDTEST
++
++# 1 xxxxx
 +
 +STARTTEST
@@ -63441 +69497 @@
  ENDTEST
 diff -Naur vim73.orig/src/testdir/test68.ok vim73/src/testdir/test68.ok
---- vim73.orig/src/testdir/test68.ok    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test68.ok 2012-06-03 23:09:53.136012273 +0000
-@@ -33,3 +33,6 @@
+--- vim73.orig/src/testdir/test68.ok    2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/testdir/test68.ok 2012-07-20 20:31:17.807644801 +0000
+@@ -33,3 +33,30 @@
  #a b
  }
  
 +
++{
++  1 a
++    b
++# 1 a
++#   b
++}
++
++
++{
++# 1 a
++#   b
++}
++
++
++{
++# x a
++#   b
++}
++
++
 +{ 1aa ^^2bb }
 +
++
++# 1 xxxxx
++#   foobar
++
 diff -Naur vim73.orig/src/testdir/test72.in vim73/src/testdir/test72.in
---- vim73.orig/src/testdir/test72.in    2012-06-03 23:09:52.928006738 +0000
-+++ vim73/src/testdir/test72.in 2012-06-03 23:09:55.120065072 +0000
+--- vim73.orig/src/testdir/test72.in    2010-08-07 11:26:43.000000000 +0000
++++ vim73/src/testdir/test72.in 2012-07-20 20:31:13.880975322 +0000
 @@ -51,6 +51,12 @@
  :e Xtestfile
@@ -63467 +69547 @@
  :set undofile cm=zip
 diff -Naur vim73.orig/src/testdir/test72.ok vim73/src/testdir/test72.ok
---- vim73.orig/src/testdir/test72.ok    2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/testdir/test72.ok 2012-06-03 23:09:55.120065072 +0000
+--- vim73.orig/src/testdir/test72.ok    2010-05-30 20:39:12.000000000 +0000
++++ vim73/src/testdir/test72.ok 2012-07-20 20:31:13.880975322 +0000
 @@ -7,6 +7,16 @@
  eight
@@ -63488 +69568 @@
 diff -Naur vim73.orig/src/testdir/test74.in vim73/src/testdir/test74.in
 --- vim73.orig/src/testdir/test74.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test74.in 2012-06-03 23:09:53.184013549 +0000
++++ vim73/src/testdir/test74.in 2012-07-20 20:31:07.824304288 +0000
 @@ -0,0 +1,36 @@
 +" Tests for storing global variables in the .viminfo file vim: set ft=vim:
@@ -63528 +69608 @@
 diff -Naur vim73.orig/src/testdir/test74.ok vim73/src/testdir/test74.ok
 --- vim73.orig/src/testdir/test74.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test74.ok 2012-06-03 23:09:53.184013549 +0000
++++ vim73/src/testdir/test74.ok 2012-07-20 20:31:07.824304288 +0000
 @@ -0,0 +1,5 @@
 +
@@ -63537 +69617 @@
 diff -Naur vim73.orig/src/testdir/test75.in vim73/src/testdir/test75.in
 --- vim73.orig/src/testdir/test75.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test75.in 2012-06-03 23:09:54.628051978 +0000
++++ vim73/src/testdir/test75.in 2012-07-20 20:31:12.414307600 +0000
 @@ -0,0 +1,22 @@
 +" Tests for functions.
@@ -63563 +69643 @@
 diff -Naur vim73.orig/src/testdir/test75.ok vim73/src/testdir/test75.ok
 --- vim73.orig/src/testdir/test75.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test75.ok 2012-06-03 23:09:54.628051978 +0000
++++ vim73/src/testdir/test75.ok 2012-07-20 20:31:12.414307600 +0000
 @@ -0,0 +1,5 @@
 +is<F4>foo
@@ -63572 +69652 @@
 diff -Naur vim73.orig/src/testdir/test76.in vim73/src/testdir/test76.in
 --- vim73.orig/src/testdir/test76.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test76.in 2012-06-03 23:09:53.316017063 +0000
++++ vim73/src/testdir/test76.in 2012-07-20 20:31:08.257637936 +0000
 @@ -0,0 +1,46 @@
 +Tests for completefunc/omnifunc. vim: set ft=vim :
@@ -63622 +69702 @@
 diff -Naur vim73.orig/src/testdir/test76.ok vim73/src/testdir/test76.ok
 --- vim73.orig/src/testdir/test76.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test76.ok 2012-06-03 23:09:53.316017063 +0000
++++ vim73/src/testdir/test76.ok 2012-07-20 20:31:08.257637936 +0000
 @@ -0,0 +1,4 @@
 ++++
@@ -63630 +69710 @@
 diff -Naur vim73.orig/src/testdir/test77.in vim73/src/testdir/test77.in
 --- vim73.orig/src/testdir/test77.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test77.in 2012-06-03 23:09:55.796083061 +0000
++++ vim73/src/testdir/test77.in 2012-07-20 20:31:15.937643464 +0000
 @@ -0,0 +1,29 @@
 +Inserts 2 million lines with consecutive integers starting from 1
@@ -63663 +69743 @@
 diff -Naur vim73.orig/src/testdir/test77.ok vim73/src/testdir/test77.ok
 --- vim73.orig/src/testdir/test77.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test77.ok 2012-06-03 23:09:53.804030049 +0000
++++ vim73/src/testdir/test77.ok 2012-07-20 20:31:09.844305747 +0000
 @@ -0,0 +1 @@
 +3678979763 14888896 Xtest
 diff -Naur vim73.orig/src/testdir/test78.in vim73/src/testdir/test78.in
 --- vim73.orig/src/testdir/test78.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test78.in 2012-06-03 23:09:54.456047401 +0000
++++ vim73/src/testdir/test78.in 2012-07-20 20:31:11.964307276 +0000
 @@ -0,0 +1,46 @@
 +Inserts 10000 lines with text to fill the swap file with two levels of pointer
@@ -63718 +69798 @@
 diff -Naur vim73.orig/src/testdir/test78.ok vim73/src/testdir/test78.ok
 --- vim73.orig/src/testdir/test78.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test78.ok 2012-06-03 23:09:54.288042929 +0000
++++ vim73/src/testdir/test78.ok 2012-07-20 20:31:11.410973545 +0000
 @@ -0,0 +1,3 @@
 +recovery start
@@ -63725 +69805 @@
 diff -Naur vim73.orig/src/testdir/test79.in vim73/src/testdir/test79.in
 --- vim73.orig/src/testdir/test79.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test79.in 2012-06-03 23:09:54.348044528 +0000
++++ vim73/src/testdir/test79.in 2012-07-20 20:31:11.550973645 +0000
 @@ -0,0 +1,213 @@
 +Test for *sub-replace-special* and *sub-replace-expression* on :substitute.
@@ -63953 +70033 @@
 diff -Naur vim73.orig/src/testdir/test79.ok vim73/src/testdir/test79.ok
 --- vim73.orig/src/testdir/test79.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test79.ok 2012-06-03 23:09:54.348044528 +0000
++++ vim73/src/testdir/test79.ok 2012-07-20 20:31:11.550973645 +0000
 @@ -0,0 +1,118 @@
 +Results of test71:
@@ -64077 +70157 @@
 diff -Naur vim73.orig/src/testdir/test80.in vim73/src/testdir/test80.in
 --- vim73.orig/src/testdir/test80.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test80.in 2012-06-03 23:09:54.348044528 +0000
++++ vim73/src/testdir/test80.in 2012-07-20 20:31:11.550973645 +0000
 @@ -0,0 +1,150 @@
 +Test for *sub-replace-special* and *sub-replace-expression* on substitue().
@@ -64242 +70322 @@
 diff -Naur vim73.orig/src/testdir/test80.ok vim73/src/testdir/test80.ok
 --- vim73.orig/src/testdir/test80.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test80.ok 2012-06-03 23:09:54.348044528 +0000
++++ vim73/src/testdir/test80.ok 2012-07-20 20:31:11.550973645 +0000
 @@ -0,0 +1,101 @@
 +Results of test72:
@@ -64365 +70445 @@
 diff -Naur vim73.orig/src/testdir/test81.in vim73/src/testdir/test81.in
 --- vim73.orig/src/testdir/test81.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test81.in 2012-06-03 23:09:54.456047401 +0000
++++ vim73/src/testdir/test81.in 2012-07-20 20:31:11.967640612 +0000
 @@ -0,0 +1,22 @@
 +Test for t movement command and 'cpo-;' setting
@@ -64391 +70471 @@
 diff -Naur vim73.orig/src/testdir/test81.ok vim73/src/testdir/test81.ok
 --- vim73.orig/src/testdir/test81.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test81.ok 2012-06-03 23:09:54.476047933 +0000
++++ vim73/src/testdir/test81.ok 2012-07-20 20:31:12.014307312 +0000
 @@ -0,0 +1,6 @@
 +aaa two
@@ -64401 +70481 @@
 diff -Naur vim73.orig/src/testdir/test82.in vim73/src/testdir/test82.in
 --- vim73.orig/src/testdir/test82.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test82.in 2012-06-03 23:09:54.480048039 +0000
++++ vim73/src/testdir/test82.in 2012-07-20 20:31:12.027640655 +0000
 @@ -0,0 +1,93 @@
 +Tests for case-insensitive UTF-8 comparisons (utf_strnicmp() in mbyte.c)
@@ -64498 +70578 @@
 diff -Naur vim73.orig/src/testdir/test82.ok vim73/src/testdir/test82.ok
 --- vim73.orig/src/testdir/test82.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test82.ok 2012-06-03 23:09:54.480048039 +0000
++++ vim73/src/testdir/test82.ok 2012-07-20 20:31:12.027640655 +0000
 @@ -0,0 +1,2 @@
 +3732 checks passed
@@ -64504 +70584 @@
 diff -Naur vim73.orig/src/testdir/test83-tags2 vim73/src/testdir/test83-tags2
 --- vim73.orig/src/testdir/test83-tags2 1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test83-tags2      2012-06-03 23:09:54.856058047 +0000
++++ vim73/src/testdir/test83-tags2      2012-07-20 20:31:12.994308017 +0000
 @@ -0,0 +1,2 @@
 +!_TAG_FILE_ENCODING    cp932   //
@@ -64510 +70590 @@
 diff -Naur vim73.orig/src/testdir/test83-tags3 vim73/src/testdir/test83-tags3
 --- vim73.orig/src/testdir/test83-tags3 1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test83-tags3      2012-06-03 23:09:54.856058047 +0000
++++ vim73/src/testdir/test83-tags3      2012-07-20 20:31:12.994308017 +0000
 @@ -0,0 +1,102 @@
 +!_TAG_FILE_SORTED      1       //
@@ -64616 +70696 @@
 diff -Naur vim73.orig/src/testdir/test83.in vim73/src/testdir/test83.in
 --- vim73.orig/src/testdir/test83.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test83.in 2012-06-03 23:09:55.088064220 +0000
++++ vim73/src/testdir/test83.in 2012-07-20 20:31:13.787641920 +0000
 @@ -0,0 +1,76 @@
 +Tests for tag search with !_TAG_FILE_ENCODING.
@@ -64696 +70776 @@
 diff -Naur vim73.orig/src/testdir/test83.ok vim73/src/testdir/test83.ok
 --- vim73.orig/src/testdir/test83.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test83.ok 2012-06-03 23:09:54.856058047 +0000
++++ vim73/src/testdir/test83.ok 2012-07-20 20:31:12.997641353 +0000
 @@ -0,0 +1,4 @@
 +Results of test83
@@ -64704 +70784 @@
 diff -Naur vim73.orig/src/testdir/test84.in vim73/src/testdir/test84.in
 --- vim73.orig/src/testdir/test84.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test84.in 2012-06-03 23:09:55.680079974 +0000
++++ vim73/src/testdir/test84.in 2012-07-20 20:31:15.634309912 +0000
 @@ -0,0 +1,35 @@
 +Tests for curswant not changing when setting an option
@@ -64743 +70823 @@
 diff -Naur vim73.orig/src/testdir/test84.ok vim73/src/testdir/test84.ok
 --- vim73.orig/src/testdir/test84.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test84.ok 2012-06-03 23:09:55.680079974 +0000
++++ vim73/src/testdir/test84.ok 2012-07-20 20:31:15.634309912 +0000
 @@ -0,0 +1,3 @@
 +tabstop 7 4
@@ -64750 +70830 @@
 diff -Naur vim73.orig/src/testdir/test85.in vim73/src/testdir/test85.in
 --- vim73.orig/src/testdir/test85.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test85.in 2012-06-03 23:09:55.708080720 +0000
++++ vim73/src/testdir/test85.in 2012-07-20 20:31:15.697643290 +0000
 @@ -0,0 +1,42 @@
 +Test for Lua interface and luaeval() function
@@ -64796 +70876 @@
 diff -Naur vim73.orig/src/testdir/test85.ok vim73/src/testdir/test85.ok
 --- vim73.orig/src/testdir/test85.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/testdir/test85.ok 2012-06-03 23:09:55.708080720 +0000
++++ vim73/src/testdir/test85.ok 2012-07-20 20:31:15.697643290 +0000
 @@ -0,0 +1,5 @@
 +1 changed line 1
@@ -64803 +70883 @@
 +dictionary with list OK
 +circular test OK
+diff -Naur vim73.orig/src/testdir/test86.in vim73/src/testdir/test86.in
+--- vim73.orig/src/testdir/test86.in    1970-01-01 00:00:00.000000000 +0000
++++ vim73/src/testdir/test86.in 2012-07-20 20:31:17.340977802 +0000
+@@ -0,0 +1,211 @@
++Tests for various python features.     vim: set ft=vim :
++
++STARTTEST
++:so small.vim
++:if !has('python') | e! test.ok | wq! test.out | endif
++:py import vim
++:fun Test()
++:let l = []
++:py l=vim.bindeval('l')
++:py f=vim.bindeval('function("strlen")')
++:" Extending List directly with different types
++:py l.extend([1, "as'd", [1, 2, f, {'a': 1}]])
++:$put =string(l)
++:$put =string(l[-1])
++:try
++:  $put =string(l[-4])
++:catch
++:  $put =v:exception[:13]
++:endtry
++:" List assignment
++:py l[0]=0
++:$put =string(l)
++:py l[-2]=f
++:$put =string(l)
++:"
++:" Extending Dictionary directly with different types
++:let d = {}
++:py d=vim.bindeval('d')
++:py d['1']='asd'
++:py d['b']=[1, 2, f]
++:py d['-1']={'a': 1}
++:let dkeys = []
++:py dk=vim.bindeval('dkeys')
++:py dkeys=d.keys()
++:py dkeys.sort()
++:py dk.extend(dkeys)
++:$put =string(dkeys)
++:for [key, val] in sort(items(d))
++:  $put =string(key) . ' : ' . string(val)
++:  unlet key val
++:endfor
++:"
++:" removing items with del
++:py del l[2]
++:$put =string(l)
++:let l = range(8)
++:py l=vim.bindeval('l')
++:try
++:   py del l[:3]
++:   py del l[1:]
++:catch
++:   $put =v:exception
++:endtry
++:$put =string(l)
++:"
++:py del d['-1']
++:$put =string(d)
++:"
++:" removing items out of range: silently skip items that don't exist
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:" The following two ranges delete nothing as they match empty list:
++:py del l[2:1]
++:$put =string(l)
++:py del l[2:2]
++:$put =string(l)
++:py del l[2:3]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py del l[2:4]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py del l[2:5]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py del l[2:6]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:" The following two ranges delete nothing as they match empty list:
++:py del l[-1:2]
++:$put =string(l)
++:py del l[-2:2]
++:$put =string(l)
++:py del l[-3:2]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py del l[-4:2]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py del l[-5:2]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py del l[-6:2]
++:$put =string(l)
++:"
++:" Slice assignment to a list
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py l[0:0]=['a']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py l[1:2]=['b']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py l[2:4]=['c']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py l[4:4]=['d']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py l[-1:2]=['e']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py l[-10:2]=['f']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:py l[2:-10]=['g']
++:$put =string(l)
++:let l = []
++:py l=vim.bindeval('l')
++:py l[0:0]=['h']
++:$put =string(l)
++:"
++:" Locked variables
++:let l = [0, 1, 2, 3]
++:py l=vim.bindeval('l')
++:lockvar! l
++:py l[2]='i'
++:$put =string(l)
++:unlockvar! l
++:"
++:" Function calls
++:function New(...)
++:return ['NewStart']+a:000+['NewEnd']
++:endfunction
++:function DictNew(...) dict
++:return ['DictNewStart']+a:000+['DictNewEnd', self]
++:endfunction
++:let l=[function('New'), function('DictNew')]
++:py l=vim.bindeval('l')
++:py l.extend(list(l[0](1, 2, 3)))
++:$put =string(l)
++:py l.extend(list(l[1](1, 2, 3, self={'a': 'b'})))
++:$put =string(l)
++:py l.extend([l[0].name])
++:$put =string(l)
++:try
++:   py l[1](1, 2, 3)
++:catch
++:   $put =v:exception[:16]
++:endtry
++:delfunction New
++:try
++:   py l[0](1, 2, 3)
++:catch
++:   $put =v:exception[:16]
++:endtry
++:if has('float')
++:   let l=[0.0]
++:   py l=vim.bindeval('l')
++:   py l.extend([0.0])
++:   $put =string(l)
++:else
++:   $put ='[0.0, 0.0]'
++:endif
++:"
++:" pyeval()
++:let l=pyeval('range(3)')
++:$put =string(l)
++:let d=pyeval('{"a": "b", "c": 1, "d": ["e"]}')
++:$put =sort(items(d))
++:try
++:   let undef=pyeval('undefined_name')
++:catch
++:   $put =v:exception[:13]
++:endtry
++:try
++:   let vim=pyeval('vim')
++:catch
++:   $put =v:exception[:13]
++:endtry
++:if has('float')
++:   let f=pyeval('0.0')
++:   $put =string(f)
++:else
++:   $put ='0.0'
++:endif
++:endfun
++:"
++:call Test()
++:"
++:delfunc Test
++:call garbagecollect(1)
++:"
++:/^start:/,$wq! test.out
++ENDTEST
++
++start:
+diff -Naur vim73.orig/src/testdir/test86.ok vim73/src/testdir/test86.ok
+--- vim73.orig/src/testdir/test86.ok    1970-01-01 00:00:00.000000000 +0000
++++ vim73/src/testdir/test86.ok 2012-07-20 20:31:17.340977802 +0000
+@@ -0,0 +1,47 @@
++start:
++[1, 'as''d', [1, 2, function('strlen'), {'a': 1}]]
++[1, 2, function('strlen'), {'a': 1}]
++Vim(put):E684:
++[0, 'as''d', [1, 2, function('strlen'), {'a': 1}]]
++[0, function('strlen'), [1, 2, function('strlen'), {'a': 1}]]
++['-1', '1', 'b']
++'-1' : {'a': 1}
++'1' : 'asd'
++'b' : [1, 2, function('strlen')]
++[0, function('strlen')]
++[3]
++{'1': 'asd', 'b': [1, 2, function('strlen')]}
++[0, 1, 2, 3]
++[0, 1, 2, 3]
++[0, 1, 3]
++[0, 1]
++[0, 1]
++[0, 1]
++[0, 1, 2, 3]
++[0, 1, 2, 3]
++[0, 2, 3]
++[2, 3]
++[2, 3]
++[2, 3]
++['a', 0, 1, 2, 3]
++[0, 'b', 2, 3]
++[0, 1, 'c']
++[0, 1, 2, 3, 'd']
++[0, 1, 2, 'e', 3]
++['f', 2, 3]
++[0, 1, 'g', 2, 3]
++['h']
++[0, 1, 2, 3]
++[function('New'), function('DictNew'), 'NewStart', 1, 2, 3, 'NewEnd']
++[function('New'), function('DictNew'), 'NewStart', 1, 2, 3, 'NewEnd', 'DictNewStart', 1, 2, 3, 'DictNewEnd', {'a': 'b'}]
++[function('New'), function('DictNew'), 'NewStart', 1, 2, 3, 'NewEnd', 'DictNewStart', 1, 2, 3, 'DictNewEnd', {'a': 'b'}, 'New']
++Vim(python):E725:
++Vim(python):E117:
++[0.0, 0.0]
++[0, 1, 2]
++['a', 'b']
++['c', 1]
++['d', ['e']]
++Vim(let):E858:
++Vim(let):E859:
++0.0
+diff -Naur vim73.orig/src/testdir/test87.in vim73/src/testdir/test87.in
+--- vim73.orig/src/testdir/test87.in    1970-01-01 00:00:00.000000000 +0000
++++ vim73/src/testdir/test87.in 2012-07-20 20:31:17.340977802 +0000
+@@ -0,0 +1,211 @@
++Tests for various python features.     vim: set ft=vim :
++
++STARTTEST
++:so small.vim
++:if !has('python3') | e! test.ok | wq! test.out | endif
++:py3 import vim
++:fun Test()
++:let l = []
++:py3 l=vim.bindeval('l')
++:py3 f=vim.bindeval('function("strlen")')
++:" Extending List directly with different types
++:py3 l+=[1, "as'd", [1, 2, f, {'a': 1}]]
++:$put =string(l)
++:$put =string(l[-1])
++:try
++:  $put =string(l[-4])
++:catch
++:  $put =v:exception[:13]
++:endtry
++:" List assignment
++:py3 l[0]=0
++:$put =string(l)
++:py3 l[-2]=f
++:$put =string(l)
++:"
++:" Extending Dictionary directly with different types
++:let d = {}
++:py3 d=vim.bindeval('d')
++:py3 d['1']='asd'
++:py3 d['b']=[1, 2, f]
++:py3 d['-1']={'a': 1}
++:let dkeys = []
++:py3 dk=vim.bindeval('dkeys')
++:py3 dkeys=d.keys()
++:py3 dkeys.sort()
++:py3 dk+=dkeys
++:$put =string(dkeys)
++:for [key, val] in sort(items(d))
++:  $put =string(key) . ' : ' . string(val)
++:  unlet key val
++:endfor
++:"
++:" removing items with del
++:py3 del l[2]
++:$put =string(l)
++:let l = range(8)
++:py3 l=vim.bindeval('l')
++:try
++:   py3 del l[:3]
++:   py3 del l[1:]
++:catch
++:   $put =v:exception
++:endtry
++:$put =string(l)
++:"
++:py3 del d['-1']
++:$put =string(d)
++:"
++:" removing items out of range: silently skip items that don't exist
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:" The following two ranges delete nothing as they match empty list:
++:py3 del l[2:1]
++:$put =string(l)
++:py3 del l[2:2]
++:$put =string(l)
++:py3 del l[2:3]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 del l[2:4]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 del l[2:5]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 del l[2:6]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:" The following two ranges delete nothing as they match empty list:
++:py3 del l[-1:2]
++:$put =string(l)
++:py3 del l[-2:2]
++:$put =string(l)
++:py3 del l[-3:2]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 del l[-4:2]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 del l[-5:2]
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 del l[-6:2]
++:$put =string(l)
++:"
++:" Slice assignment to a list
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 l[0:0]=['a']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 l[1:2]=['b']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 l[2:4]=['c']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 l[4:4]=['d']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 l[-1:2]=['e']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 l[-10:2]=['f']
++:$put =string(l)
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:py3 l[2:-10]=['g']
++:$put =string(l)
++:let l = []
++:py3 l=vim.bindeval('l')
++:py3 l[0:0]=['h']
++:$put =string(l)
++:"
++:" Locked variables
++:let l = [0, 1, 2, 3]
++:py3 l=vim.bindeval('l')
++:lockvar! l
++:py3 l[2]='i'
++:$put =string(l)
++:unlockvar! l
++:"
++:" Function calls
++:function New(...)
++:return ['NewStart']+a:000+['NewEnd']
++:endfunction
++:function DictNew(...) dict
++:return ['DictNewStart']+a:000+['DictNewEnd', self]
++:endfunction
++:let l=[function('New'), function('DictNew')]
++:py3 l=vim.bindeval('l')
++:py3 l.extend(list(l[0](1, 2, 3)))
++:$put =string(l)
++:py3 l.extend(list(l[1](1, 2, 3, self={'a': 'b'})))
++:$put =string(l)
++:py3 l+=[l[0].name]
++:$put =string(l)
++:try
++:   py3 l[1](1, 2, 3)
++:catch
++:   $put =v:exception[:13]
++:endtry
++:delfunction New
++:try
++:   py3 l[0](1, 2, 3)
++:catch
++:   $put =v:exception[:13]
++:endtry
++:if has('float')
++:   let l=[0.0]
++:   py3 l=vim.bindeval('l')
++:   py3 l.extend([0.0])
++:   $put =string(l)
++:else
++:   $put ='[0.0, 0.0]'
++:endif
++:"
++:" py3eval()
++:let l=py3eval('[0, 1, 2]')
++:$put =string(l)
++:let d=py3eval('{"a": "b", "c": 1, "d": ["e"]}')
++:$put =sort(items(d))
++:try
++:   let undef=py3eval('undefined_name')
++:catch
++:   $put =v:exception[:13]
++:endtry
++:try
++:   let vim=py3eval('vim')
++:catch
++:   $put =v:exception[:13]
++:endtry
++:if has('float')
++:   let f=py3eval('0.0')
++:   $put =string(f)
++:else
++:   $put ='0.0'
++:endif
++:endfun
++:"
++:call Test()
++:"
++:delfunc Test
++:call garbagecollect(1)
++:"
++:/^start:/,$wq! test.out
++ENDTEST
++
++start:
+diff -Naur vim73.orig/src/testdir/test87.ok vim73/src/testdir/test87.ok
+--- vim73.orig/src/testdir/test87.ok    1970-01-01 00:00:00.000000000 +0000
++++ vim73/src/testdir/test87.ok 2012-07-20 20:31:17.340977802 +0000
+@@ -0,0 +1,47 @@
++start:
++[1, 'as''d', [1, 2, function('strlen'), {'a': 1}]]
++[1, 2, function('strlen'), {'a': 1}]
++Vim(put):E684:
++[0, 'as''d', [1, 2, function('strlen'), {'a': 1}]]
++[0, function('strlen'), [1, 2, function('strlen'), {'a': 1}]]
++['-1', '1', 'b']
++'-1' : {'a': 1}
++'1' : 'asd'
++'b' : [1, 2, function('strlen')]
++[0, function('strlen')]
++[3]
++{'1': 'asd', 'b': [1, 2, function('strlen')]}
++[0, 1, 2, 3]
++[0, 1, 2, 3]
++[0, 1, 3]
++[0, 1]
++[0, 1]
++[0, 1]
++[0, 1, 2, 3]
++[0, 1, 2, 3]
++[0, 2, 3]
++[2, 3]
++[2, 3]
++[2, 3]
++['a', 0, 1, 2, 3]
++[0, 'b', 2, 3]
++[0, 1, 'c']
++[0, 1, 2, 3, 'd']
++[0, 1, 2, 'e', 3]
++['f', 2, 3]
++[0, 1, 'g', 2, 3]
++['h']
++[0, 1, 2, 3]
++[function('New'), function('DictNew'), 'NewStart', 1, 2, 3, 'NewEnd']
++[function('New'), function('DictNew'), 'NewStart', 1, 2, 3, 'NewEnd', 'DictNewStart', 1, 2, 3, 'DictNewEnd', {'a': 'b'}]
++[function('New'), function('DictNew'), 'NewStart', 1, 2, 3, 'NewEnd', 'DictNewStart', 1, 2, 3, 'DictNewEnd', {'a': 'b'}, 'New']
++Vim(py3):E725:
++Vim(py3):E117:
++[0.0, 0.0]
++[0, 1, 2]
++['a', 'b']
++['c', 1]
++['d', ['e']]
++Vim(let):E860:
++Vim(let):E861:
++0.0
 diff -Naur vim73.orig/src/typemap vim73/src/typemap
---- vim73.orig/src/typemap      2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/typemap   2012-06-03 23:09:55.408072735 +0000
+--- vim73.orig/src/typemap      2010-05-15 11:04:10.000000000 +0000
++++ vim73/src/typemap   2012-07-20 20:31:14.784309303 +0000
 @@ -6,7 +6,7 @@
  T_VIOBJNOMUNGE
@@ -64816 +71428 @@
         }
 diff -Naur vim73.orig/src/ui.c vim73/src/ui.c
---- vim73.orig/src/ui.c 2012-06-03 23:09:52.920006524 +0000
-+++ vim73/src/ui.c      2012-06-03 23:09:55.412072842 +0000
+--- vim73.orig/src/ui.c 2010-08-08 13:17:30.000000000 +0000
++++ vim73/src/ui.c      2012-07-20 20:31:18.067644988 +0000
 @@ -58,7 +58,7 @@
  #endif
@@ -64827 +71439 @@
   * When executing an external program, there may be some typed characters that
   * are not consumed by it.  Give them back to ui_inchar() and they are stored
-@@ -469,7 +469,7 @@
+@@ -381,6 +381,8 @@
+ 
+ #if defined(FEAT_CLIPBOARD) || defined(PROTO)
+ 
++static void clip_copy_selection __ARGS((VimClipboard *clip));
++
+ /*
+  * Selection stuff using Visual mode, for cutting and pasting text to other
+  * windows.
+@@ -423,9 +425,10 @@
+  * this is called whenever VIsual mode is ended.
+  */
+     void
+-clip_update_selection()
++clip_update_selection(clip)
++    VimClipboard    *clip;
+ {
+-    pos_T    start, end;
++    pos_T          start, end;
+ 
+     /* If visual mode is only due to a redo command ("."), then ignore it */
+     if (!redo_VIsual_busy && VIsual_active && (State & NORMAL))
+@@ -444,17 +447,17 @@
+            start = curwin->w_cursor;
+            end = VIsual;
+        }
+-       if (!equalpos(clip_star.start, start)
+-               || !equalpos(clip_star.end, end)
+-               || clip_star.vmode != VIsual_mode)
+-       {
+-           clip_clear_selection();
+-           clip_star.start = start;
+-           clip_star.end = end;
+-           clip_star.vmode = VIsual_mode;
+-           clip_free_selection(&clip_star);
+-           clip_own_selection(&clip_star);
+-           clip_gen_set_selection(&clip_star);
++       if (!equalpos(clip->start, start)
++               || !equalpos(clip->end, end)
++               || clip->vmode != VIsual_mode)
++       {
++           clip_clear_selection(clip);
++           clip->start = start;
++           clip->end = end;
++           clip->vmode = VIsual_mode;
++           clip_free_selection(clip);
++           clip_own_selection(clip);
++           clip_gen_set_selection(clip);
+        }
+     }
+ }
+@@ -469,13 +472,13 @@
       */
  #ifdef FEAT_X11
@@ -64836 +71499 @@
      {
         int was_owned = cbd->owned;
-@@ -1609,7 +1609,7 @@
+ 
+        cbd->owned = (clip_gen_own_selection(cbd) == OK);
+-       if (!was_owned && cbd == &clip_star)
++       if (!was_owned && (cbd == &clip_star || cbd == &clip_plus))
+        {
+            /* May have to show a different kind of highlighting for the
+             * selected area.  There is no specific redraw command for this,
+@@ -483,7 +486,8 @@
+            if (cbd->owned
+                    && (get_real_state() == VISUAL
+                                            || get_real_state() == SELECTMODE)
+-                   && clip_isautosel()
++                   && (cbd == &clip_star ? clip_isautosel_star()
++                                                     : clip_isautosel_plus())
+                    && hl_attr(HLF_V) != hl_attr(HLF_VNC))
+                redraw_curbuf_later(INVERTED_ALL);
+        }
+@@ -502,12 +506,15 @@
+ #ifdef FEAT_X11
+     int            was_owned = cbd->owned;
+ #endif
+-    int     visual_selection = (cbd == &clip_star);
++    int     visual_selection = FALSE;
++
++    if (cbd == &clip_star || cbd == &clip_plus)
++       visual_selection = TRUE;
+ 
+     clip_free_selection(cbd);
+     cbd->owned = FALSE;
+     if (visual_selection)
+-       clip_clear_selection();
++       clip_clear_selection(cbd);
+     clip_gen_lose_selection(cbd);
+ #ifdef FEAT_X11
+     if (visual_selection)
+@@ -518,7 +525,8 @@
+        if (was_owned
+                && (get_real_state() == VISUAL
+                                            || get_real_state() == SELECTMODE)
+-               && clip_isautosel()
++               && (cbd == &clip_star ?
++                               clip_isautosel_star() : clip_isautosel_plus())
+                && hl_attr(HLF_V) != hl_attr(HLF_VNC))
+        {
+            update_curbuf(INVERTED_ALL);
+@@ -534,18 +542,18 @@
+ #endif
+ }
+ 
+-    void
+-clip_copy_selection()
++    static void
++clip_copy_selection(clip)
++    VimClipboard       *clip;
+ {
+-    if (VIsual_active && (State & NORMAL) && clip_star.available)
++    if (VIsual_active && (State & NORMAL) && clip->available)
+     {
+-       if (clip_isautosel())
+-           clip_update_selection();
+-       clip_free_selection(&clip_star);
+-       clip_own_selection(&clip_star);
+-       if (clip_star.owned)
+-           clip_get_selection(&clip_star);
+-       clip_gen_set_selection(&clip_star);
++       clip_update_selection(clip);
++       clip_free_selection(clip);
++       clip_own_selection(clip);
++       if (clip->owned)
++           clip_get_selection(clip);
++       clip_gen_set_selection(clip);
+     }
+ }
+ 
+@@ -555,21 +563,38 @@
+     void
+ clip_auto_select()
+ {
+-    if (clip_isautosel())
+-       clip_copy_selection();
++    if (clip_isautosel_star())
++       clip_copy_selection(&clip_star);
++    if (clip_isautosel_plus())
++       clip_copy_selection(&clip_plus);
+ }
+ 
+ /*
+- * Return TRUE if automatic selection of Visual area is desired.
++ * Return TRUE if automatic selection of Visual area is desired for the *
++ * register.
+  */
+     int
+-clip_isautosel()
++clip_isautosel_star()
+ {
+     return (
+ #ifdef FEAT_GUI
+            gui.in_use ? (vim_strchr(p_go, GO_ASEL) != NULL) :
+ #endif
+-           clip_autoselect);
++           clip_autoselect_star);
++}
++
++/*
++ * Return TRUE if automatic selection of Visual area is desired for the +
++ * register.
++ */
++    int
++clip_isautosel_plus()
++{
++    return (
++#ifdef FEAT_GUI
++           gui.in_use ? (vim_strchr(p_go, GO_ASELPLUS) != NULL) :
++#endif
++           clip_autoselect_plus);
+ }
+ 
+ 
+@@ -657,7 +682,7 @@
+     VimClipboard       *cb = &clip_star;
+ 
+     if (cb->state == SELECT_DONE)
+-       clip_clear_selection();
++       clip_clear_selection(cb);
+ 
+     row = check_row(row);
+     col = check_col(col);
+@@ -749,7 +774,7 @@
+        printf("Selection ended: (%u,%u) to (%u,%u)\n", cb->start.lnum,
+                cb->start.col, cb->end.lnum, cb->end.col);
+ #endif
+-       if (clip_isautosel()
++       if (clip_isautosel_star()
+                || (
+ #ifdef FEAT_GUI
+                    gui.in_use ? (vim_strchr(p_go, GO_ASELML) != NULL) :
+@@ -932,16 +957,16 @@
+  * Called from outside to clear selected region from the display
+  */
+     void
+-clip_clear_selection()
++clip_clear_selection(cbd)
++    VimClipboard    *cbd;
+ {
+-    VimClipboard    *cb = &clip_star;
+ 
+-    if (cb->state == SELECT_CLEARED)
++    if (cbd->state == SELECT_CLEARED)
+        return;
+ 
+-    clip_invert_area((int)cb->start.lnum, cb->start.col, (int)cb->end.lnum,
+-                                                    cb->end.col, CLIP_CLEAR);
+-    cb->state = SELECT_CLEARED;
++    clip_invert_area((int)cbd->start.lnum, cbd->start.col, (int)cbd->end.lnum,
++                                                    cbd->end.col, CLIP_CLEAR);
++    cbd->state = SELECT_CLEARED;
+ }
+ 
+ /*
+@@ -954,7 +979,7 @@
+     if (clip_star.state == SELECT_DONE
+            && row2 >= clip_star.start.lnum
+            && row1 <= clip_star.end.lnum)
+-       clip_clear_selection();
++       clip_clear_selection(&clip_star);
+ }
+ 
+ /*
+@@ -1609,7 +1634,7 @@
  
  #if defined(FEAT_HANGULIN) || defined(PROTO)
@@ -64845 +71676 @@
      int            len;
  {
-@@ -1917,6 +1917,7 @@
+@@ -1917,6 +1942,7 @@
  static Atom    vim_atom;       /* Vim's own special selection format */
  #ifdef FEAT_MBYTE
@@ -64853 +71684 @@
  static Atom    compound_text_atom;
  static Atom    text_atom;
-@@ -1930,6 +1931,7 @@
+@@ -1930,6 +1956,7 @@
      vim_atom          = XInternAtom(dpy, VIM_ATOM_NAME,   False);
  #ifdef FEAT_MBYTE
@@ -64861 +71692 @@
      compound_text_atom = XInternAtom(dpy, "COMPOUND_TEXT", False);
      text_atom         = XInternAtom(dpy, "TEXT",          False);
-@@ -1944,10 +1946,9 @@
+@@ -1944,10 +1971,9 @@
   */
  
@@ -64873 +71704 @@
  /*
   * Property callback to get a timestamp for XtOwnSelection.
-@@ -1985,8 +1986,17 @@
+@@ -1985,8 +2011,17 @@
         return;
  
@@ -64893 +71724 @@
  
      void
-@@ -1997,8 +2007,6 @@
+@@ -1997,8 +2032,6 @@
             /*(XtEventHandler)*/clip_x11_timestamp_cb, (XtPointer)NULL);
  }
@@ -64902 +71733 @@
  clip_x11_request_selection_cb(w, success, sel_atom, type, value, length,
                               format)
-@@ -2010,7 +2018,7 @@
+@@ -2010,7 +2043,7 @@
      long_u     *length;
      int                *format;
@@ -64911 +71742 @@
      char_u     *p;
      char       **text_list = NULL;
-@@ -2030,7 +2038,6 @@
+@@ -2030,7 +2063,6 @@
         *(int *)success = FALSE;
         return;
@@ -64919 +71750 @@
      len = *length;
      if (*type == vim_atom)
-@@ -2069,7 +2076,11 @@
+@@ -2069,7 +2101,11 @@
      }
  #endif
@@ -64932 +71763 @@
                 enc_dbcs != 0 &&
  #endif
-@@ -2123,7 +2134,7 @@
+@@ -2123,7 +2159,7 @@
  #else
             1
@@ -64941 +71772 @@
         switch (i)
         {
-@@ -2131,10 +2142,18 @@
+@@ -2131,10 +2167,18 @@
             case 0:  type = vimenc_atom;        break;
  #endif
@@ -64962 +71793 @@
         XtGetSelectionValue(myShell, cbd->sel_atom, type,
             clip_x11_request_selection_cb, (XtPointer)&success, CurrentTime);
-@@ -2225,18 +2244,23 @@
+@@ -2225,18 +2269,23 @@
      {
         Atom *array;
@@ -64988 +71819 @@
         /* This used to be: *format = sizeof(Atom) * 8; but that caused
          * crashes on 64 bit machines. (Peter Derr) */
-@@ -2248,6 +2272,7 @@
+@@ -2248,6 +2297,7 @@
      if (       *target != XA_STRING
  #ifdef FEAT_MBYTE
@@ -64996 +71827 @@
             && *target != vim_atom
             && *target != text_atom
-@@ -2277,13 +2302,16 @@
+@@ -2277,13 +2327,16 @@
         return False;
      }
@@ -65017 +71848 @@
         XTextProperty   text_prop;
         char            *string_nt = (char *)alloc((unsigned)*length + 1);
-@@ -2336,7 +2364,7 @@
+@@ -2336,7 +2389,7 @@
  
      void
@@ -65026 +71857 @@
  {
      XtDisownSelection(myShell, cbd->sel_atom, CurrentTime);
-@@ -2344,14 +2372,29 @@
+@@ -2344,14 +2397,29 @@
  
      int
@@ -65063 +71894 @@
      return OK;
 diff -Naur vim73.orig/src/undo.c vim73/src/undo.c
---- vim73.orig/src/undo.c       2012-06-03 23:09:52.952007375 +0000
-+++ vim73/src/undo.c    2012-06-03 23:09:55.916086255 +0000
+--- vim73.orig/src/undo.c       2010-08-07 10:48:15.000000000 +0000
++++ vim73/src/undo.c    2012-07-20 20:31:16.354310429 +0000
 @@ -81,10 +81,6 @@
  #define UH_MAGIC 0x18dade      /* value for uh_magic when in use */
@@ -65164 +71995 @@
  #if defined(FEAT_EVAL) || defined(PROTO)
 diff -Naur vim73.orig/src/version.c vim73/src/version.c
---- vim73.orig/src/version.c    2012-06-03 23:09:52.932006845 +0000
-+++ vim73/src/version.c 2012-06-03 23:09:55.964087533 +0000
+--- vim73.orig/src/version.c    2010-08-01 13:45:48.000000000 +0000
++++ vim73/src/version.c 2012-07-20 20:31:18.344311852 +0000
 @@ -379,6 +379,11 @@
  # else
@@ -65190 +72021 @@
         "+path_extra",
  #else
-@@ -715,127 +715,1200 @@
+@@ -715,127 +715,1340 @@
  static int included_patches[] =
  {   /* Add new patch number below this line */
@@ -65206 +72037 @@
 -static char *(extra_patches[]) =
 -{   /* Add your patch description below this line */
-+    538,
++    608,
  /**/
 -    NULL
@@ -65316 +72147 @@
 -    MSG_PUTS(_("\nRISC OS version"));
 -#endif
++    607,
++/**/
++    606,
++/**/
++    605,
++/**/
++    604,
++/**/
++    603,
++/**/
++    602,
++/**/
++    601,
++/**/
++    600,
++/**/
++    599,
++/**/
++    598,
++/**/
++    597,
++/**/
++    596,
++/**/
++    595,
++/**/
++    594,
++/**/
++    593,
++/**/
++    592,
++/**/
++    591,
++/**/
++    590,
++/**/
++    589,
++/**/
++    588,
++/**/
++    587,
++/**/
++    586,
++/**/
++    585,
++/**/
++    584,
++/**/
++    583,
++/**/
++    582,
++/**/
++    581,
++/**/
++    580,
++/**/
++    579,
++/**/
++    578,
++/**/
++    577,
++/**/
++    576,
++/**/
++    575,
++/**/
++    574,
++/**/
++    573,
++/**/
++    572,
++/**/
++    571,
++/**/
++    570,
++/**/
++    569,
++/**/
++    568,
++/**/
++    567,
++/**/
++    566,
++/**/
++    565,
++/**/
++    564,
++/**/
++    563,
++/**/
++    562,
++/**/
++    561,
++/**/
++    560,
++/**/
++    559,
++/**/
++    558,
++/**/
++    557,
++/**/
++    556,
++/**/
++    555,
++/**/
++    554,
++/**/
++    553,
++/**/
++    552,
++/**/
++    551,
++/**/
++    550,
++/**/
++    549,
++/**/
++    548,
++/**/
++    547,
++/**/
++    546,
++/**/
++    545,
++/**/
++    544,
++/**/
++    543,
++/**/
++    542,
++/**/
++    541,
++/**/
++    540,
++/**/
++    539,
++/**/
++    538,
++/**/
 +    537,
 +/**/
@@ -66511 +73482 @@
      MSG_PUTS(_("\nOpenVMS version"));
  # ifdef HAVE_PATHDEF
-@@ -1262,14 +2335,11 @@
+@@ -1262,14 +2475,11 @@
         if (highest_patch())
         {
@@ -66530 +73501 @@
             else
                 sprintf((char *)vers + 3, ".%d", highest_patch());
-diff -Naur vim73.orig/src/version.c.orig vim73/src/version.c.orig
---- vim73.orig/src/version.c.orig       1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/version.c.orig    2012-06-03 23:09:54.144039098 +0000
-@@ -0,0 +1,1691 @@
-+/* vi:set ts=8 sts=4 sw=4:
-+ *
-+ * VIM - Vi IMproved           by Bram Moolenaar
-+ *
-+ * Do ":help uganda"  in Vim to read copying and usage conditions.
-+ * Do ":help credits" in Vim to see a list of people who contributed.
-+ * See README.txt for an overview of the Vim source code.
-+ */
-+
-+#include "vim.h"
-+
-+#ifdef AMIGA
-+# include <time.h>     /* for time() */
-+#endif
-+
-+/*
-+ * Vim originated from Stevie version 3.6 (Fish disk 217) by GRWalter (Fred)
-+ * It has been changed beyond recognition since then.
-+ *
-+ * Differences between version 6.x and 7.x can be found with ":help version7".
-+ * Differences between version 5.x and 6.x can be found with ":help version6".
-+ * Differences between version 4.x and 5.x can be found with ":help version5".
-+ * Differences between version 3.0 and 4.x can be found with ":help version4".
-+ * All the remarks about older versions have been removed, they are not very
-+ * interesting.
-+ */
-+
-+#include "version.h"
-+
-+char           *Version = VIM_VERSION_SHORT;
-+static char    *mediumVersion = VIM_VERSION_MEDIUM;
-+
-+#if defined(HAVE_DATE_TIME) || defined(PROTO)
-+# if (defined(VMS) && defined(VAXC)) || defined(PROTO)
-+char   longVersion[sizeof(VIM_VERSION_LONG_DATE) + sizeof(__DATE__)
-+                                                     + sizeof(__TIME__) + 3];
-+    void
-+make_version()
-+{
-+    /*
-+     * Construct the long version string.  Necessary because
-+     * VAX C can't catenate strings in the preprocessor.
-+     */
-+    strcpy(longVersion, VIM_VERSION_LONG_DATE);
-+    strcat(longVersion, __DATE__);
-+    strcat(longVersion, " ");
-+    strcat(longVersion, __TIME__);
-+    strcat(longVersion, ")");
-+}
-+# else
-+char   *longVersion = VIM_VERSION_LONG_DATE __DATE__ " " __TIME__ ")";
-+# endif
-+#else
-+char   *longVersion = VIM_VERSION_LONG;
-+#endif
-+
-+static void version_msg __ARGS((char *s));
-+
-+static char *(features[]) =
-+{
-+#ifdef AMIGA           /* only for Amiga systems */
-+# ifdef FEAT_ARP
-+       "+ARP",
-+# else
-+       "-ARP",
-+# endif
-+#endif
-+#ifdef FEAT_ARABIC
-+       "+arabic",
-+#else
-+       "-arabic",
-+#endif
-+#ifdef FEAT_AUTOCMD
-+       "+autocmd",
-+#else
-+       "-autocmd",
-+#endif
-+#ifdef FEAT_BEVAL
-+       "+balloon_eval",
-+#else
-+       "-balloon_eval",
-+#endif
-+#ifdef FEAT_BROWSE
-+       "+browse",
-+#else
-+       "-browse",
-+#endif
-+#ifdef NO_BUILTIN_TCAPS
-+       "-builtin_terms",
-+#endif
-+#ifdef SOME_BUILTIN_TCAPS
-+       "+builtin_terms",
-+#endif
-+#ifdef ALL_BUILTIN_TCAPS
-+       "++builtin_terms",
-+#endif
-+#ifdef FEAT_BYTEOFF
-+       "+byte_offset",
-+#else
-+       "-byte_offset",
-+#endif
-+#ifdef FEAT_CINDENT
-+       "+cindent",
-+#else
-+       "-cindent",
-+#endif
-+#ifdef FEAT_CLIENTSERVER
-+       "+clientserver",
-+#else
-+       "-clientserver",
-+#endif
-+#ifdef FEAT_CLIPBOARD
-+       "+clipboard",
-+#else
-+       "-clipboard",
-+#endif
-+#ifdef FEAT_CMDL_COMPL
-+       "+cmdline_compl",
-+#else
-+       "-cmdline_compl",
-+#endif
-+#ifdef FEAT_CMDHIST
-+       "+cmdline_hist",
-+#else
-+       "-cmdline_hist",
-+#endif
-+#ifdef FEAT_CMDL_INFO
-+       "+cmdline_info",
-+#else
-+       "-cmdline_info",
-+#endif
-+#ifdef FEAT_COMMENTS
-+       "+comments",
-+#else
-+       "-comments",
-+#endif
-+#ifdef FEAT_CONCEAL
-+       "+conceal",
-+#else
-+       "-conceal",
-+#endif
-+#ifdef FEAT_CRYPT
-+       "+cryptv",
-+#else
-+       "-cryptv",
-+#endif
-+#ifdef FEAT_CSCOPE
-+       "+cscope",
-+#else
-+       "-cscope",
-+#endif
-+#ifdef FEAT_CURSORBIND
-+       "+cursorbind",
-+#else
-+       "-cursorbind",
-+#endif
-+#ifdef CURSOR_SHAPE
-+       "+cursorshape",
-+#else
-+       "-cursorshape",
-+#endif
-+#if defined(FEAT_CON_DIALOG) && defined(FEAT_GUI_DIALOG)
-+       "+dialog_con_gui",
-+#else
-+# if defined(FEAT_CON_DIALOG)
-+       "+dialog_con",
-+# else
-+#  if defined(FEAT_GUI_DIALOG)
-+       "+dialog_gui",
-+#  else
-+       "-dialog",
-+#  endif
-+# endif
-+#endif
-+#ifdef FEAT_DIFF
-+       "+diff",
-+#else
-+       "-diff",
-+#endif
-+#ifdef FEAT_DIGRAPHS
-+       "+digraphs",
-+#else
-+       "-digraphs",
-+#endif
-+#ifdef FEAT_DND
-+       "+dnd",
-+#else
-+       "-dnd",
-+#endif
-+#ifdef EBCDIC
-+       "+ebcdic",
-+#else
-+       "-ebcdic",
-+#endif
-+#ifdef FEAT_EMACS_TAGS
-+       "+emacs_tags",
-+#else
-+       "-emacs_tags",
-+#endif
-+#ifdef FEAT_EVAL
-+       "+eval",
-+#else
-+       "-eval",
-+#endif
-+#ifdef FEAT_EX_EXTRA
-+       "+ex_extra",
-+#else
-+       "-ex_extra",
-+#endif
-+#ifdef FEAT_SEARCH_EXTRA
-+       "+extra_search",
-+#else
-+       "-extra_search",
-+#endif
-+#ifdef FEAT_FKMAP
-+       "+farsi",
-+#else
-+       "-farsi",
-+#endif
-+#ifdef FEAT_SEARCHPATH
-+       "+file_in_path",
-+#else
-+       "-file_in_path",
-+#endif
-+#ifdef FEAT_FIND_ID
-+       "+find_in_path",
-+#else
-+       "-find_in_path",
-+#endif
-+#ifdef FEAT_FLOAT
-+       "+float",
-+#else
-+       "-float",
-+#endif
-+#ifdef FEAT_FOLDING
-+       "+folding",
-+#else
-+       "-folding",
-+#endif
-+#ifdef FEAT_FOOTER
-+       "+footer",
-+#else
-+       "-footer",
-+#endif
-+           /* only interesting on Unix systems */
-+#if !defined(USE_SYSTEM) && defined(UNIX)
-+       "+fork()",
-+#endif
-+#ifdef FEAT_GETTEXT
-+# ifdef DYNAMIC_GETTEXT
-+       "+gettext/dyn",
-+# else
-+       "+gettext",
-+# endif
-+#else
-+       "-gettext",
-+#endif
-+#ifdef FEAT_HANGULIN
-+       "+hangul_input",
-+#else
-+       "-hangul_input",
-+#endif
-+#if (defined(HAVE_ICONV_H) && defined(USE_ICONV)) || defined(DYNAMIC_ICONV)
-+# ifdef DYNAMIC_ICONV
-+       "+iconv/dyn",
-+# else
-+       "+iconv",
-+# endif
-+#else
-+       "-iconv",
-+#endif
-+#ifdef FEAT_INS_EXPAND
-+       "+insert_expand",
-+#else
-+       "-insert_expand",
-+#endif
-+#ifdef FEAT_JUMPLIST
-+       "+jumplist",
-+#else
-+       "-jumplist",
-+#endif
-+#ifdef FEAT_KEYMAP
-+       "+keymap",
-+#else
-+       "-keymap",
-+#endif
-+#ifdef FEAT_LANGMAP
-+       "+langmap",
-+#else
-+       "-langmap",
-+#endif
-+#ifdef FEAT_LIBCALL
-+       "+libcall",
-+#else
-+       "-libcall",
-+#endif
-+#ifdef FEAT_LINEBREAK
-+       "+linebreak",
-+#else
-+       "-linebreak",
-+#endif
-+#ifdef FEAT_LISP
-+       "+lispindent",
-+#else
-+       "-lispindent",
-+#endif
-+#ifdef FEAT_LISTCMDS
-+       "+listcmds",
-+#else
-+       "-listcmds",
-+#endif
-+#ifdef FEAT_LOCALMAP
-+       "+localmap",
-+#else
-+       "-localmap",
-+#endif
-+#ifdef FEAT_LUA
-+# ifdef DYNAMIC_LUA
-+       "+lua/dyn",
-+# else
-+       "+lua",
-+# endif
-+#else
-+       "-lua",
-+#endif
-+#ifdef FEAT_MENU
-+       "+menu",
-+#else
-+       "-menu",
-+#endif
-+#ifdef FEAT_SESSION
-+       "+mksession",
-+#else
-+       "-mksession",
-+#endif
-+#ifdef FEAT_MODIFY_FNAME
-+       "+modify_fname",
-+#else
-+       "-modify_fname",
-+#endif
-+#ifdef FEAT_MOUSE
-+       "+mouse",
-+#  ifdef FEAT_MOUSESHAPE
-+       "+mouseshape",
-+#  else
-+       "-mouseshape",
-+#  endif
-+# else
-+       "-mouse",
-+#endif
-+#if defined(UNIX) || defined(VMS)
-+# ifdef FEAT_MOUSE_DEC
-+       "+mouse_dec",
-+# else
-+       "-mouse_dec",
-+# endif
-+# ifdef FEAT_MOUSE_GPM
-+       "+mouse_gpm",
-+# else
-+       "-mouse_gpm",
-+# endif
-+# ifdef FEAT_MOUSE_JSB
-+       "+mouse_jsbterm",
-+# else
-+       "-mouse_jsbterm",
-+# endif
-+# ifdef FEAT_MOUSE_NET
-+       "+mouse_netterm",
-+# else
-+       "-mouse_netterm",
-+# endif
-+# ifdef FEAT_SYSMOUSE
-+       "+mouse_sysmouse",
-+# else
-+       "-mouse_sysmouse",
-+# endif
-+# ifdef FEAT_MOUSE_XTERM
-+       "+mouse_xterm",
-+# else
-+       "-mouse_xterm",
-+# endif
-+#endif
-+#ifdef __QNX__
-+# ifdef FEAT_MOUSE_PTERM
-+       "+mouse_pterm",
-+# else
-+       "-mouse_pterm",
-+# endif
-+#endif
-+#ifdef FEAT_MBYTE_IME
-+# ifdef DYNAMIC_IME
-+       "+multi_byte_ime/dyn",
-+# else
-+       "+multi_byte_ime",
-+# endif
-+#else
-+# ifdef FEAT_MBYTE
-+       "+multi_byte",
-+# else
-+       "-multi_byte",
-+# endif
-+#endif
-+#ifdef FEAT_MULTI_LANG
-+       "+multi_lang",
-+#else
-+       "-multi_lang",
-+#endif
-+#ifdef FEAT_MZSCHEME
-+# ifdef DYNAMIC_MZSCHEME
-+       "+mzscheme/dyn",
-+# else
-+       "+mzscheme",
-+# endif
-+#else
-+       "-mzscheme",
-+#endif
-+#ifdef FEAT_NETBEANS_INTG
-+       "+netbeans_intg",
-+#else
-+       "-netbeans_intg",
-+#endif
-+#ifdef FEAT_GUI_W32
-+# ifdef FEAT_OLE
-+       "+ole",
-+# else
-+       "-ole",
-+# endif
-+#endif
-+#ifdef FEAT_PATH_EXTRA
-+       "+path_extra",
-+#else
-+       "-path_extra",
-+#endif
-+#ifdef FEAT_PERL
-+# ifdef DYNAMIC_PERL
-+       "+perl/dyn",
-+# else
-+       "+perl",
-+# endif
-+#else
-+       "-perl",
-+#endif
-+#ifdef FEAT_PERSISTENT_UNDO
-+       "+persistent_undo",
-+#else
-+       "-persistent_undo",
-+#endif
-+#ifdef FEAT_PRINTER
-+# ifdef FEAT_POSTSCRIPT
-+       "+postscript",
-+# else
-+       "-postscript",
-+# endif
-+       "+printer",
-+#else
-+       "-printer",
-+#endif
-+#ifdef FEAT_PROFILE
-+       "+profile",
-+#else
-+       "-profile",
-+#endif
-+#ifdef FEAT_PYTHON
-+# ifdef DYNAMIC_PYTHON
-+       "+python/dyn",
-+# else
-+       "+python",
-+# endif
-+#else
-+       "-python",
-+#endif
-+#ifdef FEAT_PYTHON3
-+# ifdef DYNAMIC_PYTHON3
-+       "+python3/dyn",
-+# else
-+       "+python3",
-+# endif
-+#else
-+       "-python3",
-+#endif
-+#ifdef FEAT_QUICKFIX
-+       "+quickfix",
-+#else
-+       "-quickfix",
-+#endif
-+#ifdef FEAT_RELTIME
-+       "+reltime",
-+#else
-+       "-reltime",
-+#endif
-+#ifdef FEAT_RIGHTLEFT
-+       "+rightleft",
-+#else
-+       "-rightleft",
-+#endif
-+#ifdef FEAT_RUBY
-+# ifdef DYNAMIC_RUBY
-+       "+ruby/dyn",
-+# else
-+       "+ruby",
-+# endif
-+#else
-+       "-ruby",
-+#endif
-+#ifdef FEAT_SCROLLBIND
-+       "+scrollbind",
-+#else
-+       "-scrollbind",
-+#endif
-+#ifdef FEAT_SIGNS
-+       "+signs",
-+#else
-+       "-signs",
-+#endif
-+#ifdef FEAT_SMARTINDENT
-+       "+smartindent",
-+#else
-+       "-smartindent",
-+#endif
-+#ifdef FEAT_SNIFF
-+       "+sniff",
-+#else
-+       "-sniff",
-+#endif
-+#ifdef STARTUPTIME
-+       "+startuptime",
-+#else
-+       "-startuptime",
-+#endif
-+#ifdef FEAT_STL_OPT
-+       "+statusline",
-+#else
-+       "-statusline",
-+#endif
-+#ifdef FEAT_SUN_WORKSHOP
-+       "+sun_workshop",
-+#else
-+       "-sun_workshop",
-+#endif
-+#ifdef FEAT_SYN_HL
-+       "+syntax",
-+#else
-+       "-syntax",
-+#endif
-+           /* only interesting on Unix systems */
-+#if defined(USE_SYSTEM) && (defined(UNIX) || defined(__EMX__))
-+       "+system()",
-+#endif
-+#ifdef FEAT_TAG_BINS
-+       "+tag_binary",
-+#else
-+       "-tag_binary",
-+#endif
-+#ifdef FEAT_TAG_OLDSTATIC
-+       "+tag_old_static",
-+#else
-+       "-tag_old_static",
-+#endif
-+#ifdef FEAT_TAG_ANYWHITE
-+       "+tag_any_white",
-+#else
-+       "-tag_any_white",
-+#endif
-+#ifdef FEAT_TCL
-+# ifdef DYNAMIC_TCL
-+       "+tcl/dyn",
-+# else
-+       "+tcl",
-+# endif
-+#else
-+       "-tcl",
-+#endif
-+#if defined(UNIX) || defined(__EMX__)
-+/* only Unix (or OS/2 with EMX!) can have terminfo instead of termcap */
-+# ifdef TERMINFO
-+       "+terminfo",
-+# else
-+       "-terminfo",
-+# endif
-+#else              /* unix always includes termcap support */
-+# ifdef HAVE_TGETENT
-+       "+tgetent",
-+# else
-+       "-tgetent",
-+# endif
-+#endif
-+#ifdef FEAT_TERMRESPONSE
-+       "+termresponse",
-+#else
-+       "-termresponse",
-+#endif
-+#ifdef FEAT_TEXTOBJ
-+       "+textobjects",
-+#else
-+       "-textobjects",
-+#endif
-+#ifdef FEAT_TITLE
-+       "+title",
-+#else
-+       "-title",
-+#endif
-+#ifdef FEAT_TOOLBAR
-+       "+toolbar",
-+#else
-+       "-toolbar",
-+#endif
-+#ifdef FEAT_USR_CMDS
-+       "+user_commands",
-+#else
-+       "-user_commands",
-+#endif
-+#ifdef FEAT_VERTSPLIT
-+       "+vertsplit",
-+#else
-+       "-vertsplit",
-+#endif
-+#ifdef FEAT_VIRTUALEDIT
-+       "+virtualedit",
-+#else
-+       "-virtualedit",
-+#endif
-+#ifdef FEAT_VISUAL
-+       "+visual",
-+# ifdef FEAT_VISUALEXTRA
-+       "+visualextra",
-+# else
-+       "-visualextra",
-+# endif
-+#else
-+       "-visual",
-+#endif
-+#ifdef FEAT_VIMINFO
-+       "+viminfo",
-+#else
-+       "-viminfo",
-+#endif
-+#ifdef FEAT_VREPLACE
-+       "+vreplace",
-+#else
-+       "-vreplace",
-+#endif
-+#ifdef FEAT_WILDIGN
-+       "+wildignore",
-+#else
-+       "-wildignore",
-+#endif
-+#ifdef FEAT_WILDMENU
-+       "+wildmenu",
-+#else
-+       "-wildmenu",
-+#endif
-+#ifdef FEAT_WINDOWS
-+       "+windows",
-+#else
-+       "-windows",
-+#endif
-+#ifdef FEAT_WRITEBACKUP
-+       "+writebackup",
-+#else
-+       "-writebackup",
-+#endif
-+#if defined(UNIX) || defined(VMS)
-+# ifdef FEAT_X11
-+       "+X11",
-+# else
-+       "-X11",
-+# endif
-+#endif
-+#ifdef FEAT_XFONTSET
-+       "+xfontset",
-+#else
-+       "-xfontset",
-+#endif
-+#ifdef FEAT_XIM
-+       "+xim",
-+#else
-+       "-xim",
-+#endif
-+#if defined(UNIX) || defined(VMS)
-+# ifdef USE_XSMP_INTERACT
-+       "+xsmp_interact",
-+# else
-+#  ifdef USE_XSMP
-+       "+xsmp",
-+#  else
-+       "-xsmp",
-+#  endif
-+# endif
-+# ifdef FEAT_XCLIPBOARD
-+       "+xterm_clipboard",
-+# else
-+       "-xterm_clipboard",
-+# endif
-+#endif
-+#ifdef FEAT_XTERM_SAVE
-+       "+xterm_save",
-+#else
-+       "-xterm_save",
-+#endif
-+#ifdef WIN3264
-+# ifdef FEAT_XPM_W32
-+       "+xpm_w32",
-+# else
-+       "-xpm_w32",
-+# endif
-+#endif
-+       NULL
-+};
-+
-+static int included_patches[] =
-+{   /* Add new patch number below this line */
-+/**/
-+    190,
-+/**/
-+    189,
-+/**/
-+    188,
-+/**/
-+    187,
-+/**/
-+    186,
-+/**/
-+    185,
-+/**/
-+    184,
-+/**/
-+    183,
-+/**/
-+    182,
-+/**/
-+    181,
-+/**/
-+    180,
-+/**/
-+    179,
-+/**/
-+    178,
-+/**/
-+    177,
-+/**/
-+    176,
-+/**/
-+    175,
-+/**/
-+    174,
-+/**/
-+    173,
-+/**/
-+    172,
-+/**/
-+    171,
-+/**/
-+    170,
-+/**/
-+    169,
-+/**/
-+    168,
-+/**/
-+    167,
-+/**/
-+    166,
-+/**/
-+    165,
-+/**/
-+    164,
-+/**/
-+    163,
-+/**/
-+    162,
-+/**/
-+    161,
-+/**/
-+    160,
-+/**/
-+    159,
-+/**/
-+    158,
-+/**/
-+    157,
-+/**/
-+    156,
-+/**/
-+    155,
-+/**/
-+    154,
-+/**/
-+    153,
-+/**/
-+    152,
-+/**/
-+    151,
-+/**/
-+    150,
-+/**/
-+    149,
-+/**/
-+    148,
-+/**/
-+    147,
-+/**/
-+    146,
-+/**/
-+    145,
-+/**/
-+    144,
-+/**/
-+    143,
-+/**/
-+    142,
-+/**/
-+    141,
-+/**/
-+    140,
-+/**/
-+    139,
-+/**/
-+    138,
-+/**/
-+    137,
-+/**/
-+    136,
-+/**/
-+    135,
-+/**/
-+    134,
-+/**/
-+    133,
-+/**/
-+    132,
-+/**/
-+    131,
-+/**/
-+    130,
-+/**/
-+    129,
-+/**/
-+    128,
-+/**/
-+    127,
-+/**/
-+    126,
-+/**/
-+    125,
-+/**/
-+    124,
-+/**/
-+    123,
-+/**/
-+    122,
-+/**/
-+    121,
-+/**/
-+    120,
-+/**/
-+    119,
-+/**/
-+    118,
-+/**/
-+    117,
-+/**/
-+    116,
-+/**/
-+    115,
-+/**/
-+    114,
-+/**/
-+    113,
-+/**/
-+    112,
-+/**/
-+    111,
-+/**/
-+    110,
-+/**/
-+    109,
-+/**/
-+    108,
-+/**/
-+    107,
-+/**/
-+    106,
-+/**/
-+    105,
-+/**/
-+    104,
-+/**/
-+    103,
-+/**/
-+    102,
-+/**/
-+    101,
-+/**/
-+    100,
-+/**/
-+    99,
-+/**/
-+    98,
-+/**/
-+    97,
-+/**/
-+    96,
-+/**/
-+    95,
-+/**/
-+    94,
-+/**/
-+    93,
-+/**/
-+    92,
-+/**/
-+    91,
-+/**/
-+    90,
-+/**/
-+    89,
-+/**/
-+    88,
-+/**/
-+    87,
-+/**/
-+    86,
-+/**/
-+    85,
-+/**/
-+    84,
-+/**/
-+    83,
-+/**/
-+    82,
-+/**/
-+    81,
-+/**/
-+    80,
-+/**/
-+    79,
-+/**/
-+    78,
-+/**/
-+    77,
-+/**/
-+    76,
-+/**/
-+    75,
-+/**/
-+    74,
-+/**/
-+    73,
-+/**/
-+    72,
-+/**/
-+    71,
-+/**/
-+    70,
-+/**/
-+    69,
-+/**/
-+    68,
-+/**/
-+    67,
-+/**/
-+    66,
-+/**/
-+    65,
-+/**/
-+    64,
-+/**/
-+    63,
-+/**/
-+    62,
-+/**/
-+    61,
-+/**/
-+    60,
-+/**/
-+    59,
-+/**/
-+    58,
-+/**/
-+    57,
-+/**/
-+    56,
-+/**/
-+    55,
-+/**/
-+    54,
-+/**/
-+    53,
-+/**/
-+    52,
-+/**/
-+    51,
-+/**/
-+    50,
-+/**/
-+    49,
-+/**/
-+    48,
-+/**/
-+    47,
-+/**/
-+    46,
-+/**/
-+    45,
-+/**/
-+    44,
-+/**/
-+    43,
-+/**/
-+    42,
-+/**/
-+    41,
-+/**/
-+    40,
-+/**/
-+    39,
-+/**/
-+    38,
-+/**/
-+    37,
-+/**/
-+    36,
-+/**/
-+    35,
-+/**/
-+    34,
-+/**/
-+    33,
-+/**/
-+    32,
-+/**/
-+    31,
-+/**/
-+    30,
-+/**/
-+    29,
-+/**/
-+    28,
-+/**/
-+    27,
-+/**/
-+    26,
-+/**/
-+    25,
-+/**/
-+    24,
-+/**/
-+    23,
-+/**/
-+    22,
-+/**/
-+    21,
-+/**/
-+    20,
-+/**/
-+    19,
-+/**/
-+    18,
-+/**/
-+    17,
-+/**/
-+    16,
-+/**/
-+    15,
-+/**/
-+    14,
-+/**/
-+    13,
-+/**/
-+    12,
-+/**/
-+    11,
-+/**/
-+    10,
-+/**/
-+    9,
-+/**/
-+    8,
-+/**/
-+    7,
-+/**/
-+    6,
-+/**/
-+    5,
-+/**/
-+    4,
-+/**/
-+    3,
-+/**/
-+    2,
-+/**/
-+    1,
-+/**/
-+    0
-+};
-+
-+/*
-+ * Place to put a short description when adding a feature with a patch.
-+ * Keep it short, e.g.,: "relative numbers", "persistent undo".
-+ * Also add a comment marker to separate the lines.
-+ * See the official Vim patches for the diff format: It must use a context of
-+ * one line only.  Create it by hand or use "diff -C2" and edit the patch.
-+ */
-+static char *(extra_patches[]) =
-+{   /* Add your patch description below this line */
-+/**/
-+    NULL
-+};
-+
-+    int
-+highest_patch()
-+{
-+    int                i;
-+    int                h = 0;
-+
-+    for (i = 0; included_patches[i] != 0; ++i)
-+       if (included_patches[i] > h)
-+           h = included_patches[i];
-+    return h;
-+}
-+
-+#if defined(FEAT_EVAL) || defined(PROTO)
-+/*
-+ * Return TRUE if patch "n" has been included.
-+ */
-+    int
-+has_patch(n)
-+    int                n;
-+{
-+    int                i;
-+
-+    for (i = 0; included_patches[i] != 0; ++i)
-+       if (included_patches[i] == n)
-+           return TRUE;
-+    return FALSE;
-+}
-+#endif
-+
-+    void
-+ex_version(eap)
-+    exarg_T    *eap;
-+{
-+    /*
-+     * Ignore a ":version 9.99" command.
-+     */
-+    if (*eap->arg == NUL)
-+    {
-+       msg_putchar('\n');
-+       list_version();
-+    }
-+}
-+
-+    void
-+list_version()
-+{
-+    int                i;
-+    int                first;
-+    char       *s = "";
-+
-+    /*
-+     * When adding features here, don't forget to update the list of
-+     * internal variables in eval.c!
-+     */
-+    MSG(longVersion);
-+#ifdef WIN3264
-+# ifdef FEAT_GUI_W32
-+#  if defined(_MSC_VER) && (_MSC_VER <= 1010)
-+    /* Only MS VC 4.1 and earlier can do Win32s */
-+    MSG_PUTS(_("\nMS-Windows 16/32-bit GUI version"));
-+#  else
-+#   ifdef _WIN64
-+    MSG_PUTS(_("\nMS-Windows 64-bit GUI version"));
-+#   else
-+    MSG_PUTS(_("\nMS-Windows 32-bit GUI version"));
-+#   endif
-+#  endif
-+    if (gui_is_win32s())
-+       MSG_PUTS(_(" in Win32s mode"));
-+# ifdef FEAT_OLE
-+    MSG_PUTS(_(" with OLE support"));
-+# endif
-+# else
-+#  ifdef _WIN64
-+    MSG_PUTS(_("\nMS-Windows 64-bit console version"));
-+#  else
-+    MSG_PUTS(_("\nMS-Windows 32-bit console version"));
-+#  endif
-+# endif
-+#endif
-+#ifdef WIN16
-+    MSG_PUTS(_("\nMS-Windows 16-bit version"));
-+#endif
-+#ifdef MSDOS
-+# ifdef DJGPP
-+    MSG_PUTS(_("\n32-bit MS-DOS version"));
-+# else
-+    MSG_PUTS(_("\n16-bit MS-DOS version"));
-+# endif
-+#endif
-+#ifdef MACOS
-+# ifdef MACOS_X
-+#  ifdef MACOS_X_UNIX
-+    MSG_PUTS(_("\nMacOS X (unix) version"));
-+#  else
-+    MSG_PUTS(_("\nMacOS X version"));
-+#  endif
-+#else
-+    MSG_PUTS(_("\nMacOS version"));
-+# endif
-+#endif
-+
-+#ifdef VMS
-+    MSG_PUTS(_("\nOpenVMS version"));
-+# ifdef HAVE_PATHDEF
-+    if (*compiled_arch != NUL)
-+    {
-+       MSG_PUTS(" - ");
-+       MSG_PUTS(compiled_arch);
-+    }
-+# endif
-+
-+#endif
-+
-+    /* Print the list of patch numbers if there is at least one. */
-+    /* Print a range when patches are consecutive: "1-10, 12, 15-40, 42-45" */
-+    if (included_patches[0] != 0)
-+    {
-+       MSG_PUTS(_("\nIncluded patches: "));
-+       first = -1;
-+       /* find last one */
-+       for (i = 0; included_patches[i] != 0; ++i)
-+           ;
-+       while (--i >= 0)
-+       {
-+           if (first < 0)
-+               first = included_patches[i];
-+           if (i == 0 || included_patches[i - 1] != included_patches[i] + 1)
-+           {
-+               MSG_PUTS(s);
-+               s = ", ";
-+               msg_outnum((long)first);
-+               if (first != included_patches[i])
-+               {
-+                   MSG_PUTS("-");
-+                   msg_outnum((long)included_patches[i]);
-+               }
-+               first = -1;
-+           }
-+       }
-+    }
-+
-+    /* Print the list of extra patch descriptions if there is at least one. */
-+    if (extra_patches[0] != NULL)
-+    {
-+       MSG_PUTS(_("\nExtra patches: "));
-+       s = "";
-+       for (i = 0; extra_patches[i] != NULL; ++i)
-+       {
-+           MSG_PUTS(s);
-+           s = ", ";
-+           MSG_PUTS(extra_patches[i]);
-+       }
-+    }
-+
-+#ifdef MODIFIED_BY
-+    MSG_PUTS("\n");
-+    MSG_PUTS(_("Modified by "));
-+    MSG_PUTS(MODIFIED_BY);
-+#endif
-+
-+#ifdef HAVE_PATHDEF
-+    if (*compiled_user != NUL || *compiled_sys != NUL)
-+    {
-+       MSG_PUTS(_("\nCompiled "));
-+       if (*compiled_user != NUL)
-+       {
-+           MSG_PUTS(_("by "));
-+           MSG_PUTS(compiled_user);
-+       }
-+       if (*compiled_sys != NUL)
-+       {
-+           MSG_PUTS("@");
-+           MSG_PUTS(compiled_sys);
-+       }
-+    }
-+#endif
-+
-+#ifdef FEAT_HUGE
-+    MSG_PUTS(_("\nHuge version "));
-+#else
-+# ifdef FEAT_BIG
-+    MSG_PUTS(_("\nBig version "));
-+# else
-+#  ifdef FEAT_NORMAL
-+    MSG_PUTS(_("\nNormal version "));
-+#  else
-+#   ifdef FEAT_SMALL
-+    MSG_PUTS(_("\nSmall version "));
-+#   else
-+    MSG_PUTS(_("\nTiny version "));
-+#   endif
-+#  endif
-+# endif
-+#endif
-+#ifndef FEAT_GUI
-+    MSG_PUTS(_("without GUI."));
-+#else
-+# ifdef FEAT_GUI_GTK
-+#  ifdef FEAT_GUI_GNOME
-+    MSG_PUTS(_("with GTK2-GNOME GUI."));
-+#  else
-+    MSG_PUTS(_("with GTK2 GUI."));
-+#  endif
-+# else
-+#  ifdef FEAT_GUI_MOTIF
-+    MSG_PUTS(_("with X11-Motif GUI."));
-+#  else
-+#   ifdef FEAT_GUI_ATHENA
-+#    ifdef FEAT_GUI_NEXTAW
-+    MSG_PUTS(_("with X11-neXtaw GUI."));
-+#    else
-+    MSG_PUTS(_("with X11-Athena GUI."));
-+#    endif
-+#   else
-+#     ifdef FEAT_GUI_PHOTON
-+    MSG_PUTS(_("with Photon GUI."));
-+#     else
-+#      if defined(MSWIN)
-+    MSG_PUTS(_("with GUI."));
-+#      else
-+#      if defined(TARGET_API_MAC_CARBON) && TARGET_API_MAC_CARBON
-+    MSG_PUTS(_("with Carbon GUI."));
-+#      else
-+#       if defined(TARGET_API_MAC_OSX) && TARGET_API_MAC_OSX
-+    MSG_PUTS(_("with Cocoa GUI."));
-+#       else
-+#        if defined(MACOS)
-+    MSG_PUTS(_("with (classic) GUI."));
-+#        endif
-+#       endif
-+#      endif
-+#      endif
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+#endif
-+    version_msg(_("  Features included (+) or not (-):\n"));
-+
-+    /* print all the features */
-+    for (i = 0; features[i] != NULL; ++i)
-+    {
-+       version_msg(features[i]);
-+       if (msg_col > 0)
-+           version_msg(" ");
-+    }
-+
-+    version_msg("\n");
-+#ifdef SYS_VIMRC_FILE
-+    version_msg(_("   system vimrc file: \""));
-+    version_msg(SYS_VIMRC_FILE);
-+    version_msg("\"\n");
-+#endif
-+#ifdef USR_VIMRC_FILE
-+    version_msg(_("     user vimrc file: \""));
-+    version_msg(USR_VIMRC_FILE);
-+    version_msg("\"\n");
-+#endif
-+#ifdef USR_VIMRC_FILE2
-+    version_msg(_(" 2nd user vimrc file: \""));
-+    version_msg(USR_VIMRC_FILE2);
-+    version_msg("\"\n");
-+#endif
-+#ifdef USR_VIMRC_FILE3
-+    version_msg(_(" 3rd user vimrc file: \""));
-+    version_msg(USR_VIMRC_FILE3);
-+    version_msg("\"\n");
-+#endif
-+#ifdef USR_EXRC_FILE
-+    version_msg(_("      user exrc file: \""));
-+    version_msg(USR_EXRC_FILE);
-+    version_msg("\"\n");
-+#endif
-+#ifdef USR_EXRC_FILE2
-+    version_msg(_("  2nd user exrc file: \""));
-+    version_msg(USR_EXRC_FILE2);
-+    version_msg("\"\n");
-+#endif
-+#ifdef FEAT_GUI
-+# ifdef SYS_GVIMRC_FILE
-+    version_msg(_("  system gvimrc file: \""));
-+    version_msg(SYS_GVIMRC_FILE);
-+    version_msg("\"\n");
-+# endif
-+    version_msg(_("    user gvimrc file: \""));
-+    version_msg(USR_GVIMRC_FILE);
-+    version_msg("\"\n");
-+# ifdef USR_GVIMRC_FILE2
-+    version_msg(_("2nd user gvimrc file: \""));
-+    version_msg(USR_GVIMRC_FILE2);
-+    version_msg("\"\n");
-+# endif
-+# ifdef USR_GVIMRC_FILE3
-+    version_msg(_("3rd user gvimrc file: \""));
-+    version_msg(USR_GVIMRC_FILE3);
-+    version_msg("\"\n");
-+# endif
-+#endif
-+#ifdef FEAT_GUI
-+# ifdef SYS_MENU_FILE
-+    version_msg(_("    system menu file: \""));
-+    version_msg(SYS_MENU_FILE);
-+    version_msg("\"\n");
-+# endif
-+#endif
-+#ifdef HAVE_PATHDEF
-+    if (*default_vim_dir != NUL)
-+    {
-+       version_msg(_("  fall-back for $VIM: \""));
-+       version_msg((char *)default_vim_dir);
-+       version_msg("\"\n");
-+    }
-+    if (*default_vimruntime_dir != NUL)
-+    {
-+       version_msg(_(" f-b for $VIMRUNTIME: \""));
-+       version_msg((char *)default_vimruntime_dir);
-+       version_msg("\"\n");
-+    }
-+    version_msg(_("Compilation: "));
-+    version_msg((char *)all_cflags);
-+    version_msg("\n");
-+#ifdef VMS
-+    if (*compiler_version != NUL)
-+    {
-+       version_msg(_("Compiler: "));
-+       version_msg((char *)compiler_version);
-+       version_msg("\n");
-+    }
-+#endif
-+    version_msg(_("Linking: "));
-+    version_msg((char *)all_lflags);
-+#endif
-+#ifdef DEBUG
-+    version_msg("\n");
-+    version_msg(_("  DEBUG BUILD"));
-+#endif
-+}
-+
-+/*
-+ * Output a string for the version message.  If it's going to wrap, output a
-+ * newline, unless the message is too long to fit on the screen anyway.
-+ */
-+    static void
-+version_msg(s)
-+    char       *s;
-+{
-+    int                len = (int)STRLEN(s);
-+
-+    if (!got_int && len < (int)Columns && msg_col + len >= (int)Columns
-+                                                               && *s != '\n')
-+       msg_putchar('\n');
-+    if (!got_int)
-+       MSG_PUTS(s);
-+}
-+
-+static void do_intro_line __ARGS((int row, char_u *mesg, int add_version, int attr));
-+
-+/*
-+ * Give an introductory message about Vim.
-+ * Only used when starting Vim on an empty file, without a file name.
-+ * Or with the ":intro" command (for Sven :-).
-+ */
-+    void
-+intro_message(colon)
-+    int                colon;          /* TRUE for ":intro" */
-+{
-+    int                i;
-+    int                row;
-+    int                blanklines;
-+    int                sponsor;
-+    char       *p;
-+    static char        *(lines[]) =
-+    {
-+       N_("VIM - Vi IMproved"),
-+       "",
-+       N_("version "),
-+       N_("by Bram Moolenaar et al."),
-+#ifdef MODIFIED_BY
-+       " ",
-+#endif
-+       N_("Vim is open source and freely distributable"),
-+       "",
-+       N_("Help poor children in Uganda!"),
-+       N_("type  :help iccf<Enter>       for information "),
-+       "",
-+       N_("type  :q<Enter>               to exit         "),
-+       N_("type  :help<Enter>  or  <F1>  for on-line help"),
-+       N_("type  :help version7<Enter>   for version info"),
-+       NULL,
-+       "",
-+       N_("Running in Vi compatible mode"),
-+       N_("type  :set nocp<Enter>        for Vim defaults"),
-+       N_("type  :help cp-default<Enter> for info on this"),
-+    };
-+#ifdef FEAT_GUI
-+    static char        *(gui_lines[]) =
-+    {
-+       NULL,
-+       NULL,
-+       NULL,
-+       NULL,
-+#ifdef MODIFIED_BY
-+       NULL,
-+#endif
-+       NULL,
-+       NULL,
-+       NULL,
-+       N_("menu  Help->Orphans           for information    "),
-+       NULL,
-+       N_("Running modeless, typed text is inserted"),
-+       N_("menu  Edit->Global Settings->Toggle Insert Mode  "),
-+       N_("                              for two modes      "),
-+       NULL,
-+       NULL,
-+       NULL,
-+       N_("menu  Edit->Global Settings->Toggle Vi Compatible"),
-+       N_("                              for Vim defaults   "),
-+    };
-+#endif
-+
-+    /* blanklines = screen height - # message lines */
-+    blanklines = (int)Rows - ((sizeof(lines) / sizeof(char *)) - 1);
-+    if (!p_cp)
-+       blanklines += 4;  /* add 4 for not showing "Vi compatible" message */
-+#if defined(WIN3264) && !defined(FEAT_GUI_W32)
-+    if (mch_windows95())
-+       blanklines -= 3;  /* subtract 3 for showing "Windows 95" message */
-+#endif
-+
-+#ifdef FEAT_WINDOWS
-+    /* Don't overwrite a statusline.  Depends on 'cmdheight'. */
-+    if (p_ls > 1)
-+       blanklines -= Rows - topframe->fr_height;
-+#endif
-+    if (blanklines < 0)
-+       blanklines = 0;
-+
-+    /* Show the sponsor and register message one out of four times, the Uganda
-+     * message two out of four times. */
-+    sponsor = (int)time(NULL);
-+    sponsor = ((sponsor & 2) == 0) - ((sponsor & 4) == 0);
-+
-+    /* start displaying the message lines after half of the blank lines */
-+    row = blanklines / 2;
-+    if ((row >= 2 && Columns >= 50) || colon)
-+    {
-+       for (i = 0; i < (int)(sizeof(lines) / sizeof(char *)); ++i)
-+       {
-+           p = lines[i];
-+#ifdef FEAT_GUI
-+           if (p_im && gui.in_use && gui_lines[i] != NULL)
-+               p = gui_lines[i];
-+#endif
-+           if (p == NULL)
-+           {
-+               if (!p_cp)
-+                   break;
-+               continue;
-+           }
-+           if (sponsor != 0)
-+           {
-+               if (strstr(p, "children") != NULL)
-+                   p = sponsor < 0
-+                       ? N_("Sponsor Vim development!")
-+                       : N_("Become a registered Vim user!");
-+               else if (strstr(p, "iccf") != NULL)
-+                   p = sponsor < 0
-+                       ? N_("type  :help sponsor<Enter>    for information ")
-+                       : N_("type  :help register<Enter>   for information ");
-+               else if (strstr(p, "Orphans") != NULL)
-+                   p = N_("menu  Help->Sponsor/Register  for information    ");
-+           }
-+           if (*p != NUL)
-+               do_intro_line(row, (char_u *)_(p), i == 2, 0);
-+           ++row;
-+       }
-+#if defined(WIN3264) && !defined(FEAT_GUI_W32)
-+       if (mch_windows95())
-+       {
-+           do_intro_line(++row,
-+                   (char_u *)_("WARNING: Windows 95/98/ME detected"),
-+                                                       FALSE, hl_attr(HLF_E));
-+           do_intro_line(++row,
-+               (char_u *)_("type  :help windows95<Enter>  for info on this"),
-+                                                                   FALSE, 0);
-+       }
-+#endif
-+    }
-+
-+    /* Make the wait-return message appear just below the text. */
-+    if (colon)
-+       msg_row = row;
-+}
-+
-+    static void
-+do_intro_line(row, mesg, add_version, attr)
-+    int                row;
-+    char_u     *mesg;
-+    int                add_version;
-+    int                attr;
-+{
-+    char_u     vers[20];
-+    int                col;
-+    char_u     *p;
-+    int                l;
-+    int                clen;
-+#ifdef MODIFIED_BY
-+# define MODBY_LEN 150
-+    char_u     modby[MODBY_LEN];
-+
-+    if (*mesg == ' ')
-+    {
-+       vim_strncpy(modby, (char_u *)_("Modified by "), MODBY_LEN - 1);
-+       l = STRLEN(modby);
-+       vim_strncpy(modby + l, (char_u *)MODIFIED_BY, MODBY_LEN - l - 1);
-+       mesg = modby;
-+    }
-+#endif
-+
-+    /* Center the message horizontally. */
-+    col = vim_strsize(mesg);
-+    if (add_version)
-+    {
-+       STRCPY(vers, mediumVersion);
-+       if (highest_patch())
-+       {
-+           /* Check for 9.9x or 9.9xx, alpha/beta version */
-+           if (isalpha((int)vers[3]))
-+           {
-+               if (isalpha((int)vers[4]))
-+                   sprintf((char *)vers + 5, ".%d%s", highest_patch(),
-+                                                          mediumVersion + 5);
-+               else
-+                   sprintf((char *)vers + 4, ".%d%s", highest_patch(),
-+                                                          mediumVersion + 4);
-+           }
-+           else
-+               sprintf((char *)vers + 3, ".%d", highest_patch());
-+       }
-+       col += (int)STRLEN(vers);
-+    }
-+    col = (Columns - col) / 2;
-+    if (col < 0)
-+       col = 0;
-+
-+    /* Split up in parts to highlight <> items differently. */
-+    for (p = mesg; *p != NUL; p += l)
-+    {
-+       clen = 0;
-+       for (l = 0; p[l] != NUL
-+                        && (l == 0 || (p[l] != '<' && p[l - 1] != '>')); ++l)
-+       {
-+#ifdef FEAT_MBYTE
-+           if (has_mbyte)
-+           {
-+               clen += ptr2cells(p + l);
-+               l += (*mb_ptr2len)(p + l) - 1;
-+           }
-+           else
-+#endif
-+               clen += byte2cells(p[l]);
-+       }
-+       screen_puts_len(p, l, row, col, *p == '<' ? hl_attr(HLF_8) : attr);
-+       col += clen;
-+    }
-+
-+    /* Add the version number to the version line. */
-+    if (add_version)
-+       screen_puts(vers, row, col, 0);
-+}
-+
-+/*
-+ * ":intro": clear screen, display intro screen and wait for return.
-+ */
-+    void
-+ex_intro(eap)
-+    exarg_T    *eap UNUSED;
-+{
-+    screenclear();
-+    intro_message(TRUE);
-+    wait_return(TRUE);
-+}
 diff -Naur vim73.orig/src/vim.h vim73/src/vim.h
---- vim73.orig/src/vim.h        2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/vim.h     2012-06-03 23:09:55.952087212 +0000
+--- vim73.orig/src/vim.h        2010-07-29 18:46:39.000000000 +0000
++++ vim73/src/vim.h     2012-07-20 20:31:18.167645059 +0000
 @@ -27,6 +27,11 @@
  # endif
@@ -68327 +73603 @@
   * is used when executing commands and EW_SILENT for interactive expanding. */
  
-@@ -1269,6 +1280,7 @@
+@@ -1061,12 +1072,14 @@
+ #define INSCHAR_DO_COM 2       /* format comments */
+ #define INSCHAR_CTRLV  4       /* char typed just after CTRL-V */
+ #define INSCHAR_NO_FEX 8       /* don't use 'formatexpr' */
++#define INSCHAR_COM_LIST 16    /* format comments with list/2nd line indent */
+ 
+ /* flags for open_line() */
+ #define OPENLINE_DELSPACES  1  /* delete spaces after cursor */
+ #define OPENLINE_DO_COM            2   /* format comments */
+ #define OPENLINE_KEEPTRAIL  4  /* keep trailing spaces */
+ #define OPENLINE_MARKFIX    8  /* fix mark positions */
++#define OPENLINE_COM_LIST  16  /* format comments with list/2nd line indent */
+ 
+ /*
+  * There are four history tables:
+@@ -1228,6 +1241,7 @@
+     EVENT_CMDWINENTER,         /* after entering the cmdline window */
+     EVENT_CMDWINLEAVE,         /* before leaving the cmdline window */
+     EVENT_COLORSCHEME,         /* after loading a colorscheme */
++    EVENT_COMPLETEDONE,                /* after finishing insert complete */
+     EVENT_FILEAPPENDPOST,      /* after appending to a file */
+     EVENT_FILEAPPENDPRE,       /* before appending to a file */
+     EVENT_FILEAPPENDCMD,       /* append to a file using command */
+@@ -1253,8 +1267,9 @@
+     EVENT_INSERTENTER,         /* when entering Insert mode */
+     EVENT_INSERTLEAVE,         /* when leaving Insert mode */
+     EVENT_MENUPOPUP,           /* just before popup menu is displayed */
+-    EVENT_QUICKFIXCMDPOST,     /* after :make, :grep etc */
+-    EVENT_QUICKFIXCMDPRE,      /* before :make, :grep etc */
++    EVENT_QUICKFIXCMDPOST,     /* after :make, :grep etc. */
++    EVENT_QUICKFIXCMDPRE,      /* before :make, :grep etc. */
++    EVENT_QUITPRE,             /* before :quit */
+     EVENT_SESSIONLOADPOST,     /* after loading a session file */
+     EVENT_STDINREADPOST,       /* after reading from stdin */
+     EVENT_STDINREADPRE,                /* before reading from stdin */
+@@ -1269,6 +1284,7 @@
      EVENT_WINENTER,            /* after entering a window */
      EVENT_WINLEAVE,            /* before leaving a window */
@@ -68335 +73646 @@
      EVENT_CURSORHOLDI,         /* idem, in Insert mode */
      EVENT_FUNCUNDEFINED,       /* if calling a function which doesn't exist */
-@@ -1307,6 +1319,7 @@
+@@ -1307,6 +1323,7 @@
      , HLF_M        /* "--More--" message */
      , HLF_CM       /* Mode (e.g., "-- INSERT --") */
@@ -68343 +73654 @@
      , HLF_S        /* status lines */
      , HLF_SNC      /* status lines of not-current windows */
-@@ -1344,7 +1357,7 @@
+@@ -1344,7 +1361,7 @@
  /* The HL_FLAGS must be in the same order as the HLF_ enums!
   * When changing this also adjust the default for 'highlight'. */
@@ -68352 +73663 @@
                   'B', 'P', 'R', 'L', \
                   '+', '=', 'x', 'X', '*', '#', '_', '!', '.', 'o'}
-@@ -1423,6 +1436,8 @@
+@@ -1423,6 +1440,8 @@
  
  #define IOSIZE    (1024+1)     /* file i/o and sprintf buffer size */
@@ -68361 +73672 @@
  # define MSG_BUF_LEN 480       /* length of buffer for small messages */
  # define MSG_BUF_CLEN  (MSG_BUF_LEN / 6)    /* cell length (worst case: utf-8
-@@ -1640,6 +1655,11 @@
+@@ -1640,6 +1659,11 @@
  # define USE_INPUT_BUF
  #endif
@@ -68373 +73684 @@
  /* On MS-Windows the third argument isn't size_t.  This matters for Win64,
   * where sizeof(size_t)==8, not 4 */
-@@ -1683,6 +1703,8 @@
+@@ -1683,6 +1707,8 @@
   * character of up to 6 bytes, or one 16-bit character of up to three bytes
   * plus six following composing characters of three bytes each. */
@@ -68382 +73693 @@
  
  #if (defined(FEAT_PROFILE) || defined(FEAT_RELTIME)) && !defined(PROTO)
-@@ -1842,7 +1864,8 @@
+@@ -1842,7 +1868,8 @@
  #define VV_OP          52
  #define VV_SEARCHFORWARD 53
@@ -68392 +73703 @@
  #ifdef FEAT_CLIPBOARD
  
-@@ -1996,6 +2019,7 @@
+@@ -1996,6 +2023,7 @@
   #pragma warning(disable : 4312)
  #endif
@@ -68400 +73711 @@
  # define vim_realloc(ptr, size)  mem_realloc((ptr), (size))
  #else
-@@ -2193,4 +2217,14 @@
+@@ -2098,6 +2126,12 @@
+ # endif
+ #endif
+ 
++#if defined(FEAT_BROWSE) && defined(GTK_CHECK_VERSION)
++# if GTK_CHECK_VERSION(2,4,0)
++#  define USE_FILE_CHOOSER
++# endif
++#endif
++
+ #ifndef FEAT_NETBEANS_INTG
+ # undef NBDEBUG
+ #endif
+@@ -2193,4 +2227,14 @@
  #define MSCR_LEFT      -1
  #define MSCR_RIGHT     -2
@@ -68416 +73740 @@
  #endif /* VIM__H */
 diff -Naur vim73.orig/src/window.c vim73/src/window.c
---- vim73.orig/src/window.c     2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/window.c  2012-06-03 23:09:55.896085721 +0000
+--- vim73.orig/src/window.c     2010-07-20 20:23:49.000000000 +0000
++++ vim73/src/window.c  2012-07-20 20:31:18.344311852 +0000
 @@ -23,7 +23,7 @@
  static void win_totop __ARGS((int size, int flags));
@@ -68427 +73751 @@
  static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp));
  static tabpage_T *alt_tabpage __ARGS((void));
-@@ -70,7 +70,8 @@
+@@ -45,7 +45,7 @@
+ #if defined(FEAT_WINDOWS) || defined(PROTO)
+ static tabpage_T *alloc_tabpage __ARGS((void));
+ static int leave_tabpage __ARGS((buf_T *new_curbuf));
+-static void enter_tabpage __ARGS((tabpage_T *tp, buf_T *old_curbuf));
++static void enter_tabpage __ARGS((tabpage_T *tp, buf_T *old_curbuf, int trigger_autocmds));
+ static void frame_fix_height __ARGS((win_T *wp));
+ static int frame_minheight __ARGS((frame_T *topfrp, win_T *next_curwin));
+ static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin));
+@@ -54,7 +54,6 @@
+ static void frame_insert __ARGS((frame_T *before, frame_T *frp));
+ static void frame_remove __ARGS((frame_T *frp));
+ #ifdef FEAT_VERTSPLIT
+-static void win_new_width __ARGS((win_T *wp, int width));
+ static void win_goto_ver __ARGS((int up, long count));
+ static void win_goto_hor __ARGS((int left, long count));
+ #endif
+@@ -70,7 +69,7 @@
  #endif /* FEAT_WINDOWS */
  
@@ -68433 +73774 @@
 -static void win_new_height __ARGS((win_T *, int));
 +static void set_fraction __ARGS((win_T *wp));
-+static void win_new_height __ARGS((win_T *wp, int height));
  
  #define URL_SLASH      1               /* path_is_url() has found "://" */
  #define URL_BACKSLASH  2               /* path_is_url() has found ":\\" */
-@@ -525,9 +526,7 @@
+@@ -354,11 +353,11 @@
+                                                     && valid_tabpage(oldtab))
+                    {
+                        newtab = curtab;
+-                       goto_tabpage_tp(oldtab);
++                       goto_tabpage_tp(oldtab, TRUE);
+                        if (curwin == wp)
+                            win_close(curwin, FALSE);
+                        if (valid_tabpage(newtab))
+-                           goto_tabpage_tp(newtab);
++                           goto_tabpage_tp(newtab, TRUE);
+                    }
+                }
+                break;
+@@ -525,9 +524,7 @@
                     setpcmark();
                     if (win_split(0, 0) == OK)
@@ -68448 +73802 @@
                                                            ECMD_HIDE, NULL);
                         if (nchar == 'F' && lnum >= 0)
-@@ -684,19 +683,19 @@
+@@ -684,19 +681,19 @@
  }
  
@@ -68473 +73827 @@
      int                new_size = size;
      int                i;
-@@ -719,7 +718,7 @@
+@@ -719,7 +716,7 @@
      /* add a status line when p_ls == 1 and splitting the first window */
      if (lastwin == firstwin && p_ls == 1 && oldwin->w_status_height == 0)
@@ -68482 +73836 @@
             EMSG(_(e_noroom));
             return FAIL;
-@@ -752,7 +751,7 @@
+@@ -752,7 +749,7 @@
         }
         else
@@ -68491 +73845 @@
             EMSG(_(e_noroom));
             return FAIL;
-@@ -816,7 +815,7 @@
+@@ -816,7 +813,7 @@
             available = oldwin->w_height;
             needed += p_wmh;
@@ -68500 +73854 @@
             EMSG(_(e_noroom));
             return FAIL;
-@@ -889,20 +888,20 @@
+@@ -889,20 +886,20 @@
                         p_sb))))
      {
@@ -68524 +73878 @@
         if (wp == NULL)
             return FAIL;
-@@ -973,10 +972,10 @@
+@@ -973,10 +970,10 @@
                 frp->fr_parent = curfrp;
      }
@@ -68537 +73891 @@
  
      /* Insert the new frame at the right place in the frame list. */
-@@ -985,10 +984,17 @@
+@@ -985,10 +982,17 @@
      else
         frame_append(curfrp, frp);
@@ -68555 +73909 @@
         {
             win_new_height(oldwin, oldwin->w_height - 1);
-@@ -1220,15 +1226,15 @@
+@@ -1220,15 +1224,15 @@
      }
      newp->w_tagstackidx = oldp->w_tagstackidx;
@@ -68575 +73929 @@
  
  /*
-@@ -2077,7 +2083,7 @@
+@@ -2028,7 +2032,11 @@
+ 
+     for (wp = firstwin; wp != NULL && lastwin != firstwin; )
+     {
+-       if (wp->w_buffer == buf && (!keep_curwin || wp != curwin))
++       if (wp->w_buffer == buf && (!keep_curwin || wp != curwin)
++#ifdef FEAT_AUTOCMD
++               && !(wp->w_closing || wp->w_buffer->b_closing)
++#endif
++               )
+        {
+            win_close(wp, FALSE);
+ 
+@@ -2045,7 +2053,11 @@
+        nexttp = tp->tp_next;
+        if (tp != curtab)
+            for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next)
+-               if (wp->w_buffer == buf)
++               if (wp->w_buffer == buf
++#ifdef FEAT_AUTOCMD
++                   && !(wp->w_closing || wp->w_buffer->b_closing)
++#endif
++                   )
+                {
+                    win_close_othertab(wp, FALSE, tp);
+ 
+@@ -2077,7 +2089,7 @@
   * Return TRUE if there is only one window other than "aucmd_win" in the
   * current tab page.
@@ -68584 +73964 @@
  {
  #ifdef FEAT_AUTOCMD
-@@ -2100,10 +2106,46 @@
+@@ -2100,10 +2112,54 @@
  }
  
@@ -68604 +73984 @@
 +        * curwin and curtab are invalid while we are freeing memory, they may
 +        * be used in GUI events.
++        * Don't trigger autocommands yet, they may use wrong values, so do
++        * that below.
 +        */
-+       goto_tabpage_tp(alt_tabpage());
++       goto_tabpage_tp(alt_tabpage(), FALSE);
 +       redraw_tabline = TRUE;
 +
@@ -68618 +74000 @@
 +               shell_new_rows();
 +       }
++       /* Since goto_tabpage_tp above did not trigger *Enter autocommands, do
++        * that now. */
++#ifdef FEAT_AUTOCMD
++       apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
++       apply_autocmds(EVENT_WINENTER, NULL, NULL, FALSE, curbuf);
++#endif
 +       return TRUE;
 +    }
@@ -68632 +74020 @@
      void
  win_close(win, free_buf)
-@@ -2138,33 +2180,15 @@
+@@ -2126,6 +2182,8 @@
+     }
+ 
+ #ifdef FEAT_AUTOCMD
++    if (win->w_closing || (win->w_buffer != NULL && win->w_buffer->b_closing))
++       return; /* window is already being closed */
+     if (win == aucmd_win)
+     {
+        EMSG(_("E813: Cannot close autocmd window"));
+@@ -2138,33 +2196,15 @@
      }
  #endif
@@ -68672 +74069 @@
      else
         clear_snapshot(curtab, SNAP_HELP_IDX);
-@@ -2206,17 +2230,26 @@
+@@ -2179,17 +2219,26 @@
+        wp = frame2win(win_altframe(win, NULL));
+ 
+        /*
+-        * Be careful: If autocommands delete the window, return now.
++        * Be careful: If autocommands delete the window or cause this window
++        * to be the last one left, return now.
+         */
+        if (wp->w_buffer != curbuf)
+        {
+            other_buffer = TRUE;
++           win->w_closing = TRUE;
+            apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf);
+-           if (!win_valid(win) || last_window())
++           if (!win_valid(win))
++               return;
++           win->w_closing = FALSE;
++           if (last_window())
+                return;
+        }
++       win->w_closing = TRUE;
+        apply_autocmds(EVENT_WINLEAVE, NULL, NULL, FALSE, curbuf);
+-       if (!win_valid(win) || last_window())
++       if (!win_valid(win))
++           return;
++       win->w_closing = FALSE;
++       if (last_window())
+            return;
+ # ifdef FEAT_EVAL
+        /* autocmds may abort script processing */
+@@ -2206,17 +2255,35 @@
         out_flush();
  #endif
@@ -68687 +74114 @@
 -    close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0);
 +    if (win->w_buffer != NULL)
-+       close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, TRUE);
++    {
++#ifdef FEAT_AUTOCMD
++       win->w_closing = TRUE;
++#endif
++       close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, FALSE);
++#ifdef FEAT_AUTOCMD
++       if (win_valid(win))
++           win->w_closing = FALSE;
++#endif
++    }
  
      /* Autocommands may have closed the window already, or closed the only
@@ -68702 +74138 @@
  
      /* Make sure curwin isn't invalid.  It can cause severe trouble when
-@@ -2297,7 +2330,7 @@
+@@ -2297,7 +2364,7 @@
  
  /*
@@ -68711 +74147 @@
   * Caller must check if buffer is hidden and whether the tabline needs to be
   * updated.
-@@ -2314,7 +2347,7 @@
+@@ -2313,8 +2380,13 @@
+     tabpage_T   *ptp = NULL;
      int                free_tp = FALSE;
  
++#ifdef FEAT_AUTOCMD
++    if (win->w_closing || win->w_buffer->b_closing)
++       return; /* window is already being closed */
++#endif
++
      /* Close the link to the buffer. */
 -    close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0);
@@ -68720 +74162 @@
      /* Careful: Autocommands may have closed the tab page or made it the
       * current tab page.  */
-@@ -3241,6 +3274,9 @@
+@@ -3241,6 +3313,9 @@
      else
         wp->w_farsi = W_CONV;
@@ -68730 +74172 @@
  
  /*
-@@ -3277,9 +3313,7 @@
+@@ -3277,9 +3352,7 @@
      if (aucmd_win != NULL)
      {
@@ -68741 +74183 @@
      }
  }
-@@ -3320,10 +3354,8 @@
+@@ -3320,10 +3393,8 @@
         /* First window in new tab page, initialize it from "oldwin". */
         win_init(curwin, oldwin, 0);
@@ -68754 +74196 @@
  #endif
  
-@@ -3664,13 +3696,6 @@
+@@ -3395,7 +3466,7 @@
+ # endif
+ #ifdef FEAT_EVAL
+        /* init t: variables */
+-       init_var_dict(&tp->tp_vars, &tp->tp_winvar);
++       init_var_dict(&tp->tp_vars, &tp->tp_winvar, VAR_SCOPE);
+ #endif
+        tp->tp_ch_used = p_ch;
+     }
+@@ -3491,7 +3562,7 @@
+     }
+ 
+     /* Failed, get back the previous Tab page */
+-    enter_tabpage(curtab, curbuf);
++    enter_tabpage(curtab, curbuf, TRUE);
+     return FAIL;
+ }
+ 
+@@ -3644,11 +3715,13 @@
+ /*
+  * Start using tab page "tp".
+  * Only to be used after leave_tabpage() or freeing the current tab page.
++ * Only trigger *Enter autocommands when trigger_autocmds is TRUE.
+  */
+     static void
+-enter_tabpage(tp, old_curbuf)
++enter_tabpage(tp, old_curbuf, trigger_autocmds)
+     tabpage_T  *tp;
+     buf_T      *old_curbuf UNUSED;
++    int                trigger_autocmds UNUSED;
+ {
+     int                old_off = tp->tp_firstwin->w_winrow;
+     win_T      *next_prevwin = tp->tp_prevwin;
+@@ -3664,13 +3737,6 @@
      win_enter_ext(tp->tp_curwin, FALSE, TRUE);
      prevwin = next_prevwin;
@@ -68768 +74243 @@
      (void)win_comp_pos();      /* recompute w_winrow for all windows */
      must_redraw = CLEAR;       /* need to redraw everything */
-@@ -3700,6 +3725,14 @@
+@@ -3700,6 +3766,17 @@
      gui_may_update_scrollbars();
  #endif
@@ -68775 +74250 @@
 +    /* Apply autocommands after updating the display, when 'rows' and
 +     * 'columns' have been set correctly. */
-+    apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
-+    if (old_curbuf != curbuf)
-+       apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
++    if (trigger_autocmds)
++    {
++       apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
++       if (old_curbuf != curbuf)
++           apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
++    }
 +#endif
 +
@@ -68783 +74261 @@
  }
  
-@@ -4271,19 +4304,19 @@
+@@ -3773,7 +3850,7 @@
+        }
+     }
+ 
+-    goto_tabpage_tp(tp);
++    goto_tabpage_tp(tp, TRUE);
+ 
+ #ifdef FEAT_GUI_TABLINE
+     if (gui_use_tabline())
+@@ -3783,11 +3860,13 @@
+ 
+ /*
+  * Go to tabpage "tp".
++ * Only trigger *Enter autocommands when trigger_autocmds is TRUE.
+  * Note: doesn't update the GUI tab.
+  */
+     void
+-goto_tabpage_tp(tp)
++goto_tabpage_tp(tp, trigger_autocmds)
+     tabpage_T  *tp;
++    int                trigger_autocmds;
+ {
+     /* Don't repeat a message in another tab page. */
+     set_keep_msg(NULL, 0);
+@@ -3795,9 +3874,9 @@
+     if (tp != curtab && leave_tabpage(tp->tp_curwin->w_buffer) == OK)
+     {
+        if (valid_tabpage(tp))
+-           enter_tabpage(tp, curbuf);
++           enter_tabpage(tp, curbuf, trigger_autocmds);
+        else
+-           enter_tabpage(curtab, curbuf);
++           enter_tabpage(curtab, curbuf, trigger_autocmds);
+     }
+ }
+ 
+@@ -3810,7 +3889,7 @@
+     tabpage_T  *tp;
+     win_T      *wp;
+ {
+-    goto_tabpage_tp(tp);
++    goto_tabpage_tp(tp, TRUE);
+     if (curtab == tp && win_valid(wp))
+     {
+        win_enter(wp, TRUE);
+@@ -3848,7 +3927,7 @@
+     }
+ 
+     /* Re-insert it at the specified position. */
+-    if (n == 0)
++    if (n <= 0)
+     {
+        curtab->tp_next = first_tabpage;
+        first_tabpage = curtab;
+@@ -4271,19 +4350,19 @@
      win_T      *after UNUSED;
      int                hidden UNUSED;
@@ -68809 +74341 @@
  #ifdef FEAT_AUTOCMD
         /* Don't execute autocommands while the window is not properly
-@@ -4296,53 +4329,53 @@
+@@ -4296,53 +4375,53 @@
          */
  #ifdef FEAT_WINDOWS
@@ -68861 +74393 @@
         /* init w: variables */
 -       init_var_dict(&newwin->w_vars, &newwin->w_winvar);
-+       init_var_dict(&new_wp->w_vars, &new_wp->w_winvar);
++       init_var_dict(&new_wp->w_vars, &new_wp->w_winvar, VAR_SCOPE);
  #endif
  #ifdef FEAT_FOLDING
@@ -68882 +74414 @@
  
  #if defined(FEAT_WINDOWS) || defined(PROTO)
-@@ -4435,7 +4468,6 @@
+@@ -4435,7 +4514,6 @@
  #endif /* FEAT_GUI */
  
@@ -68890 +74422 @@
  #endif
  
-@@ -5459,6 +5491,19 @@
+@@ -5459,19 +5537,31 @@
  
  #endif /* FEAT_WINDOWS */
@@ -68910 +74442 @@
   * Set the height of a window.
   * This takes care of the things inside the window, not what happens to the
-@@ -5471,7 +5516,6 @@
+  * window position, the frame or to other windows.
+  */
+-    static void
++    void
+ win_new_height(wp, height)
+     win_T      *wp;
+     int                height;
  {
      linenr_T   lnum;
@@ -68918 +74456 @@
      /* Don't want a negative height.  Happens when splitting a tiny window.
       * Will equalize heights soon to fix it. */
-@@ -5481,8 +5525,7 @@
+@@ -5481,8 +5571,7 @@
         return;     /* nothing to do */
  
@@ -68928 +74466 @@
      wp->w_height = height;
      wp->w_skipcol = 0;
+@@ -5606,7 +5695,7 @@
+ /*
+  * Set the width of a window.
+  */
+-    static void
++    void
+ win_new_width(wp, width)
+     win_T      *wp;
+     int                width;
 diff -Naur vim73.orig/src/workshop.c vim73/src/workshop.c
---- vim73.orig/src/workshop.c   2012-06-03 23:09:52.924006631 +0000
-+++ vim73/src/workshop.c        2012-06-03 23:09:53.540023023 +0000
+--- vim73.orig/src/workshop.c   2010-08-08 13:18:24.000000000 +0000
++++ vim73/src/workshop.c        2012-07-20 20:31:08.990971798 +0000
 @@ -16,7 +16,6 @@
  #include <sys/types.h>
@@ -68940 +74487 @@
  # include <libgen.h>
 diff -Naur vim73.orig/src/xpm_w32.c vim73/src/xpm_w32.c
---- vim73.orig/src/xpm_w32.c    2012-06-03 23:09:52.940007057 +0000
-+++ vim73/src/xpm_w32.c 2012-06-03 23:09:55.348071138 +0000
+--- vim73.orig/src/xpm_w32.c    2010-05-15 11:04:07.000000000 +0000
++++ vim73/src/xpm_w32.c 2012-07-20 20:31:14.540975795 +0000
 @@ -1,4 +1,5 @@
 -/*
@@ -68992 +74539 @@
 diff -Naur vim73.orig/src/xxd/Make_ming.mak vim73/src/xxd/Make_ming.mak
 --- vim73.orig/src/xxd/Make_ming.mak    1970-01-01 00:00:00.000000000 +0000
-+++ vim73/src/xxd/Make_ming.mak 2012-06-03 23:09:54.804056662 +0000
++++ vim73/src/xxd/Make_ming.mak 2012-07-20 20:31:12.870974595 +0000
 @@ -0,0 +1,28 @@
 +# The most simplistic Makefile, for MinGW gcc on MS-DOS
@@ -69023 +74570 @@
 +       -$(DEL) xxd.exe
 diff -Naur vim73.orig/src/xxd/xxd.c vim73/src/xxd/xxd.c
---- vim73.orig/src/xxd/xxd.c    2012-06-03 23:09:52.944007163 +0000
-+++ vim73/src/xxd/xxd.c 2012-06-03 23:09:53.932033457 +0000
+--- vim73.orig/src/xxd/xxd.c    2010-05-15 11:04:06.000000000 +0000
++++ vim73/src/xxd/xxd.c 2012-07-20 20:31:10.244306036 +0000
 @@ -49,6 +49,8 @@
   *         option -b added: 01000101 binary output in normal format.