source: patches/vim-7.3-branch_update-1.patch@ 6c5a343

runtime/doc/eval.txt

@@ -1657 +1657 @@
                                         *v:warningmsg* *warningmsg-variable*
 v:warningmsg    Last given warning message.  It's allowed to set this variable.
 
+                                        *v:windowid* *windowid-variable*
+v:windowid      When any X11 based GUI is running or when running in a
+                terminal and Vim connects to the X server (|-X|) this will be
+                set to the window ID.
+                When an MS-Windows GUI is running this will be set to the
+                window handle.
+                Otherwise the value is zero.
+                Note: for windows inside Vim use |winnr()|.
+
 ==============================================================================
 4. Builtin Functions                                    *functions*
 
@@ -1822 +1831 @@
 log( {expr})                    Float   natural logarithm (base e) of {expr}
 log10( {expr})                  Float   logarithm of Float {expr} to base 10
 map( {expr}, {string})          List/Dict  change each item in {expr} to {expr}
-maparg( {name}[, {mode} [, {abbr}]])
+maparg( {name}[, {mode} [, {abbr} [, {dict}]]])
                                 String  rhs of mapping {name} in mode {mode}
 mapcheck( {name}[, {mode} [, {abbr}]])
                                 String  check for mappings matching {name}
@@ -3966 +3975 @@
                 further items in {expr} are processed.
 
 
-maparg({name}[, {mode} [, {abbr}]])                     *maparg()*
-                Return the rhs of mapping {name} in mode {mode}.  When there
-                is no mapping for {name}, an empty String is returned.
+maparg({name}[, {mode} [, {abbr} [, {dict}]]])                  *maparg()*
+                When {dict} is omitted or zero: Return the rhs of mapping
+                {name} in mode {mode}.  The returned String has special
+                characters translated like in the output of the ":map" command
+                listing.
+                
+                When there is no mapping for {name}, an empty String is
+                returned.
+
+                The {name} can have special key names, like in the ":map"
+                command.
+
                 {mode} can be one of these strings:
                         "n"     Normal
-                        "v"     Visual
+                        "v"     Visual (including Select)
                         "o"     Operator-pending
                         "i"     Insert
                         "c"     Cmd-line
+                        "s"     Select
+                        "x"     Visual
                         "l"     langmap |language-mapping|
                         ""      Normal, Visual and Operator-pending
                 When {mode} is omitted, the modes for "" are used.
+
                 When {abbr} is there and it is non-zero use abbreviations
                 instead of mappings.
-                The {name} can have special key names, like in the ":map"
-                command.  The returned String has special characters
-                translated like in the output of the ":map" command listing.
+
+                When {dict} is there and it is non-zero return a dictionary
+                containing all the information of the mapping with the
+                following items:
+                  "lhs"      The {lhs} of the mapping.
+                  "rhs"      The {rhs} of the mapping as typed.
+                  "silent"   1 for a |:map-silent| mapping, else 0.
+                  "noremap"  1 if the {rhs} of the mapping is remappable.
+                  "expr"     1 for an expression mapping (|:map-<expr>|).
+                  "buffer"   1 for a buffer local mapping (|:map-local|).
+                  "mode"     Modes for which the mapping is defined. In
+                             addition to the modes mentioned above, these
+                             characters will be used:
+                             " "     Normal, Visual and Operator-pending
+                             "!"     Insert and Commandline mode
+                                     (|mapmpde-ic|)
+                  "sid"      the Script local ID, used for <sid> mappings
+                             (|<SID>|)
+
                 The mappings local to the current buffer are checked first,
                 then the global mappings.
                 This function can be used to map a key even when it's already

runtime/doc/netbeans.txt

@@ -1 @@
-*netbeans.txt*  For Vim version 7.3.  Last change: 2010 Jul 20
+*netbeans.txt*  For Vim version 7.3.  Last change: 2010 Aug 20
 
 
                   VIM REFERENCE MANUAL    by Gordon Prieur et al.
@@ -118 +118 @@
 uncommenting a line with "--disable-netbeans" in the Makefile.
 
 Currently the NetBeans interface is supported by Vim running in a terminal and
-by GVim when it is run with one of the following GUIs: GTK, GNOME, and Motif.
+by GVim when it is run with one of the following GUIs: GTK, GNOME, Windows,
+Athena and Motif.
 
 If Motif support is required the user must supply XPM libraries.  See
 |workshop-xpm| for details on obtaining the latest version of XPM.

runtime/doc/options.txt

@@ -1434 +1434 @@
                         explicitly accessed using the "* notation.  Also see
                         |gui-clipboard|.
 
+        unnamedplus     A variant of "unnamed" flag which uses the clipboard
+                        register '+' (|quoteplus|) instead of register '*' for
+                        all operations except yank.  Yank shall copy the text
+                        into register '+' and also into '*' when "unnamed" is
+                        included.
+                        Only available with the |+x11| feature.
+                        Availability can be checked with: >
+                                if has('unnamedplus')
+<
         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
@@ -7530 +7539 @@
         !       When included, save and restore global variables that start
                 with an uppercase letter, and don't contain a lowercase
                 letter.  Thus "KEEPTHIS and "K_L_M" are stored, but "KeepThis"
-                and "_K_L_M" are not.  Only String and Number types are
-                stored.
+                and "_K_L_M" are not.  Nested List and Dict items may not be
+                read back correctly, you end up with a string representation
+                instead.
         "       Maximum number of lines saved for each register.  Old name of
                 the '<' item, with the disadvantage that you need to put a
                 backslash before the ", otherwise it will be recognized as the
@@ -7747 +7757 @@
         a pattern from the list.  This avoids problems when a future version
         uses another default.
 
+
+                        *'wildignorecase* *'wic'* *'nowildignorecase* *'nowic'*
+'wildignorecase' 'wic'  boolean (default off)
+                        global
+                        {not in Vi}
+        When set case is ignored when completing file names and directories.
+        Has no effect on systems where file name case is generally ignored.
+        Does not apply when the shell is used to expand wildcards, which
+        happens when there are special characters.
+
+
                                 *'wildmenu'* *'wmnu'* *'nowildmenu'* *'nowmnu'*
 'wildmenu' 'wmnu'       boolean (default off)
                         global

src/GvimExt/Make_ming.mak

@@ -17 +17 @@
 # check also the executables
 MINGWOLD = no
 
+# Link against the shared versions of libgcc/libstdc++ by default.  Set
+# STATIC_STDCPLUS to "yes" to link against static versions instead.
+STATIC_STDCPLUS=no
+#STATIC_STDCPLUS=yes
+
+# Note: -static-libstdc++ is not available until gcc 4.5.x.
+LDFLAGS += -shared
+ifeq (yes, $(STATIC_STDCPLUS))
+LDFLAGS += -static-libgcc -static-libstdc++
+endif
+
 ifeq ($(CROSS),yes)
 DEL = rm
 ifeq ($(MINGWOLD),yes)
@@ -34 +45 @@
 endif
 CXX := $(CROSS_COMPILE)g++
 WINDRES := $(CROSS_COMPILE)windres
+WINDRES_CXX = $(CXX)
+WINDRES_FLAGS = --preprocessor="$(WINDRES_CXX) -E -xc" -DRC_INVOKED
 LIBS :=  -luuid
 RES  := gvimext.res
 DEFFILE = gvimext_ming.def
@@ -46 +59 @@
 all: all-before $(DLL) all-after
 
 $(DLL): $(OBJ) $(RES) $(DEFFILE)
-        $(CXX) -shared $(CXXFLAGS) -s -o $@ \
+        $(CXX) $(LDFLAGS) $(CXXFLAGS) -s -o $@ \
                 -Wl,--enable-auto-image-base \
                 -Wl,--enable-auto-import \
                 -Wl,--whole-archive \
@@ -58 +71 @@
         $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@
 
 $(RES): gvimext_ming.rc
-        $(WINDRES) --input-format=rc --output-format=coff -DMING $? -o $@
+        $(WINDRES) $(WINDRES_FLAGS) --input-format=rc --output-format=coff -DMING $? -o $@
 
 clean: clean-custom
         -$(DEL)  $(OBJ) $(RES) $(DLL)

src/Make_cyg.mak

@@ -1 +1 @@
 #
 # 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
 #
 # Also read INSTALLpc.txt!
 #
@@ -27 +27 @@
 #   MZSCHEME_VER      define to version of MzScheme being used (209_000)
 #   DYNAMIC_MZSCHEME  no or yes: use yes to load the MzScheme DLLs dynamically (yes)
 #   MZSCHEME_DLLS     path to MzScheme DLLs (libmzgc and libmzsch), for "static" build.
+#   MZSCHEME_USE_RACKET  define to use "racket" instead of "mzsch".
 # LUA   define to path to Lua dir to get Lua support (not defined)
 #   LUA_VER         define to version of Lua being used (51)
 #   DYNAMIC_LUA  no or yes: use yes to load the Lua DLL dynamically (yes)
@@ -254 +255 @@
 MZSCHEME_GENERATE_BASE=no
 endif
 
+ifndef MZSCHEME_USE_RACKET
+MZSCHEME_MAIN_LIB=mzsch
+else
+MZSCHEME_MAIN_LIB=racket
+endif
+
 ifeq (yes, $(DYNAMIC_MZSCHEME))
-DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+DEFINES += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
 else
 ifndef MZSCHEME_DLLS
 MZSCHEME_DLLS = $(MZSCHEME)
 endif
 ifeq (yes,$(MZSCHEME_PRECISE_GC))
-MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
+MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER)
 else
-MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+MZSCHEME_LIB = -l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
 endif
 EXTRA_LIBS += -L$(MZSCHEME_DLLS) -L$(MZSCHEME_DLLS)/lib $(MZSCHEME_LIB)
 endif

src/Make_ming.mak

@@ -56 +56 @@
 NETBEANS=$(GUI)
 
 
+# Link against the shared version of libstdc++ by default.  Set
+# STATIC_STDCPLUS to "yes" to link against static version instead.
+ifndef STATIC_STDCPLUS
+STATIC_STDCPLUS=no
+endif
+
 # If the user doesn't want gettext, undefine it.
 ifeq (no, $(GETTEXT))
 GETTEXT=
@@ -141 +147 @@
 MZSCHEME_GENERATE_BASE=no
 endif
 
+ifndef MZSCHEME_USE_RACKET
+MZSCHEME_MAIN_LIB=mzsch
+else
+MZSCHEME_MAIN_LIB=racket
+endif
+
 ifeq (no,$(DYNAMIC_MZSCHEME))
 ifeq (yes,$(MZSCHEME_PRECISE_GC))
-MZSCHEME_LIB=-lmzsch$(MZSCHEME_VER)
+MZSCHEME_LIB=-l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER)
 else
-MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
+MZSCHEME_LIB = -l$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
 endif
 # the modern MinGW can dynamically link to dlls directly.
 # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll
@@ -304 +316 @@
 endif
 CC := $(CROSS_COMPILE)gcc
 WINDRES := $(CROSS_COMPILE)windres
+WINDRES_CC = $(CC)
 
 #>>>>> end of choices
 ###########################################################################
 
 CFLAGS = -Iproto $(DEFINES) -pipe -w -march=$(ARCH) -Wall
+WINDRES_FLAGS = --preprocessor="$(WINDRES_CC) -E -xc" -DRC_INVOKED
 
 ifdef GETTEXT
 DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H
@@ -343 +357 @@
 ifdef MZSCHEME
 CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME)/collects\"
 ifeq (yes, $(DYNAMIC_MZSCHEME))
-CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
+CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
 endif
 endif
 
@@ -571 +585 @@
 endif
 
 ifeq (yes, $(OLE))
-LIB += -loleaut32 -lstdc++
+LIB += -loleaut32
 OBJ += $(OUTDIR)/if_ole.o
+ifeq (yes, $(STATIC_STDCPLUS))
+LIB += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+else
+LIB += -lstdc++
+endif
 endif
 
 ifeq (yes, $(MBYTE))
@@ -650 +669 @@
         $(CC) -c $(CFLAGS) $< -o $@
 
 $(OUTDIR)/vimres.res: vim.rc version.h gui_w32_rc.h
-        $(WINDRES) $(DEFINES) vim.rc $(OUTDIR)/vimres.res
+        $(WINDRES) $(WINDRES_FLAGS) $(DEFINES) vim.rc $(OUTDIR)/vimres.res
 
 $(OUTDIR)/vimrc.o: $(OUTDIR)/vimres.res
-        $(WINDRES) $(OUTDIR)/vimres.res $(OUTDIR)/vimrc.o
+        $(WINDRES) $(WINDRES_FLAGS) $(OUTDIR)/vimres.res $(OUTDIR)/vimrc.o
 
 $(OUTDIR):
         $(MKDIR) $(OUTDIR)

src/Make_mvc.mak

@@ -380 +380 @@
 !if "$(_NMAKE_VER)" == "10.00.30319.01"
 MSVCVER = 10.0
 !endif
-!if "$(_NMAKE_VER)" == "9.00.30729.01"
-MSVCVER = 9.0
-!endif
 !endif
 
 # Abort bulding VIM if version of VC is unrecognised.
@@ -705 +702 @@
 MZSCHEME_VER = 205_000
 !endif
 CFLAGS = $(CFLAGS) -DFEAT_MZSCHEME -I $(MZSCHEME)\include
-!if EXIST("$(MZSCHEME)\collects\scheme\base.ss")
-# for MzScheme 4.x we need to include byte code for basic Scheme stuff
+!if EXIST("$(MZSCHEME)\collects\scheme\base.ss") \
+        || EXIST("$(MZSCHEME)\collects\scheme\base.rkt") 
+# for MzScheme >= 4 we need to include byte code for basic Scheme stuff
 MZSCHEME_EXTRA_DEP = mzscheme_base.c
 CFLAGS = $(CFLAGS) -DINCLUDE_MZSCHEME_BASE
 !endif
-!if EXIST("$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib") \
+!if EXIST("$(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib")
+MZSCHEME_MAIN_LIB=mzsch
+!else
+MZSCHEME_MAIN_LIB=racket
+!endif
+!if EXIST("$(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib") \
         && !EXIST("$(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib")
 !message Building with Precise GC
 MZSCHEME_PRECISE_GC = yes
@@ -722 +725 @@
 !endif
 !message MzScheme DLLs will be loaded dynamically
 CFLAGS = $(CFLAGS) -DDYNAMIC_MZSCHEME \
-                -DDYNAMIC_MZSCH_DLL=\"libmzsch$(MZSCHEME_VER).dll\" \
+                -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" \
                 -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
 !else
 !if "$(MZSCHEME_DEBUG)" == "yes"
@@ -730 +733 @@
 !endif
 !if "$(MZSCHEME_PRECISE_GC)" == "yes"
 # Precise GC does not use separate dll
-MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
+MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib
 !else
 MZSCHEME_LIB = $(MZSCHEME)\lib\msvc\libmzgc$(MZSCHEME_VER).lib \
-                $(MZSCHEME)\lib\msvc\libmzsch$(MZSCHEME_VER).lib
+                $(MZSCHEME)\lib\msvc\lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).lib
 !endif
 !endif
 MZSCHEME_OBJ = $(OUTDIR)\if_mzsch.obj

src/Makefile

@@ -414 +414 @@
 # However, this may still cause problems, such as "import termios" failing.
 # Build two separate versions of Vim in that case.
 #CONF_OPT_PYTHON = --enable-pythoninterp
+#CONF_OPT_PYTHON = --enable-pythoninterp=dynamic
 #CONF_OPT_PYTHON3 = --enable-python3interp
+#CONF_OPT_PYTHON3 = --enable-python3interp=dynamic
 
 # RUBY
 # Uncomment this when you want to include the Ruby interface.
+# First one for static linking, second one for loading when used.
 # Note: you need the development package (e.g., ruby1.9.1-dev on Ubuntu).
 #CONF_OPT_RUBY = --enable-rubyinterp
+#CONF_OPT_RUBY = --enable-rubyinterp=dynamic
 #CONF_OPT_RUBY = --enable-rubyinterp --with-ruby-command=ruby1.9.1
 
 # TCL
@@ -1047 +1051 @@
 INSTALL_DATA    = cp
 INSTALL_DATA_R  = cp -r
 
-### Program to run on installed binary
+### Program to run on installed binary.  Use the second one to disable strip.
 #STRIP = strip
+#STRIP = /bin/true
 
 ### Permissions for binaries  {{{1
 BINMOD = 755
@@ -1321 +1326 @@
 .SUFFIXES: .c .o .pro
 
 PRE_DEFS = -Iproto $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS)
-POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(TCL_CFLAGS) $(RUBY_CFLAGS) $(EXTRA_DEFS)
+POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(TCL_CFLAGS) $(EXTRA_DEFS)
 
 ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(POST_DEFS)
 
@@ -1329 +1334 @@
 # with "-E".
 OSDEF_CFLAGS = $(PRE_DEFS) $(POST_DEFS)
 
-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_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)="
 
@@ -1695 +1700 @@
         $(CCC) version.c -o objects/version.o
         @LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \
                 -o $(VIMTARGET) $(OBJ) objects/version.o $(ALL_LIBS)" \
-                MAKE="$(MAKE)" sh $(srcdir)/link.sh
+                MAKE="$(MAKE)" LINK_AS_NEEDED=$(LINK_AS_NEEDED) \
+                sh $(srcdir)/link.sh
 
 xxd/xxd$(EXEEXT): xxd/xxd.c
         cd xxd; CC="$(CC)" CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
@@ -2532 +2538 @@
         $(CCC) $(PYTHON3_CFLAGS) $(PYTHON3_CFLAGS_EXTRA) -o $@ if_python3.c
 
 objects/if_ruby.o: if_ruby.c
-        $(CCC) -o $@ if_ruby.c
+        $(CCC) $(RUBY_CFLAGS) -o $@ if_ruby.c
 
 objects/if_sniff.o: if_sniff.c
         $(CCC) -o $@ if_sniff.c

src/auto/configure

@@ -593 +593 @@
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+LINK_AS_NEEDED
 DEPEND_CFLAGS_FILTER
 MAKEMO
 MSGFMT
@@ -1427 +1428 @@
   --enable-pythoninterp=OPTS   Include Python interpreter. default=no OPTS=no/yes/dynamic
   --enable-python3interp=OPTS   Include Python3 interpreter. default=no OPTS=no/yes/dynamic
   --enable-tclinterp      Include Tcl interpreter.
-  --enable-rubyinterp     Include Ruby interpreter.
+  --enable-rubyinterp=OPTS     Include Ruby interpreter.  default=no OPTS=no/yes/dynamic
   --enable-cscope         Include cscope interface.
   --enable-workshop       Include Sun Visual Workshop support.
   --disable-netbeans      Disable NetBeans integration support.
@@ -4862 +4863 @@
       else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/plt/" >&5
-$as_echo_n "checking if scheme.h can be found in /usr/include/plt/... " >&6; }
-        if test -f /usr/include/plt/scheme.h; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5
+$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; }
+        if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then
           { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-          SCHEME_INC=/usr/include/plt
+          SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
         else
           { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-          vi_cv_path_mzscheme_pfx=
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/plt/" >&5
+$as_echo_n "checking if scheme.h can be found in /usr/include/plt/... " >&6; }
+          if test -f /usr/include/plt/scheme.h; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+            SCHEME_INC=/usr/include/plt
+          else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/racket/" >&5
+$as_echo_n "checking if scheme.h can be found in /usr/include/racket/... " >&6; }
+            if test -f /usr/include/racket/scheme.h; then
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+              SCHEME_INC=/usr/include/racket
+            else
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+              vi_cv_path_mzscheme_pfx=
+            fi
+          fi
         fi
       fi
     fi
@@ -4883 +4904 @@
     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
-    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then
+      MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"
+      MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.a"; then
+      MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a"; then
       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
     else
             if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
         MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.so"; then
+        MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket3m"
+        MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.so"; then
+        MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket -lmzgc"
       else
         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
       fi
@@ -4901 +4932 @@
     fi
     if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
       SCHEME_COLLECTS=lib/plt/
+    else
+      if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
+        SCHEME_COLLECTS=lib/racket/
+      fi
     fi
     if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
-            MZSCHEME_EXTRA="mzscheme_base.c"
-      MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
+      MZSCHEME_EXTRA="mzscheme_base.c"
+    else
+      if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
+        MZSCHEME_EXTRA="mzscheme_base.c"
+      fi
+    fi
+    if test "X$MZSCHEME_EXTRA" != "X" ; then
+            MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
       MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
     fi
     MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
@@ -5285 +5326 @@
 
         PYTHON_LIBS="${vi_cv_path_python_plibs}"
         if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
-          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}"
+          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
         else
-          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
+          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
         fi
         PYTHON_SRC="if_python.c"
                 if test "x$MACOSX" = "xyes"; then
@@ -5298 +5339 @@
         if test "${vi_cv_var_python_version}" = "1.4"; then
            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
         fi
-        PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
+    PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
 
                                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
 $as_echo_n "checking if -pthread should be used... " >&6; }
@@ -5560 +5601 @@
 
       PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
       if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
-        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}"
+        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
       else
-        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}"
+        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
       fi
       PYTHON3_SRC="if_python3.c"
             if test "x$MACOSX" = "xyes"; then
@@ -5667 +5708 @@
 
   $as_echo "#define DYNAMIC_PYTHON3 1" >>confdefs.h
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL" >&5
-$as_echo_n "checking whether we can do without RTLD_GLOBAL... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python" >&5
+$as_echo_n "checking whether we can do without RTLD_GLOBAL for Python... " >&6; }
   cflags_save=$CFLAGS
-  CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
+  CFLAGS="$CFLAGS $PYTHON_CFLAGS"
   ldflags_save=$LDFLAGS
   LDFLAGS="$LDFLAGS -ldl"
   if test "$cross_compiling" = yes; then :
@@ -5689 +5730 @@
      * Only the first pyhton version used will be switched on.
      */
 
-    int no_rtl_global_needed_for(char *python_instsoname)
+    int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
     {
       int needed = 0;
       void* pylib = dlopen(python_instsoname, RTLD_LAZY);
       if (pylib != 0)
       {
+          void (*pfx)(char *home) = dlsym(pylib, "Py_SetPythonHome");
           void (*init)(void) = dlsym(pylib, "Py_Initialize");
           int (*simple)(char*) = dlsym(pylib, "PyRun_SimpleString");
           void (*final)(void) = dlsym(pylib, "Py_Finalize");
+          (*pfx)(prefix);
           (*init)();
           needed = (*simple)("import termios") == -1;
           (*final)();
@@ -5709 +5752 @@
     int main(int argc, char** argv)
     {
       int not_needed = 0;
-      if (no_rtl_global_needed_for("libpython2.7.so.1.0") && no_rtl_global_needed_for("libpython3.1.so.1.0"))
+      if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
             not_needed = 1;
       return !not_needed;
     }
@@ -5726 +5769 @@
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+
   CFLAGS=$cflags_save
   LDFLAGS=$ldflags_save
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5
+$as_echo_n "checking whether we can do without RTLD_GLOBAL for Python3... " >&6; }
+  cflags_save=$CFLAGS
+  CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
+  ldflags_save=$LDFLAGS
+  LDFLAGS="$LDFLAGS -ldl"
+  if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+    #include <dlfcn.h>
+    #include <wchar.h>
+    /* If this program fails, then RTLD_GLOBAL is needed.
+     * RTLD_GLOBAL will be used and then it is not possible to
+     * have both python versions enabled in the same vim instance.
+     * Only the first pyhton version used will be switched on.
+     */
+
+    int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
+    {
+      int needed = 0;
+      void* pylib = dlopen(python_instsoname, RTLD_LAZY);
+      if (pylib != 0)
+      {
+          void (*pfx)(wchar_t *home) = dlsym(pylib, "Py_SetPythonHome");
+          void (*init)(void) = dlsym(pylib, "Py_Initialize");
+          int (*simple)(char*) = dlsym(pylib, "PyRun_SimpleString");
+          void (*final)(void) = dlsym(pylib, "Py_Finalize");
+          (*pfx)(prefix);
+          (*init)();
+          needed = (*simple)("import termios") == -1;
+          (*final)();
+          dlclose(pylib);
+      }
+      return !needed;
+    }
+
+    int main(int argc, char** argv)
+    {
+      int not_needed = 0;
+      if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
+            not_needed = 1;
+      return !not_needed;
+    }
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; };$as_echo "#define PY3_NO_RTLD_GLOBAL 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+  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}\\\""
@@ -6103 +6214 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5
 $as_echo "$enable_rubyinterp" >&6; }
-if test "$enable_rubyinterp" = "yes"; then
+if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5
 $as_echo_n "checking --with-ruby-command argument... " >&6; }
 
@@ -6209 +6320 @@
         RUBY_PRO="if_ruby.pro"
         $as_echo "#define FEAT_RUBY 1" >>confdefs.h
 
+        if test "$enable_rubyinterp" = "dynamic"; then
+          libruby=`$vi_cv_path_ruby -r rbconfig -e 'printf "lib%s.%s\n", Config::CONFIG["RUBY_SO_NAME"], Config::CONFIG["DLEXT"]'`
+          $as_echo "#define DYNAMIC_RUBY 1" >>confdefs.h
+
+          RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
+          RUBY_LIBS=
+        fi
       else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5
 $as_echo "not found; disabling Ruby" >&6; }
@@ -12357 +12475 @@
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5
+$as_echo_n "checking linker --as-needed support... " >&6; }
+LINK_AS_NEEDED=
+# Check if linker supports --as-needed and --no-as-needed options
+if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
+  LDFLAGS="$LDFLAGS -Wl,--as-needed"
+  LINK_AS_NEEDED=yes
+fi
+if test "$LINK_AS_NEEDED" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 ac_config_files="$ac_config_files auto/config.mk:config.mk.in"
 
 cat >confcache <<\_ACEOF

src/buffer.c

@@ -639 +639 @@
     {
         clear_wininfo(buf);             /* including window-local options */
         free_buf_options(buf, TRUE);
+#ifdef FEAT_SPELL
+        ga_clear(&buf->b_s.b_langp);
+#endif
     }
 #ifdef FEAT_EVAL
     vars_clear(&buf->b_vars.dv_hashtab); /* free all internal variables */
@@ -661 +664 @@
     vim_free(buf->b_start_fenc);
     buf->b_start_fenc = NULL;
 #endif
-#ifdef FEAT_SPELL
-    ga_clear(&buf->b_s.b_langp);
-#endif
 }
 
 /*
@@ -1288 +1288 @@
     /* Go to the other buffer. */
     set_curbuf(buf, action);
 
-#if defined(FEAT_LISTCMDS) && defined(FEAT_SCROLLBIND)
+#if defined(FEAT_LISTCMDS) \
+        && (defined(FEAT_SCROLLBIND) || defined(FEAT_CURSORBIND))
     if (action == DOBUF_SPLIT)
-        curwin->w_p_scb = FALSE;        /* reset 'scrollbind' */
+    {
+        RESET_BINDING(curwin);  /* reset 'scrollbind' and 'cursorbind' */
+    }
 #endif
 
 #if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
@@ -1917 +1920 @@
                 tabpage_new();
             else if (win_split(0, 0) == FAIL)   /* Open in a new window */
                 return FAIL;
-# ifdef FEAT_SCROLLBIND
-            curwin->w_p_scb = FALSE;
-# endif
+            RESET_BINDING(curwin);
         }
     }
 #endif

src/config.h.in

@@ -349 +349 @@
 /* Define if you want to include the Ruby interpreter. */
 #undef FEAT_RUBY
 
+/* Define for linking via dlopen() or LoadLibrary() */
+#undef DYNAMIC_RUBY
+
 /* Define if you want to include the Tcl interpreter. */
 #undef FEAT_TCL
 

src/config.mk.in

@@ -30 +30 @@
 CPP             = @CPP@
 CPP_MM          = @CPP_MM@
 DEPEND_CFLAGS_FILTER = @DEPEND_CFLAGS_FILTER@
+LINK_AS_NEEDED  = @LINK_AS_NEEDED@
 X_CFLAGS        = @X_CFLAGS@
 X_LIBS_DIR      = @X_LIBS@
 X_PRE_LIBS      = @X_PRE_LIBS@

src/configure.in

@@ -568 +568 @@
         SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
       else
         AC_MSG_RESULT(no)
-        AC_MSG_CHECKING(if scheme.h can be found in /usr/include/plt/)
-        if test -f /usr/include/plt/scheme.h; then
+        AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket)
+        if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then
           AC_MSG_RESULT(yes)
-          SCHEME_INC=/usr/include/plt
+          SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
         else
           AC_MSG_RESULT(no)
-          vi_cv_path_mzscheme_pfx=
+          AC_MSG_CHECKING(if scheme.h can be found in /usr/include/plt/)
+          if test -f /usr/include/plt/scheme.h; then
+            AC_MSG_RESULT(yes)
+            SCHEME_INC=/usr/include/plt
+          else
+            AC_MSG_RESULT(no)
+            AC_MSG_CHECKING(if scheme.h can be found in /usr/include/racket/)
+            if test -f /usr/include/racket/scheme.h; then
+              AC_MSG_RESULT(yes)
+              SCHEME_INC=/usr/include/racket
+            else
+              AC_MSG_RESULT(no)
+              vi_cv_path_mzscheme_pfx=
+            fi
+          fi
         fi
       fi
     fi
@@ -586 +600 @@
     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
-    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then
+      MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"
+      MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.a"; then
+      MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libracket.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a"; then
       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
     else
       dnl Using shared objects
       if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.so"; then
         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme3m"
         MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.so"; then
+        MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket3m"
+        MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+      elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket.so"; then
+        MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lracket -lmzgc"
       else
         MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
       fi
@@ -607 +631 @@
     fi
     if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
       SCHEME_COLLECTS=lib/plt/
+    else
+      if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
+        SCHEME_COLLECTS=lib/racket/
+      fi
     fi
     if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
-      dnl need to generate bytecode for MzScheme base
       MZSCHEME_EXTRA="mzscheme_base.c"
+    else
+      if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
+        MZSCHEME_EXTRA="mzscheme_base.c"
+      fi
+    fi
+    if test "X$MZSCHEME_EXTRA" != "X" ; then
+      dnl need to generate bytecode for MzScheme base
       MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
       MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
     fi
@@ -857 +891 @@
 
         PYTHON_LIBS="${vi_cv_path_python_plibs}"
         if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
-          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}"
+          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
         else
-          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
+          PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
         fi
         PYTHON_SRC="if_python.c"
         dnl For Mac OSX 10.2 config.o is included in the Python library.
@@ -871 +905 @@
         if test "${vi_cv_var_python_version}" = "1.4"; then
            PYTHON_OBJ="$PYTHON_OBJ objects/py_getpath.o"
         fi
-        PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
+    PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
 
         dnl On FreeBSD linking with "-pthread" is required to use threads.
         dnl _THREAD_SAFE must be used for compiling then.
@@ -1029 +1063 @@
 
       PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
       if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
-        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}"
+        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
       else
-        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}"
+        PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
       fi
       PYTHON3_SRC="if_python3.c"
       dnl For Mac OSX 10.2 config.o is included in the Python library.
@@ -1109 +1143 @@
 if test "$python_ok" = yes && test "$python3_ok" = yes; then
   AC_DEFINE(DYNAMIC_PYTHON)
   AC_DEFINE(DYNAMIC_PYTHON3)
-  AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL)
+  AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python)
   cflags_save=$CFLAGS
-  CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
+  CFLAGS="$CFLAGS $PYTHON_CFLAGS"
   ldflags_save=$LDFLAGS
   LDFLAGS="$LDFLAGS -ldl"
   AC_RUN_IFELSE([
@@ -1122 +1156 @@
      * Only the first pyhton version used will be switched on.
      */
 
-    int no_rtl_global_needed_for(char *python_instsoname)
+    int no_rtl_global_needed_for(char *python_instsoname, char *prefix)
     {
       int needed = 0;
       void* pylib = dlopen(python_instsoname, RTLD_LAZY);
       if (pylib != 0)
       {
+          void (*pfx)(char *home) = dlsym(pylib, "Py_SetPythonHome");
           void (*init)(void) = dlsym(pylib, "Py_Initialize");
           int (*simple)(char*) = dlsym(pylib, "PyRun_SimpleString");
           void (*final)(void) = dlsym(pylib, "Py_Finalize");
+          (*pfx)(prefix);
           (*init)();
           needed = (*simple)("import termios") == -1;
           (*final)();
@@ -1142 +1178 @@
     int main(int argc, char** argv)
     {
       int not_needed = 0;
-      if (no_rtl_global_needed_for("libpython2.7.so.1.0") && no_rtl_global_needed_for("libpython3.1.so.1.0"))
+      if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
             not_needed = 1;
       return !not_needed;
     }],
     [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
+
+  CFLAGS=$cflags_save
+  LDFLAGS=$ldflags_save
+
+  AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python3)
+  cflags_save=$CFLAGS
+  CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
+  ldflags_save=$LDFLAGS
+  LDFLAGS="$LDFLAGS -ldl"
+  AC_RUN_IFELSE([
+    #include <dlfcn.h>
+    #include <wchar.h>
+    /* If this program fails, then RTLD_GLOBAL is needed.
+     * RTLD_GLOBAL will be used and then it is not possible to
+     * have both python versions enabled in the same vim instance.
+     * Only the first pyhton version used will be switched on.
+     */
+
+    int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)
+    {
+      int needed = 0;
+      void* pylib = dlopen(python_instsoname, RTLD_LAZY);
+      if (pylib != 0)
+      {
+          void (*pfx)(wchar_t *home) = dlsym(pylib, "Py_SetPythonHome");
+          void (*init)(void) = dlsym(pylib, "Py_Initialize");
+          int (*simple)(char*) = dlsym(pylib, "PyRun_SimpleString");
+          void (*final)(void) = dlsym(pylib, "Py_Finalize");
+          (*pfx)(prefix);
+          (*init)();
+          needed = (*simple)("import termios") == -1;
+          (*final)();
+          dlclose(pylib);
+      }
+      return !needed;
+    }
+
+    int main(int argc, char** argv)
+    {
+      int not_needed = 0;
+      if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
+            not_needed = 1;
+      return !not_needed;
+    }],
+    [AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
+
   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}\\\""
@@ -1299 +1382 @@
 
 AC_MSG_CHECKING(--enable-rubyinterp argument)
 AC_ARG_ENABLE(rubyinterp,
-        [  --enable-rubyinterp     Include Ruby interpreter.], ,
+        [  --enable-rubyinterp[=OPTS]     Include Ruby interpreter.  [default=no] [OPTS=no/yes/dynamic]], ,
         [enable_rubyinterp="no"])
 AC_MSG_RESULT($enable_rubyinterp)
-if test "$enable_rubyinterp" = "yes"; then
+if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
   AC_MSG_CHECKING(--with-ruby-command argument)
   AC_ARG_WITH(ruby-command, [  --with-ruby-command=RUBY  name of the Ruby command (default: ruby)],
         RUBY_CMD="$withval"; AC_MSG_RESULT($RUBY_CMD),
@@ -1360 +1443 @@
         RUBY_OBJ="objects/if_ruby.o"
         RUBY_PRO="if_ruby.pro"
         AC_DEFINE(FEAT_RUBY)
+        if test "$enable_rubyinterp" = "dynamic"; then
+          libruby=`$vi_cv_path_ruby -r rbconfig -e 'printf "lib%s.%s\n", Config::CONFIG[["RUBY_SO_NAME"]], Config::CONFIG[["DLEXT"]]'`
+          AC_DEFINE(DYNAMIC_RUBY)
+          RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
+          RUBY_LIBS=
+        fi
       else
         AC_MSG_RESULT(not found; disabling Ruby)
       fi
@@ -3487 +3576 @@
 fi
 AC_SUBST(DEPEND_CFLAGS_FILTER)
 
+dnl link.sh tries to avoid overlinking in a hackish way.
+dnl At least GNU ld supports --as-needed which provides the same functionality
+dnl at linker level. Let's use it.
+AC_MSG_CHECKING(linker --as-needed support)
+LINK_AS_NEEDED=
+# Check if linker supports --as-needed and --no-as-needed options
+if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then
+  LDFLAGS="$LDFLAGS -Wl,--as-needed"
+  LINK_AS_NEEDED=yes
+fi
+if test "$LINK_AS_NEEDED" = yes; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST(LINK_AS_NEEDED)
+
 dnl write output files
 AC_OUTPUT(auto/config.mk:config.mk.in)
 

src/diff.c

@@ -1127 +1127 @@
 # endif
 
     wp->w_p_diff = TRUE;
+    /* Use 'scrollbind' and 'cursorbind' when available */
+#ifdef FEAT_SCROLLBIND
+    wp->w_p_scb = TRUE;
+#endif
 #ifdef FEAT_CURSORBIND
-    /* Use cursorbind if it's available */
     wp->w_p_crb = TRUE;
 #endif
-    wp->w_p_scb = TRUE;
     wp->w_p_wrap = FALSE;
 # ifdef FEAT_FOLDING
     curwin = wp;
@@ -1177 +1179 @@
         {
             /* Set 'diff', 'scrollbind' off and 'wrap' on. */
             wp->w_p_diff = FALSE;
-#ifdef FEAT_CURSORBIND
-            wp->w_p_crb = FALSE;
-#endif
-            wp->w_p_scb = FALSE;
+            RESET_BINDING(wp);
             wp->w_p_wrap = TRUE;
 #ifdef FEAT_FOLDING
             curwin = wp;

src/edit.c

@@ -58 +58 @@
 };
 
 static char e_hitend[] = N_("Hit end of paragraph");
+#ifdef FEAT_COMPL_FUNC
+static char e_complwin[] = N_("E839: Completion function changed window");
+static char e_compldel[] = N_("E840: Completion function deleted text");
+#endif
 
 /*
  * Structure used to store one match for insert completion.
@@ -2658 +2662 @@
     if (stop_arrow() == FAIL)
         return;
 
+    compl_direction = FORWARD;
     if (startcol > curwin->w_cursor.col)
         startcol = curwin->w_cursor.col;
     compl_col = startcol;
@@ -3833 +3838 @@
     char_u      *args[2];
     char_u      *funcname;
     pos_T       pos;
+    win_T       *curwin_save;
+    buf_T       *curbuf_save;
 
     funcname = (type == CTRL_X_FUNCTION) ? curbuf->b_p_cfu : curbuf->b_p_ofu;
     if (*funcname == NUL)
@@ -3843 +3850 @@
     args[1] = base;
 
     pos = curwin->w_cursor;
+    curwin_save = curwin;
+    curbuf_save = curbuf;
     matchlist = call_func_retlist(funcname, 2, args, FALSE);
+    if (curwin_save != curwin || curbuf_save != curbuf)
+    {
+        EMSG(_(e_complwin));
+        goto theend;
+    }
     curwin->w_cursor = pos;     /* restore the cursor position */
-    if (matchlist == NULL)
-        return;
+    check_cursor();
+    if (!equalpos(curwin->w_cursor, pos))
+    {
+        EMSG(_(e_compldel));
+        goto theend;
+    }
+    if (matchlist != NULL)
+        ins_compl_add_list(matchlist);
 
-    ins_compl_add_list(matchlist);
-    list_unref(matchlist);
+theend:
+    if (matchlist != NULL)
+        list_unref(matchlist);
 }
 #endif /* FEAT_COMPL_FUNC */
 
@@ -3889 +3910 @@
     char_u      *word;
     int         icase = FALSE;
     int         adup = FALSE;
+    int         aempty = FALSE;
     char_u      *(cptext[CPT_COUNT]);
 
     if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
@@ -3906 +3928 @@
             icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");
         if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)
             adup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");
+        if (get_dict_string(tv->vval.v_dict, (char_u *)"empty", FALSE) != NULL)
+            aempty = get_dict_number(tv->vval.v_dict, (char_u *)"empty");
     }
     else
     {
         word = get_tv_string_chk(tv);
         vim_memset(cptext, 0, sizeof(cptext));
     }
-    if (word == NULL || *word == NUL)
+    if (word == NULL || (!aempty && *word == NUL))
         return FAIL;
     return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, adup);
 }
@@ -4994 +5018 @@
             int         col;
             char_u      *funcname;
             pos_T       pos;
+            win_T       *curwin_save;
+            buf_T       *curbuf_save;
 
             /* Call 'completefunc' or 'omnifunc' and get pattern length as a
              * string */
@@ -5009 +5035 @@
             args[0] = (char_u *)"1";
             args[1] = NULL;
             pos = curwin->w_cursor;
+            curwin_save = curwin;
+            curbuf_save = curbuf;
             col = call_func_retnr(funcname, 2, args, FALSE);
+            if (curwin_save != curwin || curbuf_save != curbuf)
+            {
+                EMSG(_(e_complwin));
+                return FAIL;
+            }
             curwin->w_cursor = pos;     /* restore the cursor position */
+            check_cursor();
+            if (!equalpos(curwin->w_cursor, pos))
+            {
+                EMSG(_(e_compldel));
+                return FAIL;
+            }
 
             if (col < 0)
                 col = curs_col;

src/eval.c

@@ -10 +10 @@
 /*
  * eval.c: Expression evaluation.
  */
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"     /* for mch_open(), must be before vim.h */
-#endif
 
 #include "vim.h"
 
@@ -362 +359 @@
     {VV_NAME("operator",         VAR_STRING), VV_RO},
     {VV_NAME("searchforward",    VAR_NUMBER), 0},
     {VV_NAME("oldfiles",         VAR_LIST), 0},
+    {VV_NAME("windowid",         VAR_NUMBER), VV_RO},
 };
 
 /* shorthand */
@@ -433 +431 @@
 static void listitem_free __ARGS((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 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));
@@ -2325 +2323 @@
             else if (endchars != NULL
                              && vim_strchr(endchars, *skipwhite(arg)) == NULL)
                 EMSG(_(e_letunexp));
-            else
+            else if (!check_secure())
             {
                 c1 = name[len];
                 name[len] = NUL;
@@ -3337 +3335 @@
     int         failed = FALSE;
     funcdict_T  fudi;
 
+    if (eap->skip)
+    {
+        /* trans_function_name() doesn't work well when skipping, use eval0()
+         * instead to skip to any following command, e.g. for:
+         *   :if 0 | call dict.foo().bar() | endif  */
+        eval0(eap->arg, &rettv, &eap->nextcmd, FALSE);
+        return;
+    }
+
     tofree = trans_function_name(&arg, eap->skip, TFN_INT, &fudi);
     if (fudi.fd_newkey != NULL)
     {
@@ -4349 +4356 @@
                 else
                 {
                     /* Compare two Lists for being equal or unequal. */
-                    n1 = list_equal(rettv->vval.v_list, var2.vval.v_list, ic);
+                    n1 = list_equal(rettv->vval.v_list, var2.vval.v_list,
+                                                                   ic, FALSE);
                     if (type == TYPE_NEQUAL)
                         n1 = !n1;
                 }
@@ -4378 +4386 @@
                 else
                 {
                     /* Compare two Dictionaries for being equal or unequal. */
-                    n1 = dict_equal(rettv->vval.v_dict, var2.vval.v_dict, ic);
+                    n1 = dict_equal(rettv->vval.v_dict, var2.vval.v_dict,
+                                                                   ic, FALSE);
                     if (type == TYPE_NEQUAL)
                         n1 = !n1;
                 }
@@ -5913 +5922 @@
  * Return TRUE when two lists have exactly the same values.
  */
     static int
-list_equal(l1, l2, ic)
+list_equal(l1, l2, ic, recursive)
     list_T      *l1;
     list_T      *l2;
     int         ic;     /* ignore case for strings */
+    int         recursive;  /* TRUE when used recursively */
 {
     listitem_T  *item1, *item2;
 
@@ -5930 +5940 @@
     for (item1 = l1->lv_first, item2 = l2->lv_first;
             item1 != NULL && item2 != NULL;
                                item1 = item1->li_next, item2 = item2->li_next)
-        if (!tv_equal(&item1->li_tv, &item2->li_tv, ic))
+        if (!tv_equal(&item1->li_tv, &item2->li_tv, ic, recursive))
             return FALSE;
     return item1 == NULL && item2 == NULL;
 }
@@ -5952 +5962 @@
  * Return TRUE when two dictionaries have exactly the same key/values.
  */
     static int
-dict_equal(d1, d2, ic)
+dict_equal(d1, d2, ic, recursive)
     dict_T      *d1;
     dict_T      *d2;
     int         ic;     /* ignore case for strings */
+    int         recursive; /* TRUE when used recursively */
 {
     hashitem_T  *hi;
     dictitem_T  *item2;
@@ -5976 +5987 @@
             item2 = dict_find(d2, hi->hi_key, -1);
             if (item2 == NULL)
                 return FALSE;
-            if (!tv_equal(&HI2DI(hi)->di_tv, &item2->di_tv, ic))
+            if (!tv_equal(&HI2DI(hi)->di_tv, &item2->di_tv, ic, recursive))
                 return FALSE;
             --todo;
         }
@@ -5984 +5995 @@
     return TRUE;
 }
 
+static int tv_equal_recurse_limit;
+
 /*
  * Return TRUE if "tv1" and "tv2" have the same value.
  * Compares the items just like "==" would compare them, but strings and
  * numbers are different.  Floats and numbers are also different.
  */
     static int
-tv_equal(tv1, tv2, ic)
+tv_equal(tv1, tv2, ic, recursive)
     typval_T *tv1;
     typval_T *tv2;
-    int     ic;     /* ignore case */
+    int      ic;            /* ignore case */
+    int      recursive;     /* TRUE when used recursively */
 {
     char_u      buf1[NUMBUFLEN], buf2[NUMBUFLEN];
     char_u      *s1, *s2;
-    static int  recursive = 0;      /* cach recursive loops */
+    static int  recursive_cnt = 0;          /* catch recursive loops */
     int         r;
 
     if (tv1->v_type != tv2->v_type)
         return FALSE;
+
     /* Catch lists and dicts that have an endless loop by limiting
-     * recursiveness to 1000.  We guess they are equal then. */
-    if (recursive >= 1000)
+     * recursiveness to a limit.  We guess they are equal then.
+     * A fixed limit has the problem of still taking an awful long time.
+     * Reduce the limit every time running into it. That should work fine for
+     * deeply linked structures that are not recursively linked and catch
+     * recursiveness quickly. */
+    if (!recursive)
+        tv_equal_recurse_limit = 1000;
+    if (recursive_cnt >= tv_equal_recurse_limit)
+    {
+        --tv_equal_recurse_limit;
         return TRUE;
+    }
 
     switch (tv1->v_type)
     {
         case VAR_LIST:
-            ++recursive;
-            r = list_equal(tv1->vval.v_list, tv2->vval.v_list, ic);
-            --recursive;
+            ++recursive_cnt;
+            r = list_equal(tv1->vval.v_list, tv2->vval.v_list, ic, TRUE);
+            --recursive_cnt;
             return r;
 
         case VAR_DICT:
-            ++recursive;
-            r = dict_equal(tv1->vval.v_dict, tv2->vval.v_dict, ic);
-            --recursive;
+            ++recursive_cnt;
+            r = dict_equal(tv1->vval.v_dict, tv2->vval.v_dict, ic, TRUE);
+            --recursive_cnt;
             return r;
 
         case VAR_FUNC:
@@ -7075 +7099 @@
 }
 
 /*
- * Add a list  entry to dictionary "d".
+ * Add a list entry to dictionary "d".
  * Returns FAIL when out of memory and when key already exists.
  */
     int
@@ -7097 +7121 @@
         dictitem_free(item);
         return FAIL;
     }
+    ++list->lv_refcount;
     return OK;
 }
 
@@ -7802 +7827 @@
     {"log10",           1, 1, f_log10},
 #endif
     {"map",             2, 2, f_map},
-    {"maparg",          1, 3, f_maparg},
+    {"maparg",          1, 4, f_maparg},
     {"mapcheck",        1, 3, f_mapcheck},
     {"match",           2, 4, f_match},
     {"matchadd",        2, 4, f_matchadd},
@@ -9389 +9414 @@
             }
 
             for ( ; li != NULL; li = li->li_next)
-                if (tv_equal(&li->li_tv, &argvars[1], ic))
+                if (tv_equal(&li->li_tv, &argvars[1], ic, FALSE))
                     ++n;
         }
     }
@@ -9416 +9441 @@
                 if (!HASHITEM_EMPTY(hi))
                 {
                     --todo;
-                    if (tv_equal(&HI2DI(hi)->di_tv, &argvars[1], ic))
+                    if (tv_equal(&HI2DI(hi)->di_tv, &argvars[1], ic, FALSE))
                         ++n;
                 }
             }
@@ -9857 +9882 @@
     char_u      *s;
     int         len;
     char_u      *errormsg;
-    int         flags = WILD_SILENT|WILD_USE_NL|WILD_LIST_NOTFOUND;
+    int         options = WILD_SILENT|WILD_USE_NL|WILD_LIST_NOTFOUND;
     expand_T    xpc;
     int         error = FALSE;
 
@@ -9875 +9900 @@
          * for 'wildignore' and don't put matches for 'suffixes' at the end. */
         if (argvars[1].v_type != VAR_UNKNOWN
                                     && get_tv_number_chk(&argvars[1], &error))
-            flags |= WILD_KEEP_ALL;
+            options |= WILD_KEEP_ALL;
         if (!error)
         {
             ExpandInit(&xpc);
             xpc.xp_context = EXPAND_FILES;
-            rettv->vval.v_string = ExpandOne(&xpc, s, NULL, flags, WILD_ALL);
+            if (p_wic)
+                options += WILD_ICASE;
+            rettv->vval.v_string = ExpandOne(&xpc, s, NULL, options, WILD_ALL);
         }
         else
             rettv->vval.v_string = NULL;
@@ -11653 +11680 @@
     typval_T    *argvars;
     typval_T    *rettv;
 {
-    int         flags = WILD_SILENT|WILD_USE_NL;
+    int         options = WILD_SILENT|WILD_USE_NL;
     expand_T    xpc;
     int         error = FALSE;
 
@@ -11661 +11688 @@
     * for 'wildignore' and don't put matches for 'suffixes' at the end. */
     if (argvars[1].v_type != VAR_UNKNOWN
                                 && get_tv_number_chk(&argvars[1], &error))
-        flags |= WILD_KEEP_ALL;
+        options |= WILD_KEEP_ALL;
     rettv->v_type = VAR_STRING;
     if (!error)
     {
         ExpandInit(&xpc);
         xpc.xp_context = EXPAND_FILES;
+        if (p_wic)
+            options += WILD_ICASE;
         rettv->vval.v_string = ExpandOne(&xpc, get_tv_string(&argvars[0]),
-                                                       NULL, flags, WILD_ALL);
+                                                     NULL, options, WILD_ALL);
     }
     else
         rettv->vval.v_string = NULL;
@@ -12116 +12145 @@
 #ifdef FEAT_TOOLBAR
         "toolbar",
 #endif
+#if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+        "unnamedplus",
+#endif
 #ifdef FEAT_USR_CMDS
         "user-commands",    /* was accidentally included in 5.4 */
         "user_commands",
@@ -12572 +12604 @@
         }
 
         for ( ; item != NULL; item = item->li_next, ++idx)
-            if (tv_equal(&item->li_tv, &argvars[1], ic))
+            if (tv_equal(&item->li_tv, &argvars[1], ic, FALSE))
             {
                 rettv->vval.v_number = idx;
                 break;
@@ -13290 +13322 @@
     char_u      *keys_buf = NULL;
     char_u      *rhs;
     int         mode;
-    garray_T    ga;
     int         abbr = FALSE;
+    int         get_dict = FALSE;
+    mapblock_T  *mp;
+    int         buffer_local;
 
     /* return empty string for failure */
     rettv->v_type = VAR_STRING;
@@ -13305 +13339 @@
     {
         which = get_tv_string_buf_chk(&argvars[1], buf);
         if (argvars[2].v_type != VAR_UNKNOWN)
+        {
             abbr = get_tv_number(&argvars[2]);
+            if (argvars[3].v_type != VAR_UNKNOWN)
+                get_dict = get_tv_number(&argvars[3]);
+        }
     }
     else
         which = (char_u *)"";
@@ -13315 +13353 @@
     mode = get_map_mode(&which, 0);
 
     keys = replace_termcodes(keys, &keys_buf, TRUE, TRUE, FALSE);
-    rhs = check_map(keys, mode, exact, FALSE, abbr);
+    rhs = check_map(keys, mode, exact, FALSE, abbr, &mp, &buffer_local);
     vim_free(keys_buf);
-    if (rhs != NULL)
-    {
-        ga_init(&ga);
-        ga.ga_itemsize = 1;
-        ga.ga_growsize = 40;
 
-        while (*rhs != NUL)
-            ga_concat(&ga, str2special(&rhs, FALSE));
+    if (!get_dict)
+    {
+        /* Return a string. */
+        if (rhs != NULL)
+            rettv->vval.v_string = str2special_save(rhs, FALSE);
+
+    }
+    else if (rettv_dict_alloc(rettv) != FAIL && rhs != NULL)
+    {
+        /* Return a dictionary. */
+        char_u      *lhs = str2special_save(mp->m_keys, TRUE);
+        char_u      *mapmode = map_mode_to_chars(mp->m_mode);
+        dict_T      *dict = rettv->vval.v_dict;
+
+        dict_add_nr_str(dict, "lhs",     0L, lhs);
+        dict_add_nr_str(dict, "rhs",     0L, mp->m_orig_str);
+        dict_add_nr_str(dict, "noremap", mp->m_noremap ? 1L : 0L , NULL);
+        dict_add_nr_str(dict, "expr",    mp->m_expr    ? 1L : 0L, NULL);
+        dict_add_nr_str(dict, "silent",  mp->m_silent  ? 1L : 0L, NULL);
+        dict_add_nr_str(dict, "sid",     (long)mp->m_script_ID, NULL);
+        dict_add_nr_str(dict, "buffer",  (long)buffer_local, NULL);
+        dict_add_nr_str(dict, "mode",    0L, mapmode);
 
-        ga_append(&ga, NUL);
-        rettv->vval.v_string = (char_u *)ga.ga_data;
+        vim_free(lhs);
+        vim_free(mapmode);
     }
 }
 
@@ -22519 +22572 @@
         if (tab != NULL)
         {
             *tab++ = '\0';      /* isolate the variable name */
-            if (*tab == 'S')    /* string var */
-                type = VAR_STRING;
+            switch (*tab)
+            {
+                case 'S': type = VAR_STRING; break;
 #ifdef FEAT_FLOAT
-            else if (*tab == 'F')
-                type = VAR_FLOAT;
+                case 'F': type = VAR_FLOAT; break;
 #endif
+                case 'D': type = VAR_DICT; break;
+                case 'L': type = VAR_LIST; break;
+            }
 
             tab = vim_strchr(tab, '\t');
             if (tab != NULL)
             {
                 tv.v_type = type;
-                if (type == VAR_STRING)
+                if (type == VAR_STRING || type == VAR_DICT || type == VAR_LIST)
                     tv.vval.v_string = viminfo_readstring(virp,
                                        (int)(tab - virp->vir_line + 1), TRUE);
 #ifdef FEAT_FLOAT
@@ -22539 +22595 @@
 #endif
                 else
                     tv.vval.v_number = atol((char *)tab + 1);
+                if (type == VAR_DICT || type == VAR_LIST)
+                {
+                    typval_T *etv = eval_expr(tv.vval.v_string, NULL);
+
+                    if (etv == NULL)
+                        /* Failed to parse back the dict or list, use it as a
+                         * string. */
+                        tv.v_type = VAR_STRING;
+                    else
+                    {
+                        vim_free(tv.vval.v_string);
+                        tv = *etv;
+                    }
+                }
+
                 set_var(virp->vir_line + 1, &tv, FALSE);
-                if (type == VAR_STRING)
+
+                if (tv.v_type == VAR_STRING)
                     vim_free(tv.vval.v_string);
+                else if (tv.v_type == VAR_DICT || tv.v_type == VAR_LIST)
+                    clear_tv(&tv);
             }
         }
     }
@@ -22583 +22657 @@
                     case VAR_STRING: s = "STR"; break;
                     case VAR_NUMBER: s = "NUM"; break;
 #ifdef FEAT_FLOAT
-                    case VAR_FLOAT: s = "FLO"; break;
+                    case VAR_FLOAT:  s = "FLO"; break;
 #endif
+                    case VAR_DICT:   s = "DIC"; break;
+                    case VAR_LIST:   s = "LIS"; break;
                     default: continue;
                 }
                 fprintf(fp, "!%s\t%s\t", this_var->di_key, s);

src/ex_cmds.c

@@ -11 +11 @@
  * ex_cmds.c: some functions for command line commands
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"     /* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 #include "version.h"
 
@@ -323 +319 @@
     /* When sorting numbers "start_col_nr" is the number, not the column
      * number. */
     if (sort_nr)
-        result = l1.start_col_nr - l2.start_col_nr;
+        result = l1.start_col_nr == l2.start_col_nr ? 0
+                                 : l1.start_col_nr > l2.start_col_nr ? 1 : -1;
     else
     {
         /* We need to copy one line into "sortbuf1", because there is no
@@ -482 +479 @@
              * of the match, by temporarily terminating the string there */
             s2 = s + end_col;
             c = *s2;
-            (*s2) = 0;
+            *s2 = NUL;
             /* Sorting on number: Store the number itself. */
             p = s + start_col;
             if (sort_hex)
@@ -491 +488 @@
                 s = skiptodigit(p);
             if (s > p && s[-1] == '-')
                 --s;  /* include preceding negative sign */
-            vim_str2nr(s, NULL, NULL, sort_oct, sort_hex,
-                                        &nrs[lnum - eap->line1].start_col_nr, NULL);
-            (*s2) = c;
+            if (*s == NUL)
+                /* empty line should sort before any number */
+                nrs[lnum - eap->line1].start_col_nr = -MAXLNUM;
+            else
+                vim_str2nr(s, NULL, NULL, sort_oct, sort_hex,
+                                  &nrs[lnum - eap->line1].start_col_nr, NULL);
+            *s2 = c;
         }
         else
         {
@@ -2700 +2701 @@
                                                                         TRUE);
                 do_modelines(0);
             }
+
+            /* Autocommands may have changed buffer names, esp. when
+             * 'autochdir' is set. */
+            fname = curbuf->b_sfname;
 #endif
         }
 
@@ -3498 +3503 @@
         curbuf->b_p_bin = FALSE;        /* reset 'bin' before reading file */
         curwin->w_p_nu = 0;             /* no line numbers */
         curwin->w_p_rnu = 0;            /* no relative line numbers */
-#ifdef FEAT_SCROLLBIND
-        curwin->w_p_scb = FALSE;        /* no scroll binding */
-#endif
+        RESET_BINDING(curwin);          /* no scroll or cursor binding */
 #ifdef FEAT_ARABIC
         curwin->w_p_arab = FALSE;       /* no arabic mode */
 #endif
@@ -5471 +5474 @@
                 return FALSE;
             curwin->w_p_pvw = TRUE;
             curwin->w_p_wfh = TRUE;
-# ifdef FEAT_SCROLLBIND
-            curwin->w_p_scb = FALSE;        /* don't take over 'scrollbind' */
-# endif
+            RESET_BINDING(curwin);          /* don't take over 'scrollbind'
+                                               and 'cursorbind' */
 # ifdef FEAT_DIFF
             curwin->w_p_diff = FALSE;       /* no 'diff' */
 # endif
@@ -6559 +6561 @@
 struct sign
 {
     sign_T      *sn_next;       /* next sign in list */
-    int         sn_typenr;      /* type number of sign (negative if not equal
-                                   to name) */
+    int         sn_typenr;      /* type number of sign */
     char_u      *sn_name;       /* name of sign */
     char_u      *sn_icon;       /* name of pixmap */
 #ifdef FEAT_SIGN_ICONS
@@ -6572 +6573 @@
 };
 
 static sign_T   *first_sign = NULL;
-static int      last_sign_typenr = MAX_TYPENR;  /* is decremented */
+static int      next_sign_typenr = 1;
 
 static int sign_cmd_idx __ARGS((char_u *begin_cmd, char_u *end_cmd));
 static void sign_list_defined __ARGS((sign_T *sp));
@@ -6654 +6655 @@
             EMSG(_("E156: Missing sign name"));
         else
         {
+            /* Isolate the sign name.  If it's a number skip leading zeroes,
+             * so that "099" and "99" are the same sign.  But keep "0". */
             p = skiptowhite(arg);
             if (*p != NUL)
                 *p++ = NUL;
+            while (arg[0] == '0' && arg[1] != NUL)
+                ++arg;
+
             sp_prev = NULL;
             for (sp = first_sign; sp != NULL; sp = sp->sn_next)
             {
@@ -6669 +6675 @@
                 /* ":sign define {name} ...": define a sign */
                 if (sp == NULL)
                 {
+                    sign_T      *lp;
+                    int         start = next_sign_typenr;
+
                     /* Allocate a new sign. */
                     sp = (sign_T *)alloc_clear((unsigned)sizeof(sign_T));
                     if (sp == NULL)
                         return;
-                    if (sp_prev == NULL)
-                        first_sign = sp;
-                    else
-                        sp_prev->sn_next = sp;
-                    sp->sn_name = vim_strnsave(arg, (int)(p - arg));
 
-                    /* If the name is a number use that for the typenr,
-                     * otherwise use a negative number. */
-                    if (VIM_ISDIGIT(*arg))
-                        sp->sn_typenr = atoi((char *)arg);
-                    else
+                    /* Check that next_sign_typenr is not already being used.
+                     * This only happens after wrapping around.  Hopefully
+                     * another one got deleted and we can use its number. */
+                    for (lp = first_sign; lp != NULL; )
                     {
-                        sign_T  *lp;
-                        int     start = last_sign_typenr;
-
-                        for (lp = first_sign; lp != NULL; lp = lp->sn_next)
+                        if (lp->sn_typenr == next_sign_typenr)
                         {
-                            if (lp->sn_typenr == last_sign_typenr)
+                            ++next_sign_typenr;
+                            if (next_sign_typenr == MAX_TYPENR)
+                                next_sign_typenr = 1;
+                            if (next_sign_typenr == start)
                             {
-                                --last_sign_typenr;
-                                if (last_sign_typenr == 0)
-                                    last_sign_typenr = MAX_TYPENR;
-                                if (last_sign_typenr == start)
-                                {
-                                    EMSG(_("E612: Too many signs defined"));
-                                    return;
-                                }
-                                lp = first_sign;
-                                continue;
+                                vim_free(sp);
+                                EMSG(_("E612: Too many signs defined"));
+                                return;
                             }
+                            lp = first_sign;  /* start all over */
+                            continue;
                         }
+                        lp = lp->sn_next;
+                    }
+
+                    sp->sn_typenr = next_sign_typenr;
+                    if (++next_sign_typenr == MAX_TYPENR)
+                        next_sign_typenr = 1; /* wrap around */
 
-                        sp->sn_typenr = last_sign_typenr--;
-                        if (last_sign_typenr == 0)
-                            last_sign_typenr = MAX_TYPENR; /* wrap around */
+                    sp->sn_name = vim_strsave(arg);
+                    if (sp->sn_name == NULL)  /* out of memory */
+                    {
+                        vim_free(sp);
+                        return;
                     }
+
+                    /* add the new sign to the list of signs */
+                    if (sp_prev == NULL)
+                        first_sign = sp;
+                    else
+                        sp_prev->sn_next = sp;
                 }
 
                 /* set values for a defined sign. */
@@ -6886 +6898 @@
                 arg = skiptowhite(arg);
                 if (*arg != NUL)
                     *arg++ = NUL;
+                while (sign_name[0] == '0' && sign_name[1] != NUL)
+                    ++sign_name;
             }
             else if (STRNCMP(arg, "file=", 5) == 0)
             {

src/ex_cmds2.c

@@ -11 +11 @@
  * ex_cmds2.c: some more functions for command line commands
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"     /* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 #include "version.h"
 
@@ -2165 +2161 @@
         {
             if (win_split(0, 0) == FAIL)
                 return;
-# ifdef FEAT_SCROLLBIND
-            curwin->w_p_scb = FALSE;
-# endif
+            RESET_BINDING(curwin);
         }
         else
 #endif

src/ex_docmd.c

@@ -733 +733 @@
  * do_cmdline(): execute one Ex command line
  *
  * 1. Execute "cmdline" when it is not NULL.
- *    If "cmdline" is NULL, or more lines are needed, getline() is used.
+ *    If "cmdline" is NULL, or more lines are needed, fgetline() is used.
  * 2. Split up in parts separated with '|'.
  *
  * This function can be called recursively!
@@ -741 +741 @@
  * flags:
  * DOCMD_VERBOSE  - The command will be included in the error message.
  * DOCMD_NOWAIT   - Don't call wait_return() and friends.
- * DOCMD_REPEAT   - Repeat execution until getline() returns NULL.
+ * DOCMD_REPEAT   - Repeat execution until fgetline() returns NULL.
  * DOCMD_KEYTYPED - Don't reset KeyTyped.
  * DOCMD_EXCRESET - Reset the exception environment (used for debugging).
  * DOCMD_KEEPLINE - Store first typed line (for repeating with ".").
@@ -749 +749 @@
  * return FAIL if cmdline could not be executed, OK otherwise
  */
     int
-do_cmdline(cmdline, getline, cookie, flags)
+do_cmdline(cmdline, fgetline, cookie, flags)
     char_u      *cmdline;
-    char_u      *(*getline) __ARGS((int, void *, int));
-    void        *cookie;                /* argument for getline() */
+    char_u      *(*fgetline) __ARGS((int, void *, int));
+    void        *cookie;                /* argument for fgetline() */
     int         flags;
 {
     char_u      *next_cmdline;          /* next cmd to execute */
     char_u      *cmdline_copy = NULL;   /* copy of cmd line */
-    int         used_getline = FALSE;   /* used "getline" to obtain command */
+    int         used_getline = FALSE;   /* used "fgetline" to obtain command */
     static int  recursive = 0;          /* recursive depth */
     int         msg_didout_before_start = 0;
     int         count = 0;              /* line number count */
@@ -775 +775 @@
     struct msglist      **saved_msg_list = NULL;
     struct msglist      *private_msg_list;
 
-    /* "getline" and "cookie" passed to do_one_cmd() */
+    /* "fgetline" and "cookie" passed to do_one_cmd() */
     char_u      *(*cmd_getline) __ARGS((int, void *, int));
     void        *cmd_cookie;
     struct loop_cookie cmd_loop_cookie;
     void        *real_cookie;
     int         getline_is_func;
 #else
-# define cmd_getline getline
+# define cmd_getline fgetline
 # define cmd_cookie cookie
 #endif
     static int  call_depth = 0;         /* recursiveness */
@@ -822 +822 @@
     cstack.cs_lflags = 0;
     ga_init2(&lines_ga, (int)sizeof(wcmd_T), 10);
 
-    real_cookie = getline_cookie(getline, cookie);
+    real_cookie = getline_cookie(fgetline, cookie);
 
     /* Inside a function use a higher nesting level. */
-    getline_is_func = getline_equal(getline, cookie, get_func_line);
+    getline_is_func = getline_equal(fgetline, cookie, get_func_line);
     if (getline_is_func && ex_nesting_level == func_level(real_cookie))
         ++ex_nesting_level;
 
@@ -837 +837 @@
         breakpoint = func_breakpoint(real_cookie);
         dbg_tick = func_dbg_tick(real_cookie);
     }
-    else if (getline_equal(getline, cookie, getsourceline))
+    else if (getline_equal(fgetline, cookie, getsourceline))
     {
         fname = sourcing_name;
         breakpoint = source_breakpoint(real_cookie);
@@ -881 +881 @@
      * KeyTyped is only set when calling vgetc().  Reset it here when not
      * calling vgetc() (sourced command lines).
      */
-    if (!(flags & DOCMD_KEYTYPED) && !getline_equal(getline, cookie, getexline))
+    if (!(flags & DOCMD_KEYTYPED)
+                               && !getline_equal(fgetline, cookie, getexline))
         KeyTyped = FALSE;
 
     /*
@@ -894 +895 @@
     do
     {
 #ifdef FEAT_EVAL
-        getline_is_func = getline_equal(getline, cookie, get_func_line);
+        getline_is_func = getline_equal(fgetline, cookie, get_func_line);
 #endif
 
         /* stop skipping cmds for an error msg after all endif/while/for */
@@ -909 +910 @@
 
         /*
          * 1. If repeating a line in a loop, get a line from lines_ga.
-         * 2. If no line given: Get an allocated line with getline().
+         * 2. If no line given: Get an allocated line with fgetline().
          * 3. If a line is given: Make a copy, so we can mess with it.
          */
 
@@ -938 +939 @@
             }
 #ifdef FEAT_PROFILE
             else if (do_profiling == PROF_YES
-                             && getline_equal(getline, cookie, getsourceline))
+                            && getline_equal(fgetline, cookie, getsourceline))
                 script_line_end();
 #endif
 
             /* Check if a sourced file hit a ":finish" command. */
-            if (source_finished(getline, cookie))
+            if (source_finished(fgetline, cookie))
             {
                 retval = FAIL;
                 break;
@@ -954 +955 @@
                                                    && *dbg_tick != debug_tick)
             {
                 *breakpoint = dbg_find_breakpoint(
-                                getline_equal(getline, cookie, getsourceline),
+                                getline_equal(fgetline, cookie, getsourceline),
                                                         fname, sourcing_lnum);
                 *dbg_tick = debug_tick;
             }
@@ -969 +970 @@
                 dbg_breakpoint(fname, sourcing_lnum);
                 /* Find next breakpoint. */
                 *breakpoint = dbg_find_breakpoint(
-                                getline_equal(getline, cookie, getsourceline),
+                               getline_equal(fgetline, cookie, getsourceline),
                                                         fname, sourcing_lnum);
                 *dbg_tick = debug_tick;
             }
@@ -978 +979 @@
             {
                 if (getline_is_func)
                     func_line_start(real_cookie);
-                else if (getline_equal(getline, cookie, getsourceline))
+                else if (getline_equal(fgetline, cookie, getsourceline))
                     script_line_start();
             }
 # endif
@@ -987 +988 @@
         if (cstack.cs_looplevel > 0)
         {
             /* Inside a while/for loop we need to store the lines and use them
-             * again.  Pass a different "getline" function to do_one_cmd()
+             * again.  Pass a different "fgetline" function to do_one_cmd()
              * below, so that it stores lines in or reads them from
              * "lines_ga".  Makes it possible to define a function inside a
              * while/for loop. */
@@ -995 +996 @@
             cmd_cookie = (void *)&cmd_loop_cookie;
             cmd_loop_cookie.lines_gap = &lines_ga;
             cmd_loop_cookie.current_line = current_line;
-            cmd_loop_cookie.getline = getline;
+            cmd_loop_cookie.getline = fgetline;
             cmd_loop_cookie.cookie = cookie;
             cmd_loop_cookie.repeating = (current_line < lines_ga.ga_len);
         }
         else
         {
-            cmd_getline = getline;
+            cmd_getline = fgetline;
             cmd_cookie = cookie;
         }
 #endif
 
-        /* 2. If no line given, get an allocated line with getline(). */
+        /* 2. If no line given, get an allocated line with fgetline(). */
         if (next_cmdline == NULL)
         {
             /*
              * Need to set msg_didout for the first line after an ":if",
              * otherwise the ":if" will be overwritten.
              */
-            if (count == 1 && getline_equal(getline, cookie, getexline))
+            if (count == 1 && getline_equal(fgetline, cookie, getexline))
                 msg_didout = TRUE;
-            if (getline == NULL || (next_cmdline = getline(':', cookie,
+            if (fgetline == NULL || (next_cmdline = fgetline(':', cookie,
 #ifdef FEAT_EVAL
                     cstack.cs_idx < 0 ? 0 : (cstack.cs_idx + 1) * 2
 #else
@@ -1142 +1143 @@
              * If the command was typed, remember it for the ':' register.
              * Do this AFTER executing the command to make :@: work.
              */
-            if (getline_equal(getline, cookie, getexline)
+            if (getline_equal(fgetline, cookie, getexline)
                                                   && new_last_cmdline != NULL)
             {
                 vim_free(last_cmdline);
@@ -1163 +1164 @@
 #ifdef FEAT_EVAL
         /* reset did_emsg for a function that is not aborted by an error */
         if (did_emsg && !force_abort
-                && getline_equal(getline, cookie, get_func_line)
+                && getline_equal(fgetline, cookie, get_func_line)
                                               && !func_has_abort(real_cookie))
             did_emsg = FALSE;
 
@@ -1202 +1203 @@
                     if (breakpoint != NULL)
                     {
                         *breakpoint = dbg_find_breakpoint(
-                                getline_equal(getline, cookie, getsourceline),
+                               getline_equal(fgetline, cookie, getsourceline),
                                                                         fname,
                            ((wcmd_T *)lines_ga.ga_data)[current_line].lnum-1);
                         *dbg_tick = debug_tick;
@@ -1296 +1297 @@
 #endif
             )
             && !(did_emsg && used_getline
-                          && (getline_equal(getline, cookie, getexmodeline)
-                                || getline_equal(getline, cookie, getexline)))
+                            && (getline_equal(fgetline, cookie, getexmodeline)
+                               || getline_equal(fgetline, cookie, getexline)))
             && (next_cmdline != NULL
 #ifdef FEAT_EVAL
                         || cstack.cs_idx >= 0
@@ -1316 +1317 @@
          * unclosed conditional.
          */
         if (!got_int && !did_throw
-                && ((getline_equal(getline, cookie, getsourceline)
-                        && !source_finished(getline, cookie))
-                    || (getline_equal(getline, cookie, get_func_line)
+                && ((getline_equal(fgetline, cookie, getsourceline)
+                        && !source_finished(fgetline, cookie))
+                    || (getline_equal(fgetline, cookie, get_func_line)
                                             && !func_has_ended(real_cookie))))
         {
             if (cstack.cs_flags[cstack.cs_idx] & CSF_TRY)
@@ -1354 +1355 @@
     /* If a missing ":endtry", ":endwhile", ":endfor", or ":endif" or a memory
      * lack was reported above and the error message is to be converted to an
      * exception, do this now after rewinding the cstack. */
-    do_errthrow(&cstack, getline_equal(getline, cookie, get_func_line)
+    do_errthrow(&cstack, getline_equal(fgetline, cookie, get_func_line)
                                   ? (char_u *)"endfunction" : (char_u *)NULL);
 
     if (trylevel == 0)
@@ -1449 +1450 @@
      */
     if (did_throw)
         need_rethrow = TRUE;
-    if ((getline_equal(getline, cookie, getsourceline)
+    if ((getline_equal(fgetline, cookie, getsourceline)
                 && ex_nesting_level > source_level(real_cookie))
-            || (getline_equal(getline, cookie, get_func_line)
+            || (getline_equal(fgetline, cookie, get_func_line)
                 && ex_nesting_level > func_level(real_cookie) + 1))
     {
         if (!did_throw)
@@ -1460 +1461 @@
     else
     {
         /* When leaving a function, reduce nesting level. */
-        if (getline_equal(getline, cookie, get_func_line))
+        if (getline_equal(fgetline, cookie, get_func_line))
             --ex_nesting_level;
         /*
          * Go to debug mode when returning from a function in which we are
          * single-stepping.
          */
-        if ((getline_equal(getline, cookie, getsourceline)
-                    || getline_equal(getline, cookie, get_func_line))
+        if ((getline_equal(fgetline, cookie, getsourceline)
+                    || getline_equal(fgetline, cookie, get_func_line))
                 && ex_nesting_level + 1 <= debug_break_level)
-            do_debug(getline_equal(getline, cookie, getsourceline)
+            do_debug(getline_equal(fgetline, cookie, getsourceline)
                     ? (char_u *)_("End of sourced file")
                     : (char_u *)_("End of function"));
     }
@@ -2871 +2872 @@
             }
 
 #ifdef FEAT_USR_CMDS
-        /* Look for a user defined command as a last resort */
-        if (eap->cmdidx == CMD_SIZE && *eap->cmd >= 'A' && *eap->cmd <= 'Z')
+        /* Look for a user defined command as a last resort.  Let ":Print" be
+         * overruled by a user defined command. */
+        if ((eap->cmdidx == CMD_SIZE || eap->cmdidx == CMD_Print)
+                && *eap->cmd >= 'A' && *eap->cmd <= 'Z')
         {
             /* User defined commands may contain digits. */
             while (ASCII_ISALNUM(*p))
@@ -3465 +3468 @@
         case CMD_find:
         case CMD_sfind:
         case CMD_tabfind:
-            xp->xp_context = EXPAND_FILES_IN_PATH;
+            if (xp->xp_context == EXPAND_FILES)
+                xp->xp_context = EXPAND_FILES_IN_PATH;
             break;
         case CMD_cd:
         case CMD_chdir:
@@ -4520 +4524 @@
                 else /* n == 2 */
                 {
                     expand_T    xpc;
+                    int         options = WILD_LIST_NOTFOUND|WILD_ADD_SLASH;
 
                     ExpandInit(&xpc);
                     xpc.xp_context = EXPAND_FILES;
+                    if (p_wic)
+                        options += WILD_ICASE;
                     p = ExpandOne(&xpc, eap->arg, NULL,
-                                            WILD_LIST_NOTFOUND|WILD_ADD_SLASH,
-                                                   WILD_EXPAND_FREE);
+                                                   options, WILD_EXPAND_FREE);
                     if (p == NULL)
                         return FAIL;
                 }
@@ -5587 +5593 @@
     int     compl = EXPAND_NOTHING;
     char_u  *compl_arg = NULL;
     int     has_attr = (eap->arg[0] == '-');
+    int     name_len;
 
     p = eap->arg;
 
@@ -5612 +5619 @@
         return;
     }
     end = p;
+    name_len = (int)(end - name);
 
     /* If there is nothing after the name, and no attributes were specified,
      * we are listing commands
@@ -5626 +5634 @@
         EMSG(_("E183: User defined commands must start with an uppercase letter"));
         return;
     }
+    else if ((name_len == 1 && *name == 'X')
+          || (name_len <= 4
+                  && STRNCMP(name, "Next", name_len > 4 ? 4 : name_len) == 0))
+    {
+        EMSG(_("E841: Reserved name, cannot be used for user defined command"));
+        return;
+    }
     else
         uc_add_command(name, end - name, p, argt, def, flags, compl, compl_arg,
                                                                 eap->forceit);
@@ -6897 +6912 @@
 # ifdef FEAT_WINDOWS
         if (win_split(0, 0) == FAIL)
             return;
-#  ifdef FEAT_SCROLLBIND
-        curwin->w_p_scb = FALSE;
-#  endif
+        RESET_BINDING(curwin);
 
         /* When splitting the window, create a new alist.  Otherwise the
          * existing one is overwritten. */
@@ -7299 +7312 @@
                 || cmdmod.browse
 #  endif
            )
-            curwin->w_p_scb = FALSE;
+        {
+            RESET_BINDING(curwin);
+        }
         else
             do_check_scrollbind(FALSE);
 # endif
@@ -9393 +9408 @@
 ex_ptag(eap)
     exarg_T     *eap;
 {
-    g_do_tagpreview = p_pvh;
+    g_do_tagpreview = p_pvh;  /* will be reset to 0 in ex_tag_cmd() */
     ex_tag_cmd(eap, cmdnames[eap->cmdidx].cmd_name + 1);
 }
 
@@ -9525 +9540 @@
 #define SPEC_CFILE  4
                     "<sfile>",          /* ":so" file name */
 #define SPEC_SFILE  5
+                    "<slnum>",          /* ":so" file line number */
+#define SPEC_SLNUM  6
 #ifdef FEAT_AUTOCMD
                     "<afile>",          /* autocommand file name */
-# define SPEC_AFILE 6
+# define SPEC_AFILE 7
                     "<abuf>",           /* autocommand buffer number */
-# define SPEC_ABUF  7
+# define SPEC_ABUF  8
                     "<amatch>",         /* autocommand match name */
-# define SPEC_AMATCH 8
+# define SPEC_AMATCH 9
 #endif
 #ifdef FEAT_CLIENTSERVER
                     "<client>"
-# define SPEC_CLIENT 9
+# ifdef FEAT_AUTOCMD
+#  define SPEC_CLIENT 10
+# else
+#  define SPEC_CLIENT 7
+# endif
 #endif
     };
 
@@ -9560 +9581 @@
  *        '<cWORD>' to WORD under the cursor
  *        '<cfile>' to path name under the cursor
  *        '<sfile>' to sourced file name
+ *        '<slnum>' to sourced file line number
  *        '<afile>' to file name for autocommand
  *        '<abuf>'  to buffer number for autocommand
  *        '<amatch>' to matching name for autocommand
@@ -9591 +9613 @@
 #ifdef FEAT_MODIFY_FNAME
     int         skip_mod = FALSE;
 #endif
-
-#if defined(FEAT_AUTOCMD) || defined(FEAT_CLIENTSERVER)
     char_u      strbuf[30];
-#endif
 
     *errormsg = NULL;
     if (escaped != NULL)
@@ -9783 +9802 @@
                     return NULL;
                 }
                 break;
+        case SPEC_SLNUM:        /* line in file for ":so" command */
+                if (sourcing_name == NULL || sourcing_lnum == 0)
+                {
+                    *errormsg = (char_u *)_("E842: no line number to use for \"<slnum>\"");
+                    return NULL;
+                }
+                sprintf((char *)strbuf, "%ld", (long)sourcing_lnum);
+                result = strbuf;
+                break;
 #if defined(FEAT_CLIENTSERVER)
         case SPEC_CLIENT:       /* Source of last submitted input */
                 sprintf((char *)strbuf, PRINTF_HEX_LONG_U,
@@ -10707 +10735 @@
  * Write a file name to the session file.
  * Takes care of the "slash" option in 'sessionoptions' and escapes special
  * characters.
- * Returns FAIL if writing fails.
+ * Returns FAIL if writing fails or out of memory.
  */
     static int
 ses_put_fname(fd, name, flagp)
@@ -10716 +10744 @@
     unsigned    *flagp;
 {
     char_u      *sname;
+    char_u      *p;
     int         retval = OK;
-    int         c;
 
     sname = home_replace_save(NULL, name);
-    if (sname != NULL)
-        name = sname;
-    while (*name != NUL)
-    {
-#ifdef FEAT_MBYTE
-        {
-            int l;
+    if (sname == NULL)
+        return FAIL;
 
-            if (has_mbyte && (l = (*mb_ptr2len)(name)) > 1)
-            {
-                /* copy a multibyte char */
-                while (--l >= 0)
-                {
-                    if (putc(*name, fd) != *name)
-                        retval = FAIL;
-                    ++name;
-                }
-                continue;
-            }
-        }
-#endif
-        c = *name++;
-        if (c == '\\' && (*flagp & SSOP_SLASH))
-            /* change a backslash to a forward slash */
-            c = '/';
-        else if ((vim_strchr(escape_chars, c) != NULL
-#ifdef BACKSLASH_IN_FILENAME
-                    && c != '\\'
-#endif
-                 ) || c == '#' || c == '%')
-        {
-            /* escape a special character with a backslash */
-            if (putc('\\', fd) != '\\')
-                retval = FAIL;
-        }
-        if (putc(c, fd) != c)
-            retval = FAIL;
+    if (*flagp & SSOP_SLASH)
+    {
+        /* change all backslashes to forward slashes */
+        for (p = sname; *p != NUL; mb_ptr_adv(p))
+            if (*p == '\\')
+                *p = '/';
     }
+
+    /* escapse special characters */
+    p = vim_strsave_fnameescape(sname, FALSE);
     vim_free(sname);
+    if (p == NULL)
+        return FAIL;
+
+    /* write the result */
+    if (fputs((char *)p, fd) < 0)
+        retval = FAIL;
+
+    vim_free(p);
     return retval;
 }
 

src/ex_getln.c

@@ -688 +688 @@
                     p = get_expr_line();
                     --textlock;
                     restore_cmdline(&save_ccline);
-                    len = (int)STRLEN(p);
 
-                    if (p != NULL && realloc_cmdbuff(len + 1) == OK)
+                    if (p != NULL)
                     {
-                        ccline.cmdlen = len;
-                        STRCPY(ccline.cmdbuff, p);
-                        vim_free(p);
-
-                        /* Restore the cursor or use the position set with
-                         * set_cmdline_pos(). */
-                        if (new_cmdpos > ccline.cmdlen)
-                            ccline.cmdpos = ccline.cmdlen;
-                        else
-                            ccline.cmdpos = new_cmdpos;
-
-                        KeyTyped = FALSE;       /* Don't do p_wc completion. */
-                        redrawcmd();
-                        goto cmdline_changed;
+                        len = (int)STRLEN(p);
+                        if (realloc_cmdbuff(len + 1) == OK)
+                        {
+                            ccline.cmdlen = len;
+                            STRCPY(ccline.cmdbuff, p);
+                            vim_free(p);
+
+                            /* Restore the cursor or use the position set with
+                             * set_cmdline_pos(). */
+                            if (new_cmdpos > ccline.cmdlen)
+                                ccline.cmdpos = ccline.cmdlen;
+                            else
+                                ccline.cmdpos = new_cmdpos;
+
+                            KeyTyped = FALSE;   /* Don't do p_wc completion. */
+                            redrawcmd();
+                            goto cmdline_changed;
+                        }
                     }
                 }
                 beep_flush();
-                c = ESC;
+                got_int = FALSE;        /* don't abandon the command line */
+                did_emsg = FALSE;
+                emsg_on_display = FALSE;
+                redrawcmd();
+                goto cmdline_not_changed;
             }
 #endif
             else
@@ -2342 +2349 @@
         windgoto(msg_row, msg_col);
         pend = (char_u *)(line_ga.ga_data) + line_ga.ga_len;
 
-        /* we are done when a NL is entered, but not when it comes after a
-         * backslash */
-        if (line_ga.ga_len > 0 && pend[-1] == '\n'
-                && (line_ga.ga_len <= 1 || pend[-2] != '\\'))
-        {
-            --line_ga.ga_len;
-            --pend;
-            *pend = NUL;
-            break;
+        /* We are done when a NL is entered, but not when it comes after an
+         * odd number of backslashes, that results in a NUL. */
+        if (line_ga.ga_len > 0 && pend[-1] == '\n')
+        {
+            int bcount = 0;
+
+            while (line_ga.ga_len - 2 >= bcount && pend[-2 - bcount] == '\\')
+                ++bcount;
+
+            if (bcount > 0)
+            {
+                /* Halve the number of backslashes: "\NL" -> "NUL", "\\NL" ->
+                 * "\NL", etc. */
+                line_ga.ga_len -= (bcount + 1) / 2;
+                pend -= (bcount + 1) / 2;
+                pend[-1] = '\n';
+            }
+
+            if ((bcount & 1) == 0)
+            {
+                --line_ga.ga_len;
+                --pend;
+                *pend = NUL;
+                break;
+            }
         }
     }
 
@@ -3316 +3339 @@
             p2 = NULL;
         else
         {
+            int use_options = options |
+                    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE;
+
+            if (p_wic)
+                use_options += WILD_ICASE;
             p2 = ExpandOne(xp, p1,
                          vim_strnsave(&ccline.cmdbuff[i], xp->xp_pattern_len),
-                    WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE
-                                                              |options, type);
+                                                           use_options, type);
             vim_free(p1);
             /* longest match: make sure it is not shorter, happens with :help */
             if (p2 != NULL && type == WILD_LONGEST)
@@ -3405 +3432 @@
  * options = WILD_KEEP_ALL:         don't remove 'wildignore' entries
  * options = WILD_SILENT:           don't print warning messages
  * options = WILD_ESCAPE:           put backslash before special chars
+ * options = WILD_ICASE:            ignore case for files
  *
  * The variables xp->xp_context and xp->xp_backslash must have been set!
  */
@@ -4338 +4366 @@
     char_u      ***matches;     /* return: array of pointers to matches */
 {
     char_u      *file_str = NULL;
+    int         options = WILD_ADD_SLASH|WILD_SILENT;
 
     if (xp->xp_context == EXPAND_UNSUCCESSFUL)
     {
@@ -4356 +4385 @@
     if (file_str == NULL)
         return EXPAND_UNSUCCESSFUL;
 
+    if (p_wic)
+        options += WILD_ICASE;
+
     /* find all files that match the description */
-    if (ExpandFromContext(xp, file_str, matchcount, matches,
-                                          WILD_ADD_SLASH|WILD_SILENT) == FAIL)
+    if (ExpandFromContext(xp, file_str, matchcount, matches, options) == FAIL)
     {
         *matchcount = 0;
         *matches = NULL;
@@ -4410 +4441 @@
     char_u      *pat;
     int         *num_file;
     char_u      ***file;
-    int         options;
+    int         options;  /* EW_ flags */
 {
 #ifdef FEAT_CMDL_COMPL
     regmatch_T  regmatch;
@@ -4464 +4495 @@
             flags |= (EW_FILE | EW_PATH);
         else
             flags = (flags | EW_DIR) & ~EW_FILE;
+        if (options & WILD_ICASE)
+            flags |= EW_ICASE;
+
         /* Expand wildcards, supporting %:h and the like. */
         ret = expand_wildcards_eval(&pat, num_file, file, flags);
         if (free_pat)
@@ -4728 +4762 @@
                             || (pat[1] == '.' && vim_ispathsep(pat[2])))))
         path = (char_u *)".";
     else
+    {
         path = vim_getenv((char_u *)"PATH", &mustfree);
+        if (path == NULL)
+            path = (char_u *)"";
+    }
 
     /*
      * Go over all directories in $PATH.  Expand matches in that directory and
@@ -6147 +6185 @@
     curwin->w_p_rl = cmdmsg_rl;
     cmdmsg_rl = FALSE;
 # endif
-# ifdef FEAT_SCROLLBIND
-    curwin->w_p_scb = FALSE;
-# endif
+    RESET_BINDING(curwin);
 
 # ifdef FEAT_AUTOCMD
     /* Do execute autocommands for setting the filetype (load syntax). */

src/fileio.c

@@ -11 +11 @@
  * fileio.c: read from and write to a file
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"     /* for lseek(), must be before vim.h */
-#endif
-
-#if defined __EMX__
-# include "vimio.h"     /* for mktemp(), CJW 1997-12-03 */
-#endif
-
 #include "vim.h"
 
 #if defined(__TANDEM) || defined(__MINT__)
@@ -918 +910 @@
             {
                 /* Read the first line (and a bit more).  Immediately rewind to
                  * the start of the file.  If the read() fails "len" is -1. */
-                len = vim_read(fd, firstline, 80);
+                len = read_eintr(fd, firstline, 80);
                 lseek(fd, (off_t)0L, SEEK_SET);
                 for (p = firstline; p < firstline + len; ++p)
                     if (*p >= 0x80)
@@ -1373 +1365 @@
                     /*
                      * Read bytes from the file.
                      */
-                    size = vim_read(fd, ptr, size);
+                    size = read_eintr(fd, ptr, size);
                 }
 
                 if (size <= 0)
@@ -4000 +3992 @@
 #ifdef HAS_BW_FLAGS
                         write_info.bw_flags = FIO_NOCONVERT;
 #endif
-                        while ((write_info.bw_len = vim_read(fd, copybuf,
+                        while ((write_info.bw_len = read_eintr(fd, copybuf,
                                                                 BUFSIZE)) > 0)
                         {
                             if (buf_write_bytes(&write_info) == FAIL)
@@ -4813 +4805 @@
 #ifdef HAS_BW_FLAGS
                         write_info.bw_flags = FIO_NOCONVERT;
 #endif
-                        while ((write_info.bw_len = vim_read(fd, smallbuf,
+                        while ((write_info.bw_len = read_eintr(fd, smallbuf,
                                                       SMBUFSIZE)) > 0)
                             if (buf_write_bytes(&write_info) == FAIL)
                                 break;
@@ -5330 +5322 @@
 
 /*
  * Call write() to write a number of bytes to the file.
- * Also handles encryption and 'encoding' conversion.
+ * Handles encryption and 'encoding' conversion.
  *
  * Return FAIL for failure, OK otherwise.
  */
@@ -5702 +5694 @@
         crypt_encode(buf, len, buf);
 #endif
 
-    /* Repeat the write(), it may be interrupted by a signal. */
-    while (len > 0)
-    {
-        wlen = vim_write(ip->bw_fd, buf, len);
-        if (wlen <= 0)              /* error! */
-            return FAIL;
-        len -= wlen;
-        buf += wlen;
-    }
-    return OK;
+    wlen = write_eintr(ip->bw_fd, buf, len);
+    return (wlen < len) ? FAIL : OK;
 }
 
 #ifdef FEAT_MBYTE
@@ -6662 +6646 @@
         return -1;
     }
 
-    while ((n = vim_read(fd_in, buffer, BUFSIZE)) > 0)
-        if (vim_write(fd_out, buffer, n) != n)
+    while ((n = read_eintr(fd_in, buffer, BUFSIZE)) > 0)
+        if (write_eintr(fd_out, buffer, n) != n)
         {
             errmsg = _("E208: Error writing to \"%s\"");
             break;
@@ -10304 +10288 @@
     }
     return reg_pat;
 }
+
+#if defined(EINTR) || defined(PROTO)
+/*
+ * Version of read() that retries when interrupted by EINTR (possibly
+ * by a SIGWINCH).
+ */
+    long
+read_eintr(fd, buf, bufsize)
+    int     fd;
+    void    *buf;
+    size_t  bufsize;
+{
+    long ret;
+
+    for (;;)
+    {
+        ret = vim_read(fd, buf, bufsize);
+        if (ret >= 0 || errno != EINTR)
+            break;
+    }
+    return ret;
+}
+
+/*
+ * Version of write() that retries when interrupted by EINTR (possibly
+ * by a SIGWINCH).
+ */
+    long
+write_eintr(fd, buf, bufsize)
+    int     fd;
+    void    *buf;
+    size_t  bufsize;
+{
+    long    ret = 0;
+    long    wlen;
+
+    /* Repeat the write() so long it didn't fail, other than being interrupted
+     * by a signal. */
+    while (ret < (long)bufsize)
+    {
+        wlen = vim_write(fd, (char *)buf + ret, bufsize - ret);
+        if (wlen < 0)
+        {
+            if (errno != EINTR)
+                break;
+        }
+        else
+            ret += wlen;
+    }
+    return ret;
+}
+#endif

src/getchar.c

@@ -1506 +1506 @@
     }
 }
 
-#define KL_PART_KEY -1          /* keylen value for incomplete key-code */
-#define KL_PART_MAP -2          /* keylen value for incomplete mapping */
-
 /*
  * Get the next input character.
  * Can return a special key or a multi-byte character.
@@ -2171 +2168 @@
                                         if (!timedout)
                                         {
                                             /* break at a partly match */
-                                            keylen = KL_PART_MAP;
+                                            keylen = KEYLEN_PART_MAP;
                                             break;
                                         }
                                     }
@@ -2192 +2189 @@
 
                         /* If no partly match found, use the longest full
                          * match. */
-                        if (keylen != KL_PART_MAP)
+                        if (keylen != KEYLEN_PART_MAP)
                         {
                             mp = mp_match;
                             keylen = mp_match_len;
@@ -2230 +2227 @@
                         }
                         /* Need more chars for partly match. */
                         if (mlen == typebuf.tb_len)
-                            keylen = KL_PART_KEY;
+                            keylen = KEYLEN_PART_KEY;
                         else if (max_mlen < mlen)
                             /* no match, may have to check for termcode at
                              * next character */
@@ -2238 +2235 @@
                     }
 
                     if ((mp == NULL || max_mlen >= mp_match_len)
-                                                     && keylen != KL_PART_MAP)
+                                                 && keylen != KEYLEN_PART_MAP)
                     {
                         int     save_keylen = keylen;
 
@@ -2264 +2261 @@
                             /* If no termcode matched but 'pastetoggle'
                              * matched partially it's like an incomplete key
                              * sequence. */
-                            if (keylen == 0 && save_keylen == KL_PART_KEY)
-                                keylen = KL_PART_KEY;
+                            if (keylen == 0 && save_keylen == KEYLEN_PART_KEY)
+                                keylen = KEYLEN_PART_KEY;
 
                             /*
                              * When getting a partial match, but the last
@@ -2302 +2299 @@
                                     continue;
                                 }
                                 if (*s == NUL)      /* need more characters */
-                                    keylen = KL_PART_KEY;
+                                    keylen = KEYLEN_PART_KEY;
                             }
                             if (keylen >= 0)
 #endif
@@ -2339 +2336 @@
                         if (keylen > 0)     /* full matching terminal code */
                         {
 #if defined(FEAT_GUI) && defined(FEAT_MENU)
-                            if (typebuf.tb_buf[typebuf.tb_off] == K_SPECIAL
+                            if (typebuf.tb_len >= 2
+                                && typebuf.tb_buf[typebuf.tb_off] == K_SPECIAL
                                          && typebuf.tb_buf[typebuf.tb_off + 1]
                                                                    == KS_MENU)
                             {
@@ -2381 +2379 @@
                         /* Partial match: get some more characters.  When a
                          * matching mapping was found use that one. */
                         if (mp == NULL || keylen < 0)
-                            keylen = KL_PART_KEY;
+                            keylen = KEYLEN_PART_KEY;
                         else
                             keylen = mp_match_len;
                     }
@@ -2553 +2551 @@
 #endif
                         && typebuf.tb_maplen == 0
                         && (State & INSERT)
-                        && (p_timeout || (keylen == KL_PART_KEY && p_ttimeout))
+                        && (p_timeout
+                            || (keylen == KEYLEN_PART_KEY && p_ttimeout))
                         && (c = inchar(typebuf.tb_buf + typebuf.tb_off
                                                      + typebuf.tb_len, 3, 25L,
                                                  typebuf.tb_change_cnt)) == 0)
@@ -2783 +2782 @@
                             ? 0
                             : ((typebuf.tb_len == 0
                                     || !(p_timeout || (p_ttimeout
-                                                   && keylen == KL_PART_KEY)))
+                                               && keylen == KEYLEN_PART_KEY)))
                                     ? -1L
-                                    : ((keylen == KL_PART_KEY && p_ttm >= 0)
+                                    : ((keylen == KEYLEN_PART_KEY && p_ttm >= 0)
                                             ? p_ttm
                                             : p_tm)), typebuf.tb_change_cnt);
 
@@ -3168 +3167 @@
     int         expr = FALSE;
 #endif
     int         noremap;
+    char_u      *orig_rhs;
 
     keys = arg;
     map_table = maphash;
@@ -3266 +3266 @@
     }
     if (*p != NUL)
         *p++ = NUL;
+
     p = skipwhite(p);
     rhs = p;
     hasarg = (*rhs != NUL);
@@ -3288 +3289 @@
      */
     if (haskey)
         keys = replace_termcodes(keys, &keys_buf, TRUE, TRUE, special);
+    orig_rhs = rhs;
     if (hasarg)
     {
         if (STRICMP(rhs, "<nop>") == 0)     /* "<Nop>" means nothing */
@@ -3298 +3300 @@
 
 #ifdef FEAT_FKMAP
     /*
-     * when in right-to-left mode and alternate keymap option set,
+     * When in right-to-left mode and alternate keymap option set,
      * reverse the character flow in the rhs in Farsi.
      */
     if (p_altkeymap && curwin->w_p_rl)
@@ -3556 +3558 @@
                                 }
                                 vim_free(mp->m_str);
                                 mp->m_str = newstr;
+                                vim_free(mp->m_orig_str);
+                                mp->m_orig_str = vim_strsave(orig_rhs);
                                 mp->m_noremap = noremap;
                                 mp->m_silent = silent;
                                 mp->m_mode = mode;
@@ -3633 +3637 @@
 
     mp->m_keys = vim_strsave(keys);
     mp->m_str = vim_strsave(rhs);
+    mp->m_orig_str = vim_strsave(orig_rhs);
     if (mp->m_keys == NULL || mp->m_str == NULL)
     {
         vim_free(mp->m_keys);
         vim_free(mp->m_str);
+        vim_free(mp->m_orig_str);
         vim_free(mp);
         retval = 4;     /* no mem */
         goto theend;
@@ -3682 +3688 @@
     mp = *mpp;
     vim_free(mp->m_keys);
     vim_free(mp->m_str);
+    vim_free(mp->m_orig_str);
     *mpp = mp->m_next;
     vim_free(mp);
 }
@@ -3851 +3858 @@
     }
 }
 
+/*
+ * Return characters to represent the map mode in an allocated string.
+ * Returns NULL when out of memory.
+ */
+    char_u *
+map_mode_to_chars(mode)
+    int mode;
+{
+    garray_T    mapmode;
+
+    ga_init2(&mapmode, 1, 7);
+
+    if ((mode & (INSERT + CMDLINE)) == INSERT + CMDLINE)
+        ga_append(&mapmode, '!');                       /* :map! */
+    else if (mode & INSERT)
+        ga_append(&mapmode, 'i');                       /* :imap */
+    else if (mode & LANGMAP)
+        ga_append(&mapmode, 'l');                       /* :lmap */
+    else if (mode & CMDLINE)
+        ga_append(&mapmode, 'c');                       /* :cmap */
+    else if ((mode & (NORMAL + VISUAL + SELECTMODE + OP_PENDING))
+                                 == NORMAL + VISUAL + SELECTMODE + OP_PENDING)
+        ga_append(&mapmode, ' ');                       /* :map */
+    else
+    {
+        if (mode & NORMAL)
+            ga_append(&mapmode, 'n');                   /* :nmap */
+        if (mode & OP_PENDING)
+            ga_append(&mapmode, 'o');                   /* :omap */
+        if ((mode & (VISUAL + SELECTMODE)) == VISUAL + SELECTMODE)
+            ga_append(&mapmode, 'v');                   /* :vmap */
+        else
+        {
+            if (mode & VISUAL)
+                ga_append(&mapmode, 'x');               /* :xmap */
+            if (mode & SELECTMODE)
+                ga_append(&mapmode, 's');               /* :smap */
+        }
+    }
+
+    ga_append(&mapmode, NUL);
+    return (char_u *)mapmode.ga_data;
+}
+
     static void
 showmap(mp, local)
     mapblock_T  *mp;
     int         local;      /* TRUE for buffer-local map */
 {
-    int len = 1;
+    int         len = 1;
+    char_u      *mapchars;
 
     if (msg_didout || msg_silent != 0)
     {
@@ -3864 +3916 @@
         if (got_int)        /* 'q' typed at MORE prompt */
             return;
     }
-    if ((mp->m_mode & (INSERT + CMDLINE)) == INSERT + CMDLINE)
-        msg_putchar('!');                       /* :map! */
-    else if (mp->m_mode & INSERT)
-        msg_putchar('i');                       /* :imap */
-    else if (mp->m_mode & LANGMAP)
-        msg_putchar('l');                       /* :lmap */
-    else if (mp->m_mode & CMDLINE)
-        msg_putchar('c');                       /* :cmap */
-    else if ((mp->m_mode & (NORMAL + VISUAL + SELECTMODE + OP_PENDING))
-                                 == NORMAL + VISUAL + SELECTMODE + OP_PENDING)
-        msg_putchar(' ');                       /* :map */
-    else
+
+    mapchars = map_mode_to_chars(mp->m_mode);
+    if (mapchars != NULL)
     {
-        len = 0;
-        if (mp->m_mode & NORMAL)
-        {
-            msg_putchar('n');           /* :nmap */
-            ++len;
-        }
-        if (mp->m_mode & OP_PENDING)
-        {
-            msg_putchar('o');           /* :omap */
-            ++len;
-        }
-        if ((mp->m_mode & (VISUAL + SELECTMODE)) == VISUAL + SELECTMODE)
-        {
-            msg_putchar('v');           /* :vmap */
-            ++len;
-        }
-        else
-        {
-            if (mp->m_mode & VISUAL)
-            {
-                msg_putchar('x');               /* :xmap */
-                ++len;
-            }
-            if (mp->m_mode & SELECTMODE)
-            {
-                msg_putchar('s');               /* :smap */
-                ++len;
-            }
-        }
+        msg_puts(mapchars);
+        len = (int)STRLEN(mapchars);
+        vim_free(mapchars);
     }
+
     while (++len <= 3)
         msg_putchar(' ');
 
@@ -3931 +3949 @@
         msg_putchar(' ');
 
     /* Use FALSE below if we only want things like <Up> to show up as such on
-     * the rhs, and not M-x etc, TRUE gets both -- webb
-     */
+     * the rhs, and not M-x etc, TRUE gets both -- webb */
     if (*mp->m_str == NUL)
         msg_puts_attr((char_u *)"<Nop>", hl_attr(HLF_8));
     else
@@ -4995 +5012 @@
     sourcing_name = save_name;
 }
 
-#ifdef FEAT_EVAL
+#if defined(FEAT_EVAL) || defined(PROTO)
 /*
- * Check the string "keys" against the lhs of all mappings
- * Return pointer to rhs of mapping (mapblock->m_str)
- * NULL otherwise
+ * Check the string "keys" against the lhs of all mappings.
+ * Return pointer to rhs of mapping (mapblock->m_str).
+ * NULL when no mapping found.
  */
     char_u *
-check_map(keys, mode, exact, ign_mod, abbr)
+check_map(keys, mode, exact, ign_mod, abbr, mp_ptr, local_ptr)
     char_u      *keys;
     int         mode;
     int         exact;          /* require exact match */
     int         ign_mod;        /* ignore preceding modifier */
     int         abbr;           /* do abbreviations */
+    mapblock_T  **mp_ptr;       /* return: pointer to mapblock or NULL */
+    int         *local_ptr;     /* return: buffer-local mapping or NULL */
 {
     int         hash;
     int         len, minlen;
@@ -5062 +5081 @@
                             minlen = mp->m_keylen - 3;
                     }
                     if (STRNCMP(s, keys, minlen) == 0)
+                    {
+                        if (mp_ptr != NULL)
+                            *mp_ptr = mp;
+                        if (local_ptr != NULL)
+#ifdef FEAT_LOCALMAP
+                            *local_ptr = local;
+#else
+                            *local_ptr = 0;
+#endif
                         return mp->m_str;
+                    }
                 }
             }
         }

src/globals.h

@@ -510 +510 @@
 EXTERN VimClipboard clip_plus;  /* CLIPBOARD selection in X11 */
 # else
 #  define clip_plus clip_star   /* there is only one clipboard */
+#  define ONE_CLIPBOARD
 # endif
-EXTERN int      clip_unnamed 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_autoselectml INIT(= FALSE);
 EXTERN int      clip_html INIT(= FALSE);

src/gui.c

@@ -105 +105 @@
 
 #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11)
     if (gui.in_use)
+    {
+# ifdef FEAT_EVAL
+        Window  x11_window;
+        Display *x11_display;
+
+        if (gui_get_x11_windis(&x11_window, &x11_display) == OK)
+            set_vim_var_nr(VV_WINDOWID, (long)x11_window);
+# endif
+
         /* Display error messages in a dialog now. */
         display_errors();
+    }
 #endif
 
 #if defined(MAY_FORK) && !defined(__QNXNTO__)
@@ -2352 +2362 @@
     if (draw_sign)
         /* Draw the sign on top of the spaces. */
         gui_mch_drawsign(gui.row, col, gui.highlight_mask);
-# if defined(FEAT_NETBEANS_INTG) && (defined(FEAT_GUI_MOTIF) \
+# if defined(FEAT_NETBEANS_INTG) && (defined(FEAT_GUI_X11) \
         || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32))
     if (multi_sign)
         netbeans_draw_multisign_indicator(gui.row);

src/gui_gtk.c

@@ -1287 +1287 @@
         entry = gtk_entry_new();
         gtk_widget_show(entry);
 
+        /* Make Enter work like pressing OK. */
+        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);
@@ -1795 +1798 @@
     char_u              *repl_text;
     gboolean            direction_down;
     SharedFindReplace   *sfr;
-    int                 rc;
 
     flags = (int)(long)data;        /* avoid a lint warning here */
 
@@ -1821 +1823 @@
 
     repl_text = CONVERT_FROM_UTF8(repl_text);
     find_text = CONVERT_FROM_UTF8(find_text);
-    rc = gui_do_findrepl(flags, find_text, repl_text, direction_down);
+    gui_do_findrepl(flags, find_text, repl_text, direction_down);
     CONVERT_FROM_UTF8_FREE(repl_text);
     CONVERT_FROM_UTF8_FREE(find_text);
 }

src/gui_mac.c

@@ -1480 +1480 @@
  *
  *  Returns the index inside the menu wher
  */
-    short /* Shoulde we return MenuItemIndex? */
+    short /* Should we return MenuItemIndex? */
 gui_mac_get_menu_item_index(vimmenu_T *pMenu)
 {
     short       index;
@@ -1823 +1823 @@
         p.h += gui.scrollbar_width;
     if (gui.which_scrollbars[SBAR_RIGHT])
         p.h += gui.scrollbar_width;
-    /* ideal height is as heigh as we can get */
+    /* ideal height is as high as we can get */
     p.v = 15 * 1024;
 
     thePart = IsWindowInStandardState(whichWindow, &p, &r)
@@ -4481 +4481 @@
          * event arrives.  No need to check for input_buf_full because we are
          * returning as soon as it contains a single char.
          */
-        /* TODO: reduce wtime accordinly???  */
+        /* TODO: reduce wtime accordingly???  */
         if (wtime > -1)
             sleeppyTick = 60 * wtime / 1000;
         else
@@ -5723 +5723 @@
     iconDITL = GetResource('DITL', 131);
     switch (type)
     {
-        case VIM_GENERIC:  useIcon = kNoteIcon;
-        case VIM_ERROR:    useIcon = kStopIcon;
-        case VIM_WARNING:  useIcon = kCautionIcon;
-        case VIM_INFO:     useIcon = kNoteIcon;
-        case VIM_QUESTION: useIcon = kNoteIcon;
-        default:      useIcon = kStopIcon;
-    };
+        case VIM_GENERIC:
+        case VIM_INFO:
+        case VIM_QUESTION: useIcon = kNoteIcon; break;
+        case VIM_WARNING:  useIcon = kCautionIcon; break;
+        case VIM_ERROR:    useIcon = kStopIcon; break;
+        default:           useIcon = kStopIcon;
+    }
     AppendDITL(theDialog, iconDITL, overlayDITL);
     ReleaseResource(iconDITL);
     GetDialogItem(theDialog, iconItm.idx, &itemType, &itemHandle, &box);
@@ -5892 +5892 @@
 
     return itemHit;
 /*
- * Usefull thing which could be used
+ * Useful thing which could be used
  * SetDialogTimeout(): Auto click a button after timeout
  * SetDialogTracksCursor() : Get the I-beam cursor over input box
  * MoveDialogItem():        Probably better than SetDialogItem
@@ -6100 +6100 @@
 #endif
 
 /*
- * Transfered from os_mac.c for MacOS X using os_unix.c prep work
+ * Transferred from os_mac.c for MacOS X using os_unix.c prep work
  */
 
     int
@@ -6543 +6543 @@
 static ControlRef dataBrowser = NULL;
 
 // when the tabline is hidden, vim doesn't call update_tabline(). When
-// the tabline is shown again, show_tabline() is called before upate_tabline(),
+// the tabline is shown again, show_tabline() is called before update_tabline(),
 // and because of this, the tab labels and vims internal tabs are out of sync
 // for a very short time. to prevent inconsistent state, we store the labels
 // of the tabs, not pointers to the tabs (which are invalid for a short time).

src/gui_w32.c

@@ -289 +289 @@
 
 #ifdef FEAT_MENU
 static UINT     s_menu_id = 100;
+#endif
 
 /*
  * Use the system font for dialogs and tear-off menus.  Remove this line to
  * use DLG_FONT_NAME.
  */
-# define USE_SYSMENU_FONT
-#endif
+#define USE_SYSMENU_FONT
 
 #define VIM_NAME        "vim"
 #define VIM_CLASS       "Vim"
@@ -1260 +1260 @@
 
     /* try and load the user32.dll library and get the entry points for
      * multi-monitor-support. */
-    if ((user32_lib = LoadLibrary("User32.dll")) != NULL)
+    if ((user32_lib = vimLoadLib("User32.dll")) != NULL)
     {
         pMonitorFromWindow = (TMonitorFromWindow)GetProcAddress(user32_lib,
                                                          "MonitorFromWindow");
@@ -1573 +1573 @@
 # endif
 #endif
 
+#ifdef FEAT_EVAL
+    /* set the v:windowid variable */
+    set_vim_var_nr(VV_WINDOWID, (long)s_hwnd);
+#endif
+
 theend:
     /* Display any pending error messages */
     display_errors();
@@ -4188 +4193 @@
     static void
 dyn_imm_load(void)
 {
-    hLibImm = LoadLibrary("imm32.dll");
+    hLibImm = vimLoadLib("imm32.dll");
     if (hLibImm == NULL)
         return;
 

src/gui_w48.c

@@ -1810 +1810 @@
                  * mapped we want to use the mapping instead. */
                 if (vk == VK_F10
                         && gui.menu_is_active
-                        && check_map(k10, State, FALSE, TRUE, FALSE) == NULL)
+                        && check_map(k10, State, FALSE, TRUE, FALSE,
+                                                          NULL, NULL) == NULL)
                     break;
 #endif
                 if (GetKeyState(VK_SHIFT) & 0x8000)
@@ -1924 +1925 @@
     /* Check for <F10>: Default effect is to select the menu.  When <F10> is
      * mapped we need to stop it here to avoid strange effects (e.g., for the
      * key-up event) */
-    if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE, FALSE) == NULL)
+    if (vk != VK_F10 || check_map(k10, State, FALSE, TRUE, FALSE,
+                                                          NULL, NULL) == NULL)
 #endif
         DispatchMessage(&msg);
 }

src/gui_x11.c

@@ -2895 +2895 @@
             focus = gui.in_focus;
         }
 
+#if defined(FEAT_NETBEANS_INTG)
+        /* Process any queued netbeans messages. */
+        netbeans_parse_messages();
+#endif
+
         /*
          * Don't use gui_mch_update() because then we will spin-lock until a
          * char arrives, instead we use XtAppProcessEvent() to hang until an

src/if_cscope.c

@@ -13 +13 @@
 
 #if defined(FEAT_CSCOPE) || defined(PROTO)
 
-#include <string.h>
-#include <errno.h>
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #if defined(UNIX)
 # include <sys/wait.h>
-#else
-    /* not UNIX, must be WIN32 */
-# include "vimio.h"
 #endif
 #include "if_cscope.h"
 
@@ -1274 +1269 @@
                 {
                     win_split(postponed_split > 0 ? postponed_split : 0,
                                                        postponed_split_flags);
-#  ifdef FEAT_SCROLLBIND
-                    curwin->w_p_scb = FALSE;
-#  endif
+                    RESET_BINDING(curwin);
                     postponed_split = 0;
                 }
 # endif
@@ -1353 +1346 @@
                        "       g: Find this definition\n"
                        "       i: Find files #including this file\n"
                        "       s: Find this C symbol\n"
-                       "       t: Find assignments to\n"));
+                       "       t: Find this text string\n"));
 
         cmdp++;
     }
@@ -1664 +1657 @@
 /*
  * PRIVATE: cs_make_vim_style_matches
  *
- * convert the cscope output into into a ctags style entry (as might be found
+ * convert the cscope output into a ctags style entry (as might be found
  * in a ctags tags file).  there's one catch though: cscope doesn't tell you
  * the type of the tag you are looking for.  for example, in Darren Hiebert's
  * ctags (the one that comes with vim), #define's use a line number to find the

src/if_lua.c

@@ -49 +49 @@
 # define symbol_from_dll dlsym
 # define close_dll dlclose
 #else
-# define load_dll LoadLibrary
+# define load_dll vimLoadLib
 # define symbol_from_dll GetProcAddress
 # define close_dll FreeLibrary
 #endif

src/if_mzsch.c

@@ -556 +556 @@
 
     if (hMzGC && hMzSch)
         return OK;
-    hMzSch = LoadLibrary(sch_dll);
-    hMzGC = LoadLibrary(gc_dll);
+    hMzSch = vimLoadLib(sch_dll);
+    hMzGC = vimLoadLib(gc_dll);
 
     if (!hMzSch)
     {
@@ -794 +794 @@
 #endif
 }
 
+#if MZSCHEME_VERSION_MAJOR >= 500 && defined(WIN32) && defined(USE_THREAD_LOCAL)
+static __declspec(thread) void *tls_space;
+#endif
+
     void
 mzscheme_main(void)
 {
+#if MZSCHEME_VERSION_MAJOR >= 500 && defined(WIN32) && defined(USE_THREAD_LOCAL)
+    scheme_register_tls_space(&tls_space, 0);
+#endif
 #if defined(MZ_PRECISE_GC) && MZSCHEME_VERSION_MAJOR >= 400
     /* use trampoline for precise GC in MzScheme >= 4.x */
     scheme_main_setup(TRUE, mzscheme_env_main, 0, NULL);

src/if_perl.xs

@@ -106 +106 @@
 #define close_dll dlclose
 #else
 #define PERL_PROC FARPROC
-#define load_dll LoadLibrary
+#define load_dll vimLoadLib
 #define symbol_from_dll GetProcAddress
 #define close_dll FreeLibrary
 #endif

src/if_py_both.h

@@ -34 +34 @@
 static PyObject *OutputWrite(PyObject *, PyObject *);
 static PyObject *OutputWritelines(PyObject *, PyObject *);
 
+/* Function to write a line, points to either msg() or emsg(). */
 typedef void (*writefn)(char_u *);
 static void writer(writefn fn, char_u *str, PyInt n);
 
@@ -122 +123 @@
     return Py_None;
 }
 
-static char_u *buffer = NULL;
-static PyInt buffer_len = 0;
-static PyInt buffer_size = 0;
-
+/* Buffer IO, we write one whole line at a time. */
+static garray_T io_ga = {0, 0, 1, 80, NULL};
 static writefn old_fn = NULL;
 
     static void
-buffer_ensure(PyInt n)
-{
-    PyInt new_size;
-    char_u *new_buffer;
-
-    if (n < buffer_size)
-        return;
-
-    new_size = buffer_size;
-    while (new_size < n)
-        new_size += 80;
-
-    if (new_size != buffer_size)
-    {
-        new_buffer = alloc((unsigned)new_size);
-        if (new_buffer == NULL)
-            return;
-
-        if (buffer)
-        {
-            memcpy(new_buffer, buffer, buffer_len);
-            vim_free(buffer);
-        }
-
-        buffer = new_buffer;
-        buffer_size = new_size;
-    }
-}
-
-    static void
 PythonIO_Flush(void)
 {
-    if (old_fn && buffer_len)
+    if (old_fn != NULL && io_ga.ga_len > 0)
     {
-        buffer[buffer_len] = 0;
-        old_fn(buffer);
+        ((char_u *)io_ga.ga_data)[io_ga.ga_len] = NUL;
+        old_fn((char_u *)io_ga.ga_data);
     }
-
-    buffer_len = 0;
+    io_ga.ga_len = 0;
 }
 
     static void
@@ -175 +143 @@
 {
     char_u *ptr;
 
-    if (fn != old_fn && old_fn != NULL)
+    /* Flush when switching output function. */
+    if (fn != old_fn)
         PythonIO_Flush();
-
     old_fn = fn;
 
+    /* Write each NL separated line.  Text after the last NL is kept for
+     * writing later. */
     while (n > 0 && (ptr = memchr(str, '\n', n)) != NULL)
     {
         PyInt len = ptr - str;
 
-        buffer_ensure(buffer_len + len + 1);
+        if (ga_grow(&io_ga, (int)(len + 1)) == FAIL)
+            break;
 
-        memcpy(buffer + buffer_len, str, len);
-        buffer_len += len;
-        buffer[buffer_len] = 0;
-        fn(buffer);
+        mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len);
+        ((char *)io_ga.ga_data)[io_ga.ga_len + len] = NUL;
+        fn((char_u *)io_ga.ga_data);
         str = ptr + 1;
         n -= len + 1;
-        buffer_len = 0;
+        io_ga.ga_len = 0;
     }
 
-    /* Put the remaining text into the buffer for later printing */
-    buffer_ensure(buffer_len + n + 1);
-    memcpy(buffer + buffer_len, str, n);
-    buffer_len += n;
+    /* Put the remaining text into io_ga for later printing. */
+    if (n > 0 && ga_grow(&io_ga, (int)(n + 1)) == OK)
+    {
+        mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n);
+        io_ga.ga_len += (int)n;
+    }
 }
 
 /***************/

src/if_python.c

@@ -102 +102 @@
 #  include <dlfcn.h>
 #  define FARPROC void*
 #  define HINSTANCE void*
-#  ifdef PY_NO_RTLD_GLOBAL
+#  if defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)
 #   define load_dll(n) dlopen((n), RTLD_LAZY)
 #  else
 #   define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
@@ -110 +110 @@
 #  define close_dll dlclose
 #  define symbol_from_dll dlsym
 # else
-#  define load_dll LoadLibrary
+#  define load_dll vimLoadLib
 #  define close_dll FreeLibrary
 #  define symbol_from_dll GetProcAddress
 # endif
@@ -168 +168 @@
 # define Py_BuildValue dll_Py_BuildValue
 # define Py_FindMethod dll_Py_FindMethod
 # define Py_InitModule4 dll_Py_InitModule4
+# define Py_SetPythonHome dll_Py_SetPythonHome
 # define Py_Initialize dll_Py_Initialize
 # define Py_Finalize dll_Py_Finalize
 # define Py_IsInitialized dll_Py_IsInitialized
@@ -226 +227 @@
 static PyObject*(*dll_Py_BuildValue)(char *, ...);
 static PyObject*(*dll_Py_FindMethod)(struct PyMethodDef[], PyObject *, char *);
 static PyObject*(*dll_Py_InitModule4)(char *, struct PyMethodDef *, char *, PyObject *, int);
+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);
@@ -310 +312 @@
 # else
     {"Py_InitModule4", (PYTHON_PROC*)&dll_Py_InitModule4},
 # endif
+    {"Py_SetPythonHome", (PYTHON_PROC*)&dll_Py_SetPythonHome},
     {"Py_Initialize", (PYTHON_PROC*)&dll_Py_Initialize},
     {"Py_Finalize", (PYTHON_PROC*)&dll_Py_Finalize},
     {"Py_IsInitialized", (PYTHON_PROC*)&dll_Py_IsInitialized},
@@ -349 +352 @@
 {
     int i;
 
-#if !defined(PY_NO_RTLD_GLOBAL) && defined(UNIX) && defined(FEAT_PYTHON3)
+#if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON3)
     /* Can't have Python and Python3 loaded at the same time.
      * It cause a crash, because RTLD_GLOBAL is needed for
      * standard C extension libraries of one or both python versions. */
@@ -543 +546 @@
         }
 #endif
 
+#ifdef PYTHON_HOME
+        Py_SetPythonHome(PYTHON_HOME);
+#endif
+
         init_structs();
 
 #if !defined(MACOS) || defined(MACOS_X_UNIX)

src/if_python3.c

@@ -80 +80 @@
 #  include <dlfcn.h>
 #  define FARPROC void*
 #  define HINSTANCE void*
-#  ifdef PY_NO_RTLD_GLOBAL
+#  if defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)
 #   define load_dll(n) dlopen((n), RTLD_LAZY)
 #  else
 #   define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
@@ -88 +88 @@
 #  define close_dll dlclose
 #  define symbol_from_dll dlsym
 # else
-#  define load_dll LoadLibrary
+#  define load_dll vimLoadLib
 #  define close_dll FreeLibrary
 #  define symbol_from_dll GetProcAddress
 # endif
@@ -132 +132 @@
 # define PyType_Ready py3_PyType_Ready
 #undef Py_BuildValue
 # define Py_BuildValue py3_Py_BuildValue
+# define Py_SetPythonHome py3_Py_SetPythonHome
 # define Py_Initialize py3_Py_Initialize
 # define Py_Finalize py3_Py_Finalize
 # define Py_IsInitialized py3_Py_IsInitialized
@@ -170 +171 @@
  * Pointers for dynamic link
  */
 static int (*py3_PySys_SetArgv)(int, wchar_t **);
+static void (*py3_Py_SetPythonHome)(wchar_t *home);
 static void (*py3_Py_Initialize)(void);
 static PyObject* (*py3_PyList_New)(Py_ssize_t size);
 static PyGILState_STATE (*py3_PyGILState_Ensure)(void);
@@ -254 +256 @@
 } py3_funcname_table[] =
 {
     {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv},
+    {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome},
     {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize},
     {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
     {"PyList_New", (PYTHON_PROC*)&py3_PyList_New},
@@ -336 +339 @@
     int i;
     void *ucs_from_string, *ucs_from_string_and_size;
 
-# if !defined(PY_NO_RTLD_GLOBAL) && defined(UNIX) && defined(FEAT_PYTHON)
+# if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON)
     /* Can't have Python and Python3 loaded at the same time.
      * It cause a crash, because RTLD_GLOBAL is needed for
      * standard C extension libraries of one or both python versions. */
@@ -539 +542 @@
 
         init_structs();
 
+
+#ifdef PYTHON3_HOME
+        Py_SetPythonHome(PYTHON3_HOME);
+#endif
+
         /* initialise threads */
         PyEval_InitThreads();
 

src/if_ruby.c

@@ -4 +4 @@
  *
  * Ruby interface by Shugo Maeda
  *   with improvements by SegPhault (Ryan Paul)
+ *   with improvements by Jon Maken
  *
  * Do ":help uganda"  in Vim to read copying and usage conditions.
  * Do ":help credits" in Vim to see a list of people who contributed.
@@ -13 +14 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+# include "auto/config.h"
+#endif
+
 #ifdef _WIN32
 # if !defined(DYNAMIC_RUBY_VER) || (DYNAMIC_RUBY_VER < 18)
 #   define NT
@@ -26 +31 @@
 # define RUBYEXTERN extern
 #endif
 
+#ifdef DYNAMIC_RUBY
 /*
  * This is tricky.  In ruby.h there is (inline) function rb_class_of()
  * definition.  This function use these variables.  But we want function to
  * use dll_* variables.
  */
-#ifdef DYNAMIC_RUBY
 # define rb_cFalseClass         (*dll_rb_cFalseClass)
 # define rb_cFixnum             (*dll_rb_cFixnum)
 # define rb_cNilClass           (*dll_rb_cNilClass)
@@ -46 +51 @@
  */
 #  define RUBY_EXPORT
 # endif
+
+#if !(defined(WIN32) || defined(_WIN64))
+# include <dlfcn.h>
+# define HINSTANCE void*
+# define RUBY_PROC void*
+# define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL)
+# define symbol_from_dll dlsym
+# define close_dll dlclose
+#else
+# define RUBY_PROC FARPROC
+# define load_dll vimLoadLib
+# define symbol_from_dll GetProcAddress
+# define close_dll FreeLibrary
 #endif
 
+#endif  /* ifdef DYNAMIC_RUBY */
+
 /* suggested by Ariya Mizutani */
 #if (_MSC_VER == 1200)
 # undef _WIN32_WINNT
@@ -70 +90 @@
 # include <ruby/encoding.h>
 #endif
 
+#undef off_t    /* ruby defines off_t as _int64, Mingw uses long */
 #undef EXTERN
 #undef _
 
@@ -160 +181 @@
 #define rb_lastline_get                 dll_rb_lastline_get
 #define rb_lastline_set                 dll_rb_lastline_set
 #define rb_load_protect                 dll_rb_load_protect
+#ifndef RUBY19_OR_LATER
 #define rb_num2long                     dll_rb_num2long
+#endif
 #define rb_num2ulong                    dll_rb_num2ulong
 #define rb_obj_alloc                    dll_rb_obj_alloc
 #define rb_obj_as_string                dll_rb_obj_as_string
 #define rb_obj_id                       dll_rb_obj_id
 #define rb_raise                        dll_rb_raise
-#define rb_str2cstr                     dll_rb_str2cstr
 #define rb_str_cat                      dll_rb_str_cat
 #define rb_str_concat                   dll_rb_str_concat
 #define rb_str_new                      dll_rb_str_new
 #ifdef rb_str_new2
 /* Ruby may #define rb_str_new2 to use rb_str_new_cstr. */
 # define need_rb_str_new_cstr 1
+/* Ruby's headers #define rb_str_new_cstr to make use of GCC's
+ * __builtin_constant_p extension. */
+# undef rb_str_new_cstr
 # define rb_str_new_cstr                dll_rb_str_new_cstr
 #else
 # define rb_str_new2                    dll_rb_str_new2
 #endif
 #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+# define rb_string_value                dll_rb_string_value
 # define rb_string_value_ptr            dll_rb_string_value_ptr
 # define rb_float_new                   dll_rb_float_new
 # define rb_ary_new                     dll_rb_ary_new
 # define rb_ary_push                    dll_rb_ary_push
+#else
+# define rb_str2cstr                    dll_rb_str2cstr
 #endif
 #ifdef RUBY19_OR_LATER
 # define rb_errinfo                     dll_rb_errinfo
@@ -190 +218 @@
 #endif
 #define ruby_init                       dll_ruby_init
 #define ruby_init_loadpath              dll_ruby_init_loadpath
-#define NtInitialize                    dll_NtInitialize
-#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-# define rb_w32_snprintf                dll_rb_w32_snprintf
+#ifdef WIN3264
+# define NtInitialize                   dll_NtInitialize
+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+#  define rb_w32_snprintf               dll_rb_w32_snprintf
+# endif
 #endif
 
 #ifdef RUBY19_OR_LATER
@@ -201 +231 @@
 # define rb_enc_find                    dll_rb_enc_find
 # define rb_enc_str_new                 dll_rb_enc_str_new
 # define rb_sprintf                     dll_rb_sprintf
+# define rb_require                     dll_rb_require
 # define ruby_init_stack                dll_ruby_init_stack
+# define ruby_process_options           dll_ruby_process_options
 #endif
 
 /*
@@ -246 +278 @@
 static VALUE (*dll_rb_obj_as_string) (VALUE);
 static VALUE (*dll_rb_obj_id) (VALUE);
 static void (*dll_rb_raise) (VALUE, const char*, ...);
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+static VALUE (*dll_rb_string_value) (volatile VALUE*);
+#else
 static char *(*dll_rb_str2cstr) (VALUE,int*);
+#endif
 static VALUE (*dll_rb_str_cat) (VALUE, const char*, long);
 static VALUE (*dll_rb_str_concat) (VALUE, VALUE);
 static VALUE (*dll_rb_str_new) (const char*, long);
@@ -263 +299 @@
 #endif
 static void (*dll_ruby_init) (void);
 static void (*dll_ruby_init_loadpath) (void);
+#ifdef WIN3264
 static void (*dll_NtInitialize) (int*, char***);
+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
+# endif
+#endif
 #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
 static char * (*dll_rb_string_value_ptr) (volatile VALUE*);
 static VALUE (*dll_rb_float_new) (double);
@@ -273 +314 @@
 #ifdef RUBY19_OR_LATER
 static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
 #endif
-#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
-static int (*dll_rb_w32_snprintf)(char*, size_t, const char*, ...);
-#endif
 
 #ifdef RUBY19_OR_LATER
 static void (*dll_ruby_script) (const char*);
@@ -283 +321 @@
 static rb_encoding* (*dll_rb_enc_find) (const char*);
 static VALUE (*dll_rb_enc_str_new) (const char*, long, rb_encoding*);
 static VALUE (*dll_rb_sprintf) (const char*, ...);
+static VALUE (*dll_rb_require) (const char*);
 static void (*ruby_init_stack)(VALUE*);
+static void* (*ruby_process_options)(int, char**);
 #endif
 
 #ifdef RUBY19_OR_LATER
@@ -297 +337 @@
 }
 #endif
 
-static HINSTANCE hinstRuby = 0; /* Instance of ruby.dll */
+static HINSTANCE hinstRuby = NULL; /* Instance of ruby.dll */
 
 /*
  * Table of name to function pointer of ruby.
  */
-#define RUBY_PROC FARPROC
 static struct
 {
     char *name;
@@ -347 +386 @@
     {"rb_obj_as_string", (RUBY_PROC*)&dll_rb_obj_as_string},
     {"rb_obj_id", (RUBY_PROC*)&dll_rb_obj_id},
     {"rb_raise", (RUBY_PROC*)&dll_rb_raise},
+#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+    {"rb_string_value", (RUBY_PROC*)&dll_rb_string_value},
+#else
     {"rb_str2cstr", (RUBY_PROC*)&dll_rb_str2cstr},
+#endif
     {"rb_str_cat", (RUBY_PROC*)&dll_rb_str_cat},
     {"rb_str_concat", (RUBY_PROC*)&dll_rb_str_concat},
     {"rb_str_new", (RUBY_PROC*)&dll_rb_str_new},
@@ -363 +406 @@
 #endif
     {"ruby_init", (RUBY_PROC*)&dll_ruby_init},
     {"ruby_init_loadpath", (RUBY_PROC*)&dll_ruby_init_loadpath},
+#ifdef WIN3264
     {
-#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER < 19
+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER < 19
     "NtInitialize",
-#else
+# else
     "ruby_sysinit",
-#endif
+# endif
                         (RUBY_PROC*)&dll_NtInitialize},
-#if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
     {"rb_w32_snprintf", (RUBY_PROC*)&dll_rb_w32_snprintf},
+# endif
 #endif
 #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18
     {"rb_string_value_ptr", (RUBY_PROC*)&dll_rb_string_value_ptr},
@@ -386 +431 @@
     {"rb_enc_find", (RUBY_PROC*)&dll_rb_enc_find},
     {"rb_enc_str_new", (RUBY_PROC*)&dll_rb_enc_str_new},
     {"rb_sprintf", (RUBY_PROC*)&dll_rb_sprintf},
+    {"rb_require", (RUBY_PROC*)&dll_rb_require},
     {"ruby_init_stack", (RUBY_PROC*)&dll_ruby_init_stack},
+    {"ruby_process_options", (RUBY_PROC*)&dll_ruby_process_options},
 #endif
     {"", NULL},
 };
@@ -399 +446 @@
 {
     if (hinstRuby)
     {
-        FreeLibrary(hinstRuby);
-        hinstRuby = 0;
+        close_dll(hinstRuby);
+        hinstRuby = NULL;
     }
 }
 
@@ -416 +463 @@
 
     if (hinstRuby)
         return OK;
-    hinstRuby = LoadLibrary(libname);
+    hinstRuby = load_dll(libname);
     if (!hinstRuby)
     {
         if (verbose)
@@ -426 +473 @@
 
     for (i = 0; ruby_funcname_table[i].ptr; ++i)
     {
-        if (!(*ruby_funcname_table[i].ptr = GetProcAddress(hinstRuby,
+        if (!(*ruby_funcname_table[i].ptr = symbol_from_dll(hinstRuby,
                         ruby_funcname_table[i].name)))
         {
-            FreeLibrary(hinstRuby);
-            hinstRuby = 0;
+            close_dll(hinstRuby);
+            hinstRuby = NULL;
             if (verbose)
                 EMSG2(_(e_loadfunc), ruby_funcname_table[i].name);
             return FAIL;
@@ -539 +586 @@
         if (u_save(eap->line1 - 1, eap->line2 + 1) != OK)
             return;
         for (i = eap->line1; i <= eap->line2; i++) {
-            VALUE line, oldline;
+            VALUE line;
 
-            line = oldline = vim_str2rb_enc_str((char *)ml_get(i));
+            line = vim_str2rb_enc_str((char *)ml_get(i));
             rb_lastline_set(line);
             eval_enc_string_protect((char *) eap->arg, &state);
             if (state) {
@@ -616 +663 @@
                 ruby_init();
             }
 #ifdef RUBY19_OR_LATER
+            {
+                int dummy_argc = 2;
+                char *dummy_argv[] = {"vim-ruby", "-e0"};
+                ruby_process_options(dummy_argc, dummy_argv);
+            }
             ruby_script("vim-ruby");
-#endif
+#else
             ruby_init_loadpath();
-            ruby_io_init();
-#ifdef RUBY19_OR_LATER
-            rb_enc_find_index("encdb");
 #endif
+            ruby_io_init();
             ruby_vim_init();
             ruby_initialized = 1;
 #ifdef DYNAMIC_RUBY
@@ -906 +956 @@
 
 static VALUE get_buffer_line(buf_T *buf, linenr_T n)
 {
-    if (n > 0 && n <= buf->b_ml.ml_line_count)
-    {
-        char *line = (char *)ml_get_buf(buf, n, FALSE);
-        return line ? vim_str2rb_enc_str(line) : Qnil;
-    }
-    rb_raise(rb_eIndexError, "line number %ld out of range", (long)n);
-#ifndef __GNUC__
-    return Qnil; /* For stop warning */
-#endif
+    if (n <= 0 || n > buf->b_ml.ml_line_count)
+        rb_raise(rb_eIndexError, "line number %ld out of range", (long)n);
+    return vim_str2rb_enc_str((char *)ml_get_buf(buf, n, FALSE));
 }
 
 static VALUE buffer_aref(VALUE self, VALUE num)
@@ -953 +997 @@
     else
     {
         rb_raise(rb_eIndexError, "line number %ld out of range", (long)n);
-#ifndef __GNUC__
-        return Qnil; /* For stop warning */
-#endif
     }
     return str;
 }
@@ -1010 +1051 @@
     long        n = NUM2LONG(num);
     aco_save_T  aco;
 
-    if (line == NULL) {
+    if (line == NULL)
+    {
         rb_raise(rb_eIndexError, "NULL line");
     }
     else if (n >= 0 && n <= buf->b_ml.ml_line_count)
@@ -1034 +1076 @@
 
         update_curbuf(NOT_VALID);
     }
-    else {
+    else
+    {
         rb_raise(rb_eIndexError, "line number %ld out of range", n);
     }
     return str;

src/if_sniff.c

@@ -9 +9 @@
 
 #ifdef WIN32
 # include <stdio.h>
-# include "vimio.h"
 # include <process.h>
 # include <string.h>
 # include <assert.h>

src/if_tcl.c

@@ -74 +74 @@
 #endif
 
 #include <tcl.h>
-#include <errno.h>
 #include <string.h>
 
 typedef struct

src/integration.c

@@ -33 +33 @@
 #include <sys/un.h>
 #endif
 
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h>

src/link.sh

@@ -5 +5 @@
 # libraries when they exist, but this doesn't mean they are needed for Vim.
 #
 #      Author: Bram Moolenaar
-# Last change: 2006 Sep 26
+# Last change: 2010 Nov 03
 #     License: Public domain
 #
 # Warning: This fails miserably if the linker doesn't return an error code!
@@ -16 +16 @@
 echo "$LINK " >link.cmd
 exit_value=0
 
+if test "$LINK_AS_NEEDED" = yes; then
+  echo "link.sh: \$LINK_AS_NEEDED set to 'yes': invoking linker directly."
+  cat link.cmd
+  if sh link.cmd; then
+    exit_value=0
+    echo "link.sh: Linked fine"
+  else
+    exit_value=$?
+    echo "link.sh: Linking failed"
+  fi
+else
+  if test -f auto/link.sed; then
+
 #
 # If auto/link.sed already exists, use it.  We assume a previous run of
 # link.sh has found the correct set of libraries.
 #
-if test -f auto/link.sed; then
   echo "link.sh: The file 'auto/link.sed' exists, which is going to be used now."
   echo "link.sh: If linking fails, try deleting the auto/link.sed file."
   echo "link.sh: If this fails too, try creating an empty auto/link.sed file."
@@ -124 +136 @@
   fi
 fi
 
+fi
+
 #
 # cleanup
 #

src/macros.h

@@ -285 +285 @@
 #else
 # define DO_AUTOCHDIR
 #endif
+
+#if defined(FEAT_SCROLLBIND) && defined(FEAT_CURSORBIND)
+# define RESET_BINDING(wp)  (wp)->w_p_scb = FALSE; (wp)->w_p_crb = FALSE
+#else
+# if defined(FEAT_SCROLLBIND)
+#  define RESET_BINDING(wp)  (wp)->w_p_scb = FALSE
+# else
+#  if defined(FEAT_CURSORBIND)
+#   define RESET_BINDING(wp)  (wp)->w_p_crb = FALSE
+#  else
+#   define RESET_BINDING(wp)
+#  endif
+# endif
+#endif

src/main.c

@@ -7 +7 @@
  * See README.txt for an overview of the Vim source code.
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"             /* for close() and dup() */
-#endif
-
 #define EXTERN
 #include "vim.h"
 
@@ -940 +936 @@
     if (netbeansArg != NULL && strncmp("-nb", netbeansArg, 3) == 0)
     {
 # ifdef FEAT_GUI
-#  if !defined(FEAT_GUI_MOTIF) && !defined(FEAT_GUI_GTK)  \
+#  if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK)  \
                 && !defined(FEAT_GUI_W32)
         if (gui.in_use)
         {
@@ -3817 +3813 @@
     /* Check if we have at least one argument. */
     if (filec <= 0)
         mainerr_arg_missing((char_u *)filev[-1]);
+
+    /* Temporarily cd to the current directory to handle relative file names. */
     if (mch_dirname(cwd, MAXPATHL) != OK)
         return NULL;
     if ((p = vim_strsave_escaped_ext(cwd,
@@ -3858 +3856 @@
         ga_concat(&ga, p);
         vim_free(p);
     }
+    ga_concat(&ga, (char_u *)"|if exists('*inputrestore')|call inputrestore()|endif<CR>");
+
     /* The :drop commands goes to Insert mode when 'insertmode' is set, use
      * CTRL-\ CTRL-N again. */
-    ga_concat(&ga, (char_u *)"|if exists('*inputrestore')|call inputrestore()|endif<CR>");
-    ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd -");
+    ga_concat(&ga, (char_u *)"<C-\\><C-N>");
+
+    /* Switch back to the correct current directory (prior to temporary path
+     * switch) unless 'autochdir' is set, in which case it will already be
+     * correct after the :drop command. */
+    ga_concat(&ga, (char_u *)":if !exists('+acd')||!&acd|cd -|endif<CR>");
+
     if (sendReply)
-        ga_concat(&ga, (char_u *)"<CR>:call SetupRemoteReplies()");
-    ga_concat(&ga, (char_u *)"<CR>:");
+        ga_concat(&ga, (char_u *)":call SetupRemoteReplies()<CR>");
+    ga_concat(&ga, (char_u *)":");
     if (inicmd != NULL)
     {
         /* Can't use <CR> after "inicmd", because an "startinsert" would cause

src/mbyte.c

@@ -3124 +3124 @@
                 /* If one of the two characters is incomplete return -1. */
                 if (incomplete || i + utf_byte2len(s2[i]) > n)
                     return -1;
+                /* Don't case-fold illegal bytes or truncated characters. */
+                if (utf_ptr2len(s1 + i) < l || utf_ptr2len(s2 + i) < l)
+                    return -1;
                 cdiff = utf_fold(utf_ptr2char(s1 + i))
                                              - utf_fold(utf_ptr2char(s2 + i));
                 if (cdiff != 0)
@@ -4159 +4162 @@
 {
     if (hIconvDLL != 0 && hMsvcrtDLL != 0)
         return TRUE;
-    hIconvDLL = LoadLibrary(DYNAMIC_ICONV_DLL);
+    hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL);
     if (hIconvDLL == 0)         /* sometimes it's called libiconv.dll */
-        hIconvDLL = LoadLibrary(DYNAMIC_ICONV_DLL_ALT);
+        hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT);
     if (hIconvDLL != 0)
-        hMsvcrtDLL = LoadLibrary(DYNAMIC_MSVCRT_DLL);
+        hMsvcrtDLL = vimLoadLib(DYNAMIC_MSVCRT_DLL);
     if (hIconvDLL == 0 || hMsvcrtDLL == 0)
     {
         /* Only give the message when 'verbose' is set, otherwise it might be
@@ -5167 +5170 @@
     void
 xim_set_preedit()
 {
-    if (xic == NULL)
-        return;
-
-    xim_set_focus(TRUE);
-
     XVaNestedList attr_list;
     XRectangle spot_area;
     XPoint over_spot;
     int line_space;
 
+    if (xic == NULL)
+        return;
+
+    xim_set_focus(TRUE);
+
     if (!xim_has_focus)
     {
         /* hide XIM cursor */
@@ -5554 +5557 @@
     void
 xim_set_status_area()
 {
-    if (xic == NULL)
-        return;
-
     XVaNestedList preedit_list = 0, status_list = 0, list = 0;
     XRectangle pre_area, status_area;
 
+    if (xic == NULL)
+        return;
+
     if (input_style & XIMStatusArea)
     {
         if (input_style & XIMPreeditArea)

src/memfile.c

@@ -32 +32 @@
  * file is opened.
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"     /* for lseek(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 /*
@@ -1049 +1045 @@
         PERROR(_("E294: Seek error in swap file read"));
         return FAIL;
     }
-    if ((unsigned)vim_read(mfp->mf_fd, hp->bh_data, size) != size)
+    if ((unsigned)read_eintr(mfp->mf_fd, hp->bh_data, size) != size)
     {
         PERROR(_("E295: Read error in swap file"));
         return FAIL;
@@ -1168 +1164 @@
     }
 #endif
 
-    if ((unsigned)vim_write(mfp->mf_fd, data, size) != size)
+    if ((unsigned)write_eintr(mfp->mf_fd, data, size) != size)
         result = FAIL;
 
 #ifdef FEAT_CRYPT

src/memline.c

@@ -42 +42 @@
  *  mf_get().
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"     /* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 #ifndef UNIX            /* it's in os_unix.h for Unix */
@@ -56 +52 @@
 # include <proto/dos.h>     /* for Open() and Close() */
 #endif
 
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-
 typedef struct block0           ZERO_BL;    /* contents of the first block */
 typedef struct pointer_block    PTR_BL;     /* contents of a pointer block */
 typedef struct data_block       DATA_BL;    /* contents of a data block */
@@ -582 +574 @@
             idx = ip->ip_index + 1;         /* go to next index */
             page_count = 1;
         }
+
+        if (error > 0)
+            EMSG(_("E843: Error while updating swap file crypt"));
     }
 
     mfp->mf_old_key = NULL;
@@ -2059 +2054 @@
     fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
     if (fd >= 0)
     {
-        if (read(fd, (char *)&b0, sizeof(b0)) == sizeof(b0))
+        if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0))
         {
             if (STRNCMP(b0.b0_version, "VIM 3.0", 7) == 0)
             {
@@ -2384 +2379 @@
  * Make a copy of the line if necessary.
  */
 /*
- * get a pointer to a (read-only copy of a) line
+ * Return a pointer to a (read-only copy of a) line.
  *
  * On failure an error message is given and IObuff is returned (to avoid
  * having to check for error everywhere).
@@ -2397 +2392 @@
 }
 
 /*
- * ml_get_pos: get pointer to position 'pos'
+ * Return pointer to position "pos".
  */
     char_u *
 ml_get_pos(pos)
@@ -2407 +2402 @@
 }
 
 /*
- * ml_get_curline: get pointer to cursor line.
+ * Return pointer to cursor line.
  */
     char_u *
 ml_get_curline()
@@ -2416 +2411 @@
 }
 
 /*
- * ml_get_cursor: get pointer to cursor position
+ * Return pointer to cursor position.
  */
     char_u *
 ml_get_cursor()
@@ -2426 +2421 @@
 }
 
 /*
- * get a pointer to a line in a specific buffer
+ * Return a pointer to a line in a specific buffer
  *
  * "will_change": if TRUE mark the buffer dirty (chars in the line will be
  * changed)
@@ -4389 +4384 @@
                 fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0);
                 if (fd >= 0)
                 {
-                    if (read(fd, (char *)&b0, sizeof(b0)) == sizeof(b0))
+                    if (read_eintr(fd, &b0, sizeof(b0)) == sizeof(b0))
                     {
                         /*
                          * If the swapfile has the same directory as the

src/menu.c

@@ -1512 +1512 @@
 {
 #ifdef FEAT_MULTI_LANG
     if (menu->en_name != NULL
-            && (menu_namecmp(name,menu->en_name)
-                || menu_namecmp(name,menu->en_dname)))
+            && (menu_namecmp(name, menu->en_name)
+                || menu_namecmp(name, menu->en_dname)))
         return TRUE;
 #endif
     return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
@@ -2342 +2342 @@
 
         while (menu != NULL)
         {
-            if (STRCMP(name, menu->name) == 0 || STRCMP(name, menu->dname) == 0)
+            if (menu_name_equal(name, menu))
             {
                 if (menu->children == NULL)
                 {

src/message.c

@@ -569 +569 @@
     int         severe;
 #endif
 
+    /* Skip this if not giving error messages at the moment. */
+    if (emsg_not_now())
+        return TRUE;
+
     called_emsg = TRUE;
     ex_exitval = 1;
 
@@ -581 +585 @@
     emsg_severe = FALSE;
 #endif
 
-    /* Skip this if not giving error messages at the moment. */
-    if (emsg_not_now())
-        return TRUE;
-
     if (!emsg_off || vim_strchr(p_debug, 't') != NULL)
     {
 #ifdef FEAT_EVAL
@@ -1477 +1477 @@
     return retval;
 }
 
+#if defined(FEAT_EVAL) || defined(PROTO)
+/*
+ * Return the lhs or rhs of a mapping, with the key codes turned into printable
+ * strings, in an allocated string.
+ */
+    char_u *
+str2special_save(str, is_lhs)
+    char_u  *str;
+    int     is_lhs;  /* TRUE for lhs, FALSE for rhs */
+{
+    garray_T    ga;
+    char_u      *p = str;
+
+    ga_init2(&ga, 1, 40);
+    while (*p != NUL)
+        ga_concat(&ga, str2special(&p, is_lhs));
+    ga_append(&ga, NUL);
+    return (char_u *)ga.ga_data;
+}
+#endif
+
 /*
  * Return the printable string for the key codes at "*sp".
  * Used for translating the lhs or rhs of a mapping to printable chars.

src/misc1.c

@@ -3114 +3114 @@
                && (!p_ttimeout || waited * 100L < (p_ttm < 0 ? p_tm : p_ttm)))
             continue;
 
-        /* found a termcode: adjust length */
-        if (n > 0)
+        if (n == KEYLEN_REMOVED)  /* key code removed */
+            continue;
+        if (n > 0)              /* found a termcode: adjust length */
             len = n;
-        if (len == 0)       /* nothing typed yet */
+        if (len == 0)           /* nothing typed yet */
             continue;
 
         /* Handle modifier and/or special key code. */
@@ -9161 +9162 @@
 #ifdef CASE_INSENSITIVE_FILENAME
     regmatch.rm_ic = TRUE;              /* Behave like Terminal.app */
 #else
-    regmatch.rm_ic = FALSE;             /* Don't ever ignore case */
+    if (flags & EW_ICASE)
+        regmatch.rm_ic = TRUE;          /* 'wildignorecase' set */
+    else
+        regmatch.rm_ic = FALSE;         /* Don't ignore case */
 #endif
     regmatch.regprog = vim_regcomp(pat, RE_MAGIC);
     vim_free(pat);
@@ -9317 +9321 @@
             continue;  /* it's different when it's shorter */
 
         rival = other_paths[j] + other_path_len - candidate_len;
-        if (fnamecmp(maybe_unique, rival) == 0)
+        if (fnamecmp(maybe_unique, rival) == 0
+                && (rival == other_paths[j] || vim_ispathsep(*(rival - 1))))
             return FALSE;  /* match */
     }
 
@@ -9642 +9647 @@
     if (paths == NULL)
         return 0;
 
-    files = globpath(paths, pattern, 0);
+    files = globpath(paths, pattern, (flags & EW_ICASE) ? WILD_ICASE : 0);
     vim_free(paths);
     if (files == NULL)
         return 0;

src/misc2.c

@@ -200 +200 @@
         }
 #endif
 
-        idx = -1;
         ptr = line;
         while (col <= wcol && *ptr != NUL)
         {
@@ -1223 +1222 @@
 #endif
 
 /*
- * copy a string into newly allocated memory
+ * Copy "string" into newly allocated memory.
  */
     char_u *
 vim_strsave(string)
@@ -1239 +1238 @@
     return p;
 }
 
+/*
+ * Copy up to "len" bytes of "string" into newly allocated memory and
+ * terminate with a NUL.
+ * The allocated memory always has size "len + 1", also when "string" is
+ * shorter.
+ */
     char_u *
 vim_strnsave(string, len)
     char_u      *string;

src/netbeans.c

@@ -16 +16 @@
  * See ":help netbeans-protocol" for explanation.
  */
 
-#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
-# include "vimio.h"     /* for mch_open(), must be before vim.h */
-#endif
-
 #include "vim.h"
 
 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO)
@@ -87 +83 @@
 static void nb_init_graphics __ARGS((void));
 static void coloncmd __ARGS((char *cmd, ...));
 static void nb_set_curbuf __ARGS((buf_T *buf));
-#ifdef FEAT_GUI_MOTIF
+#ifdef FEAT_GUI_X11
 static void messageFromNetbeans __ARGS((XtPointer, int *, XtInputId *));
 #endif
 #ifdef FEAT_GUI_GTK
@@ -112 +108 @@
 static NBSOCK nbsock = -1;              /* socket fd for Netbeans connection */
 #define NETBEANS_OPEN (nbsock != -1)
 
-#ifdef FEAT_GUI_MOTIF
+#ifdef FEAT_GUI_X11
 static XtInputId inputHandler = (XtInputId)NULL;  /* Cookie for input */
 #endif
 #ifdef FEAT_GUI_GTK
@@ -135 +131 @@
 static int needupdate = 0;
 static int inAtomic = 0;
 
+/*
+ * Close the socket and remove the input handlers.
+ */
     static void
-netbeans_close(void)
+nb_close_socket(void)
 {
-    if (!NETBEANS_OPEN)
-        return;
-
-    netbeans_send_disconnect();
-
-#ifdef FEAT_GUI_MOTIF
+#ifdef FEAT_GUI_X11
     if (inputHandler != (XtInputId)NULL)
     {
         XtRemoveInput(inputHandler);
@@ -167 +161 @@
 # endif
 #endif
 
+    sock_close(nbsock);
+    nbsock = -1;
+}
+
+/*
+ * Close the connection and cleanup.
+ * May be called when nb_close_socket() was called earlier.
+ */
+    static void
+netbeans_close(void)
+{
+    if (NETBEANS_OPEN)
+    {
+        netbeans_send_disconnect();
+        nb_close_socket();
+    }
+
 #ifdef FEAT_BEVAL
     bevalServers &= ~BEVAL_NETBEANS;
 #endif
 
-    sock_close(nbsock);
-    nbsock = -1;
-
     needupdate = 0;
     inAtomic = 0;
     nb_free();
@@ -311 +319 @@
     server.sin_port = htons(port);
     if ((host = gethostbyname(hostname)) == NULL)
     {
-        if (mch_access(hostname, R_OK) >= 0)
-        {
-            /* DEBUG: input file */
-            sd = mch_open(hostname, O_RDONLY, 0);
-            goto theend;
-        }
         nbdebug(("error in gethostbyname() in netbeans_connect()\n"));
         PERROR("gethostbyname() in netbeans_connect()");
+        sock_close(sd);
         goto theend;
     }
     memcpy((char *)&server.sin_addr, host->h_addr, host->h_length);
@@ -368 +371 @@
                                                          || (errno == EINTR)))
                 {
                     nbdebug(("retrying...\n"));
-                    sleep(5);
-                    if (!doabort)
+                    mch_delay(3000L, TRUE);
+                    ui_breakcheck();
+                    if (got_int)
                     {
-                        ui_breakcheck();
-                        if (got_int)
-                        {
-                            errno = EINTR;
-                            break;
-                        }
+                        errno = EINTR;
+                        break;
                     }
                     if (connect(sd, (struct sockaddr *)&server,
                                                          sizeof(server)) == 0)
@@ -391 +391 @@
                     /* Get here when the server can't be found. */
                     nbdebug(("Cannot connect to Netbeans #2\n"));
                     PERROR(_("Cannot connect to Netbeans #2"));
+                    sock_close(sd);
                     if (doabort)
                         getout(1);
                     goto theend;
@@ -401 +402 @@
         {
             nbdebug(("Cannot connect to Netbeans\n"));
             PERROR(_("Cannot connect to Netbeans"));
+            sock_close(sd);
             if (doabort)
                 getout(1);
             goto theend;
@@ -631 +633 @@
 {
     char_u      *p;
     queue_T     *node;
-
-    if (!NETBEANS_OPEN)
-        return;
+    int         own_node;
 
     while (head.next != NULL && head.next != &head)
     {
@@ -672 +672 @@
             *p++ = NUL;
             if (*p == NUL)
             {
+                own_node = TRUE;
                 head.next = node->next;
                 node->next->prev = node->prev;
             }
+            else
+                own_node = FALSE;
 
             /* now, parse and execute the commands */
             nb_parse_cmd(node->buffer);
 
-            if (*p == NUL)
+            if (own_node)
             {
                 /* buffer finished, dispose of the node and buffer */
                 vim_free(node->buffer);
                 vim_free(node);
             }
-            else
+            /* Check that "head" wasn't changed under our fingers, e.g. when a
+             * DETACH command was handled. */
+            else if (head.next == node)
             {
                 /* more follows, move to the start */
                 STRMOVE(node->buffer, p);
@@ -700 +705 @@
 /*
  * Read a command from netbeans.
  */
-#ifdef FEAT_GUI_MOTIF
+#ifdef FEAT_GUI_X11
     static void
 messageFromNetbeans(XtPointer clientData UNUSED,
                     int *unused1 UNUSED,
@@ -720 +725 @@
 }
 #endif
 
+#define DETACH_MSG "DETACH\n"
+
     void
 netbeans_read()
 {
     static char_u       *buf = NULL;
     int                 len = 0;
     int                 readlen = 0;
-#if defined(NB_HAS_GUI) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
-    static int          level = 0;
-#endif
 #ifdef HAVE_SELECT
     struct timeval      tval;
     fd_set              rfds;
@@ -744 +748 @@
         return;
     }
 
-#if defined(NB_HAS_GUI) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
-    /* recursion guard; this will be called from the X event loop at unknown
-     * moments */
-    if (NB_HAS_GUI)
-        ++level;
-#endif
-
     /* Allocate a buffer to read into. */
     if (buf == NULL)
     {
@@ -790 +787 @@
             break;      /* did read everything that's available */
     }
 
+    /* Reading a socket disconnection (readlen == 0), or a socket error. */
     if (readlen <= 0)
     {
-        /* read error or didn't read anything */
-        netbeans_close();
-        nbdebug(("messageFromNetbeans: Error in read() from socket\n"));
+        /* Queue a "DETACH" netbeans message in the command queue in order to
+         * terminate the netbeans session later. Do not end the session here
+         * directly as we may be running in the context of a call to
+         * netbeans_parse_messages():
+         *      netbeans_parse_messages
+         *          -> autocmd triggered while processing the netbeans cmd
+         *              -> ui_breakcheck
+         *                  -> gui event loop or select loop
+         *                      -> netbeans_read()
+         */
+        save((char_u *)DETACH_MSG, (int)strlen(DETACH_MSG));
+        nb_close_socket();
+
         if (len < 0)
         {
             nbdebug(("read from Netbeans socket\n"));
             PERROR(_("read from Netbeans socket"));
         }
-        return; /* don't try to parse it */
     }
 
-#if defined(NB_HAS_GUI) && !defined(FEAT_GUI_W32)
-    /* Let the main loop handle messages. */
-    if (NB_HAS_GUI)
-    {
-# ifdef FEAT_GUI_GTK
-        if (gtk_main_level() > 0)
-            gtk_main_quit();
-# else
-        /* Parse the messages now, but avoid recursion. */
-        if (level == 1)
-            netbeans_parse_messages();
-
-        --level;
-# endif
-    }
+#if defined(NB_HAS_GUI) && defined(FEAT_GUI_GTK)
+    if (NB_HAS_GUI && gtk_main_level() > 0)
+        gtk_main_quit();
 #endif
 }
 
@@ -955 +950 @@
     keyQ_T *key_node = keyHead.next;
     queue_T *cmd_node = head.next;
     nbbuf_T buf;
-    buf_T *bufp;
     int i;
 
     /* free the netbeans buffer list */
@@ -964 +958 @@
         buf = buf_list[i];
         vim_free(buf.displayname);
         vim_free(buf.signmap);
-        if ((bufp=buf.bufp) != NULL)
+        if (buf.bufp != NULL)
         {
             buf.bufp->b_netbeans_file = FALSE;
             buf.bufp->b_was_netbeans_file = FALSE;
@@ -1186 +1180 @@
 
     nbdebug(("REP %d: <none>\n", cmdno));
 
+    /* Avoid printing an annoying error message. */
+    if (!NETBEANS_OPEN)
+        return;
+
     sprintf(reply, "%d\n", cmdno);
     nb_send(reply, "nb_reply_nil");
 }
@@ -2773 +2771 @@
 ex_nbstart(eap)
     exarg_T     *eap;
 {
+#ifdef FEAT_GUI
+# if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK)  \
+                && !defined(FEAT_GUI_W32)
+    if (gui.in_use)
+    {
+        EMSG(_("E838: netbeans is not supported with this GUI"));
+        return;
+    }
+# endif
+#endif
     netbeans_open((char *)eap->arg, FALSE);
 }
 
@@ -2937 +2945 @@
     if (!NB_HAS_GUI || !NETBEANS_OPEN)
         return;
 
-# ifdef FEAT_GUI_MOTIF
+# ifdef FEAT_GUI_X11
     /* tell notifier we are interested in being called
      * when there is input on the editor connection socket
      */
@@ -3027 +3035 @@
     }
 }
 
-#if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_W32) || defined(PROTO)
+#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_W32) || defined(PROTO)
 /*
  * Tell netbeans that the window was moved or resized.
  */
@@ -3458 +3466 @@
     return FALSE;
 }
 
-#if defined(FEAT_GUI_MOTIF) || defined(PROTO)
+#if defined(FEAT_GUI_X11) || defined(PROTO)
 /*
  * We have multiple signs to draw at the same location. Draw the
  * multi-sign indicator instead. This is the Motif version.
@@ -3487 +3495 @@
     XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+3, y++);
     XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+2, y);
 }
-#endif /* FEAT_GUI_MOTIF */
+#endif /* FEAT_GUI_X11 */
 
 #if defined(FEAT_GUI_GTK) && !defined(PROTO)
 /*

src/normal.c

@@ -25 +25 @@
 static int      restart_VIsual_select = 0;
 #endif
 
+#ifdef FEAT_EVAL
+static void     set_vcount_ca __ARGS((cmdarg_T *cap, int *set_prevcount));
+#endif
 static int
 # ifdef __BORLANDC__
 _RTLENTRYF
@@ -648 +651 @@
     dont_scroll = FALSE;        /* allow scrolling here */
 #endif
 
+#ifdef FEAT_EVAL
+    /* Set v:count here, when called from main() and not a stuffed
+     * command, so that v:count can be used in an expression mapping
+     * when there is no count. */
+    if (toplevel && stuff_empty())
+        set_vcount_ca(&ca, &set_prevcount);
+#endif
+
     /*
      * Get the command character from the user.
      */
@@ -725 +736 @@
              * command, so that v:count can be used in an expression mapping
              * right after the count. */
             if (toplevel && stuff_empty())
-            {
-                long count = ca.count0;
-
-                /* multiply with ca.opcount the same way as below */
-                if (ca.opcount != 0)
-                    count = ca.opcount * (count == 0 ? 1 : count);
-                set_vcount(count, count == 0 ? 1 : count, set_prevcount);
-                set_prevcount = FALSE;  /* only set v:prevcount once */
-            }
+                set_vcount_ca(&ca, &set_prevcount);
 #endif
             if (ctrl_w)
             {
@@ -1386 +1389 @@
     opcount = ca.opcount;
 }
 
+#ifdef FEAT_EVAL
+/*
+ * Set v:count and v:count1 according to "cap".
+ * Set v:prevcount only when "set_prevcount" is TRUE.
+ */
+    static void
+set_vcount_ca(cap, set_prevcount)
+    cmdarg_T    *cap;
+    int         *set_prevcount;
+{
+    long count = cap->count0;
+
+    /* multiply with cap->opcount the same way as above */
+    if (cap->opcount != 0)
+        count = cap->opcount * (count == 0 ? 1 : count);
+    set_vcount(count, count == 0 ? 1 : count, *set_prevcount);
+    *set_prevcount = FALSE;  /* only set v:prevcount once */
+}
+#endif
+
 /*
  * Handle an operator after visual mode or when the movement is finished
  */
@@ -5666 +5689 @@
         else if (cmdchar == '#')
             aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\");
         else if (tag_cmd)
-            /* Don't escape spaces and Tabs in a tag with a backslash */
-            aux_ptr = (char_u *)"\\|\"\n[";
+        {
+            if (curbuf->b_help)
+                /* ":help" handles unescaped argument */
+                aux_ptr = (char_u *)"";
+            else
+                aux_ptr = (char_u *)"\\|\"\n[";
+        }
         else
             aux_ptr = (char_u *)"\\|\"\n*?[";
 
@@ -8524 +8552 @@
     else
         curwin->w_curswant = 0;
     /* keep curswant at the column where we wanted to go, not where
-       we ended; differs if line is too short */
+     * we ended; differs if line is too short */
     curwin->w_set_curswant = FALSE;
 }
 

src/ops.c

@@ -1584 +1584 @@
 adjust_clip_reg(rp)
     int         *rp;
 {
-    /* If no reg. specified, and "unnamed" is in 'clipboard', use '*' reg. */
-    if (*rp == 0 && clip_unnamed)
-        *rp = '*';
+    /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard',
+     * use '*' or '+' reg, respectively. "unnamedplus" prevails. */
+    if (*rp == 0 && clip_unnamed != 0)
+        *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available)
+                                                                  ? '+' : '*';
     if (!clip_star.available && *rp == '*')
         *rp = 0;
     if (!clip_plus.available && *rp == '+')
@@ -2842 +2844 @@
     char_u              *p;
     char_u              *pnew;
     struct block_def    bd;
+#if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+    int                 did_star = FALSE;
+#endif
 
                                     /* check for read-only register */
     if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE))
@@ -3115 +3120 @@
      */
     if (clip_star.available
             && (curr == &(y_regs[STAR_REGISTER])
-                || (!deleting && oap->regname == 0 && clip_unnamed)))
+                || (!deleting && oap->regname == 0
+                                           && (clip_unnamed & CLIP_UNNAMED))))
     {
         if (curr != &(y_regs[STAR_REGISTER]))
             /* Copy the text from register 0 to the clipboard register. */
@@ -3123 +3129 @@
 
         clip_own_selection(&clip_star);
         clip_gen_set_selection(&clip_star);
+# ifdef FEAT_X11
+        did_star = TRUE;
+# endif
     }
 
 # ifdef FEAT_X11
@@ -3130 +3139 @@
      * If we were yanking to the '+' register, send result to selection.
      * Also copy to the '*' register, in case auto-select is off.
      */
-    else if (clip_plus.available && curr == &(y_regs[PLUS_REGISTER]))
+    if (clip_plus.available
+            && (curr == &(y_regs[PLUS_REGISTER])
+                || (!deleting && oap->regname == 0
+                                      && (clip_unnamed & CLIP_UNNAMED_PLUS))))
     {
+        if (curr != &(y_regs[PLUS_REGISTER]))
+            /* Copy the text from register 0 to the clipboard register. */
+            copy_yank_reg(&(y_regs[PLUS_REGISTER]));
+
         /* No need to copy to * register upon 'unnamed' now - see below */
         clip_own_selection(&clip_plus);
         clip_gen_set_selection(&clip_plus);
-        if (!clip_isautosel())
+        if (!clip_isautosel() && !did_star)
         {
             copy_yank_reg(&(y_regs[STAR_REGISTER]));
             clip_own_selection(&clip_star);
@@ -3979 +3995 @@
     for (i = -1; i < NUM_REGISTERS && !got_int; ++i)
     {
         name = get_register_name(i);
-        if (arg != NULL && vim_strchr(arg, name) == NULL)
+        if (arg != NULL && vim_strchr(arg, name) == NULL
+#ifdef ONE_CLIPBOARD
+            /* Star register and plus register contain the same thing. */
+                && (name != '*' || vim_strchr(arg, '+') == NULL)
+#endif
+                )
             continue;       /* did not ask for this register */
 
 #ifdef FEAT_CLIPBOARD
@@ -4153 +4174 @@
     int     save_undo;
 {
     char_u      *curr = NULL;
+    char_u      *curr_start = NULL;
     char_u      *cend;
     char_u      *newp;
-    char_u      *spaces;        /* number of spaces inserte before a line */
+    char_u      *spaces;        /* number of spaces inserted before a line */
     int         endcurr1 = NUL;
     int         endcurr2 = NUL;
     int         currsize = 0;   /* size of the current line */
@@ -4181 +4203 @@
      */
     for (t = 0; t < count; ++t)
     {
-        curr = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
+        curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
         if (insert_space && t > 0)
         {
             curr = skipwhite(curr);
@@ -4265 +4287 @@
             copy_spaces(cend, (size_t)(spaces[t]));
         }
         mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t,
-                                 (long)(cend - newp + spaces[t]));
+                         (long)(cend - newp + spaces[t] - (curr - curr_start)));
         if (t == 0)
             break;
-        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 (insert_space && t > 1)
             curr = skipwhite(curr);
         currsize = (int)STRLEN(curr);

src/option.c

@@ -2740 +2740 @@
                             (char_u *)&p_wc, PV_NONE,
                             {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB}
                             SCRIPTID_INIT},
-    {"wildcharm",   "wcm",   P_NUM|P_VI_DEF,
+    {"wildcharm",   "wcm",  P_NUM|P_VI_DEF,
                             (char_u *)&p_wcm, PV_NONE,
                             {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
     {"wildignore",  "wig",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
@@ -2750 +2750 @@
                             (char_u *)NULL, PV_NONE,
 #endif
                             {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+    {"wildignorecase", "wic", P_BOOL|P_VI_DEF,
+                            (char_u *)&p_wic, PV_NONE,
+                            {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
     {"wildmenu",    "wmnu", P_BOOL|P_VI_DEF,
 #ifdef FEAT_WILDMENU
                             (char_u *)&p_wmnu, PV_NONE,
@@ -7304 +7307 @@
     static char_u *
 check_clipboard_option()
 {
-    int         new_unnamed = FALSE;
+    int         new_unnamed = 0;
     int         new_autoselect = FALSE;
     int         new_autoselectml = FALSE;
     int         new_html = FALSE;
@@ -7316 +7319 @@
     {
         if (STRNCMP(p, "unnamed", 7) == 0 && (p[7] == ',' || p[7] == NUL))
         {
-            new_unnamed = TRUE;
+            new_unnamed |= CLIP_UNNAMED;
             p += 7;
         }
+        else if (STRNCMP(p, "unnamedplus", 11) == 0
+                                            && (p[11] == ',' || p[11] == NUL))
+        {
+            new_unnamed |= CLIP_UNNAMED_PLUS;
+            p += 11;
+        }
         else if (STRNCMP(p, "autoselect", 10) == 0
                                         && (p[10] == ',' || p[10] == NUL))
         {
@@ -9756 +9765 @@
 #ifdef FEAT_SCROLLBIND
     to->wo_scb = from->wo_scb;
 #endif
+#ifdef FEAT_CURSORBIND
+    to->wo_crb = from->wo_crb;
+#endif
 #ifdef FEAT_SPELL
     to->wo_spell = from->wo_spell;
 #endif
@@ -10011 +10023 @@
             buf->b_p_smc = p_smc;
 #endif
 #ifdef FEAT_SPELL
-            buf->b_s.b_p_spc = vim_strsave(p_spf);
+            buf->b_s.b_p_spc = vim_strsave(p_spc);
             (void)compile_cap_prog(&buf->b_s);
             buf->b_s.b_p_spf = vim_strsave(p_spf);
             buf->b_s.b_p_spl = vim_strsave(p_spl);

src/option.h

@@ -872 +872 @@
 EXTERN char_u   *p_ww;          /* 'whichwrap' */
 EXTERN long     p_wc;           /* 'wildchar' */
 EXTERN long     p_wcm;          /* 'wildcharm' */
+EXTERN long     p_wic;          /* 'wildignorecase' */
 EXTERN char_u   *p_wim;         /* 'wildmode' */
 #ifdef FEAT_WILDMENU
 EXTERN int      p_wmnu;         /* 'wildmenu' */

src/os_macosx.m

@@ -15 +15 @@
     Error: MACOS 9 is no longer supported in Vim 7
 #endif
 
+/* Avoid a conflict for the definition of Boolean between Mac header files and
+ * X11 header files. */
+#define NO_X11_INCLUDES
+
 #include "vim.h"
 #import <Cocoa/Cocoa.h>
 

src/os_msdos.c

@@ -21 +21 @@
  * Some functions are also used for Win16 (MS-Windows 3.1).
  */
 
-#include "vimio.h"
 #include "vim.h"
 
 #include <conio.h>

src/os_mswin.c

@@ -22 +22 @@
 # endif
 #endif
 
-#include "vimio.h"
 #include "vim.h"
 
 #ifdef WIN16
@@ -31 +30 @@
 # include <string.h>
 #endif
 #include <sys/types.h>
-#include <errno.h>
 #include <signal.h>
 #include <limits.h>
 #include <process.h>
@@ -817 +815 @@
     BOOL fRunTimeLinkSuccess = FALSE;
 
     // Get a handle to the DLL module.
+# ifdef WIN16
     hinstLib = LoadLibrary(libname);
+# else
+    hinstLib = vimLoadLib(libname);
+# endif
 
     // If the handle is valid, try to get the function address.
     if (hinstLib != NULL)

src/os_unix.c

@@ -1123 +1123 @@
 }
 #endif
 
+# if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+static void loose_clipboard __ARGS((void));
+
+/*
+ * Called when Vim is going to sleep or execute a shell command.
+ * We can't respond to requests for the X selections.  Lose them, otherwise
+ * other applications will hang.  But first copy the text to cut buffer 0.
+ */
+    static void
+loose_clipboard()
+{
+    if (clip_star.owned || clip_plus.owned)
+    {
+        x11_export_final_selection();
+        if (clip_star.owned)
+            clip_lose_selection(&clip_star);
+        if (clip_plus.owned)
+            clip_lose_selection(&clip_plus);
+        if (x11_display != NULL)
+            XFlush(x11_display);
+    }
+}
+#endif
+
 /*
  * If the machine has job control, use it to suspend the program,
  * otherwise fake it by starting a new shell.
@@ -1137 +1161 @@
     out_flush();            /* needed to disable mouse on some systems */
 
 # if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
-    /* Since we are going to sleep, we can't respond to requests for the X
-     * selections.  Lose them, otherwise other applications will hang.  But
-     * first copy the text to cut buffer 0. */
-    if (clip_star.owned || clip_plus.owned)
-    {
-        x11_export_final_selection();
-        if (clip_star.owned)
-            clip_lose_selection(&clip_star);
-        if (clip_plus.owned)
-            clip_lose_selection(&clip_plus);
-        if (x11_display != NULL)
-            XFlush(x11_display);
-    }
+    loose_clipboard();
 # endif
 
 # if defined(_REENTRANT) && defined(SIGCONT)
@@ -1726 +1738 @@
     }
     if (x11_window == 0 || x11_display == NULL)
         return (result = FAIL);
+
+# ifdef FEAT_EVAL
+    set_vim_var_nr(VV_WINDOWID, (long)x11_window);
+# endif
+
     return (result = OK);
 }
 
@@ -3706 +3723 @@
     if (options & SHELL_COOKED)
         settmode(TMODE_COOK);       /* set to normal mode */
 
+# if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+    loose_clipboard();
+# endif
+
 # ifdef __EMX__
     if (cmd == NULL)
         x = system(""); /* this starts an interactive shell in emx */
@@ -3814 +3835 @@
 # endif
     int         did_settmode = FALSE;   /* settmode(TMODE_RAW) called */
 
+    newcmd = vim_strsave(p_sh);
+    if (newcmd == NULL)         /* out of memory */
+        goto error;
+
     out_flush();
     if (options & SHELL_COOKED)
         settmode(TMODE_COOK);           /* set to normal mode */
 
-    newcmd = vim_strsave(p_sh);
-    if (newcmd == NULL)         /* out of memory */
-        goto error;
+# if defined(FEAT_CLIPBOARD) && defined(FEAT_X11)
+    loose_clipboard();
+# endif
 
     /*
      * Do this loop twice:
@@ -4148 +4173 @@
 # ifdef FEAT_GUI
                 if (pty_master_fd >= 0)
                 {
-                    close(pty_slave_fd);        /* close slave side of pty */
                     fromshell_fd = pty_master_fd;
                     toshell_fd = dup(pty_master_fd);
                 }
@@ -4430 +4454 @@
                     ++noread_cnt;
                     while (RealWaitForChar(fromshell_fd, 10L, NULL))
                     {
-                        len = read(fromshell_fd, (char *)buffer
+                        len = read_eintr(fromshell_fd, buffer
 # ifdef FEAT_MBYTE
                                 + buffer_off, (size_t)(BUFLEN - buffer_off)
 # else
@@ -4617 +4641 @@
                     break;
             }
 
+# ifdef FEAT_GUI
+            /* Close slave side of pty.  Only do this after the child has
+             * exited, otherwise the child may hang when it tries to write on
+             * the pty. */
+            if (pty_master_fd >= 0)
+                close(pty_slave_fd);
+# endif
+
             /* Make sure the child that writes to the external program is
              * dead. */
             if (wpid > 0)

src/os_win16.c

@@ -20 +20 @@
 # pragma warn -obs
 #endif
 
-#include "vimio.h"
 #include "vim.h"
 
 #include <dos.h>
 #include <string.h>
 #include <sys/types.h>
-#include <errno.h>
 #include <signal.h>
 #include <limits.h>
 #include <process.h>

src/os_win32.c

@@ -20 +20 @@
  * Roger Knobbe <rogerk@wonderware.com> did the initial port of Vim 3.0.
  */
 
-#include "vimio.h"
 #include "vim.h"
 
 #ifdef FEAT_MZSCHEME
@@ -28 +27 @@
 #endif
 
 #include <sys/types.h>
-#include <errno.h>
 #include <signal.h>
 #include <limits.h>
 #include <process.h>
@@ -206 +204 @@
 static int suppress_winsize = 1;        /* don't fiddle with console */
 #endif
 
+static char_u *exe_path = NULL;
+
     static void
 get_exe_name(void)
 {
-    char        temp[256];
-    static int  did_set_PATH = FALSE;
+    /* Maximum length of $PATH is more than MAXPATHL.  8191 is often mentioned
+     * as the maximum length that works (plus a NUL byte). */
+#define MAX_ENV_PATH_LEN 8192
+    char        temp[MAX_ENV_PATH_LEN];
+    char_u      *p;
 
     if (exe_name == NULL)
     {
         /* store the name of the executable, may be used for $VIM */
-        GetModuleFileName(NULL, temp, 255);
+        GetModuleFileName(NULL, temp, MAX_ENV_PATH_LEN - 1);
         if (*temp != NUL)
             exe_name = FullName_save((char_u *)temp, FALSE);
     }
 
-    if (!did_set_PATH && exe_name != NULL)
+    if (exe_path == NULL && exe_name != NULL)
     {
-        char_u      *p;
-        char_u      *newpath;
-
-        /* Append our starting directory to $PATH, so that when doing "!xxd"
-         * it's found in our starting directory.  Needed because SearchPath()
-         * also looks there. */
-        p = mch_getenv("PATH");
-        newpath = alloc((unsigned)(STRLEN(p) + STRLEN(exe_name) + 2));
-        if (newpath != NULL)
-        {
-            STRCPY(newpath, p);
-            STRCAT(newpath, ";");
-            vim_strncpy(newpath + STRLEN(newpath), exe_name,
-                                            gettail_sep(exe_name) - exe_name);
-            vim_setenv((char_u *)"PATH", newpath);
-            vim_free(newpath);
+        exe_path = vim_strnsave(exe_name,
+                                     (int)(gettail_sep(exe_name) - exe_name));
+        if (exe_path != NULL)
+        {
+            /* Append our starting directory to $PATH, so that when doing
+             * "!xxd" it's found in our starting directory.  Needed because
+             * SearchPath() also looks there. */
+            p = mch_getenv("PATH");
+            if (p == NULL
+                       || STRLEN(p) + STRLEN(exe_path) + 2 < MAX_ENV_PATH_LEN)
+            {
+                if (p == NULL || *p == NUL)
+                    temp[0] = NUL;
+                else
+                {
+                    STRCPY(temp, p);
+                    STRCAT(temp, ";");
+                }
+                STRCAT(temp, exe_path);
+                vim_setenv((char_u *)"PATH", temp);
+            }
         }
+    }
+}
+
+/*
+ * Load library "name".
+ */
+    HINSTANCE
+vimLoadLib(char *name)
+{
+    HINSTANCE dll = NULL;
+    char old_dir[MAXPATHL];
 
-        did_set_PATH = TRUE;
+    if (exe_path == NULL)
+        get_exe_name();
+    if (exe_path != NULL && mch_dirname(old_dir, MAXPATHL) == OK)
+    {
+        /* Change directory to where the executable is, both to make sure we
+         * find a .dll there and to avoid looking for a .dll in the current
+         * directory. */
+        mch_chdir(exe_path);
+        dll = LoadLibrary(name);
+        mch_chdir(old_dir);
     }
+    return dll;
 }
 
 #if defined(DYNAMIC_GETTEXT) || defined(PROTO)
@@ -254 +283 @@
 static char *null_libintl_bindtextdomain(const char *, const char *);
 static char *null_libintl_bind_textdomain_codeset(const char *, const char *);
 
-static HINSTANCE hLibintlDLL = 0;
+static HINSTANCE hLibintlDLL = NULL;
 char *(*dyn_libintl_gettext)(const char *) = null_libintl_gettext;
 char *(*dyn_libintl_textdomain)(const char *) = null_libintl_textdomain;
 char *(*dyn_libintl_bindtextdomain)(const char *, const char *)
@@ -282 +311 @@
     if (hLibintlDLL)
         return 1;
     /* Load gettext library (libintl.dll) */
-    hLibintlDLL = LoadLibrary(libname != NULL ? libname : GETTEXT_DLL);
+    hLibintlDLL = vimLoadLib(libname != NULL ? libname : GETTEXT_DLL);
     if (!hLibintlDLL)
     {
-        char_u      dirname[_MAX_PATH];
-
-        /* Try using the path from gvim.exe to find the .dll there. */
-        get_exe_name();
-        STRCPY(dirname, exe_name);
-        STRCPY(gettail(dirname), GETTEXT_DLL);
-        hLibintlDLL = LoadLibrary((char *)dirname);
-        if (!hLibintlDLL)
+        if (p_verbose > 0)
         {
-            if (p_verbose > 0)
-            {
-                verbose_enter();
-                EMSG2(_(e_loadlib), GETTEXT_DLL);
-                verbose_leave();
-            }
-            return 0;
+            verbose_enter();
+            EMSG2(_(e_loadlib), GETTEXT_DLL);
+            verbose_leave();
         }
+        return 0;
     }
     for (i = 0; libintl_entry[i].name != NULL
                                          && libintl_entry[i].ptr != NULL; ++i)
@@ -430 +449 @@
              * Seems like a lot of overhead to load/unload ADVAPI32.DLL each
              * time we verify security...
              */
-            advapi_lib = LoadLibrary("ADVAPI32.DLL");
+            advapi_lib = vimLoadLib("ADVAPI32.DLL");
             if (advapi_lib != NULL)
             {
                 pSetNamedSecurityInfo = (PSNSECINFO)GetProcAddress(advapi_lib,
@@ -1615 +1634 @@
     return TRUE;
 }
 
+#if ((defined(__MINGW32__) || defined (__CYGWIN32__)) && \
+        __MSVCRT_VERSION__ >= 0x800) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+/*
+ * Bad parameter handler.
+ *
+ * Certain MS CRT functions will intentionally crash when passed invalid
+ * parameters to highlight possible security holes.  Setting this function as
+ * the bad parameter handler will prevent the crash.
+ *
+ * In debug builds the parameters contain CRT information that might help track
+ * down the source of a problem, but in non-debug builds the arguments are all
+ * NULL/0.  Debug builds will also produce assert dialogs from the CRT, it is
+ * worth allowing these to make debugging of issues easier.
+ */
+    static void
+bad_param_handler(const wchar_t *expression,
+    const wchar_t *function,
+    const wchar_t *file,
+    unsigned int line,
+    uintptr_t pReserved)
+{
+}
+
+# define SET_INVALID_PARAM_HANDLER \
+        ((void)_set_invalid_parameter_handler(bad_param_handler))
+#else
+# define SET_INVALID_PARAM_HANDLER
+#endif
+
 #ifdef FEAT_GUI_W32
 
 /*
@@ -1627 +1675 @@
     extern int _fmode;
 #endif
 
+    /* Silently handle invalid parameters to CRT functions */
+    SET_INVALID_PARAM_HANDLER;
+
     /* Let critical errors result in a failure, not in a dialog box.  Required
      * for the timestamp test to work on removed floppies. */
     SetErrorMode(SEM_FAILCRITICALERRORS);
@@ -2103 +2154 @@
     extern int _fmode;
 #endif
 
+    /* Silently handle invalid parameters to CRT functions */
+    SET_INVALID_PARAM_HANDLER;
+
     /* Let critical errors result in a failure, not in a dialog box.  Required
      * for the timestamp test to work on removed floppies. */
     SetErrorMode(SEM_FAILCRITICALERRORS);
@@ -2273 +2327 @@
     int         len)
 {
     char                szTrueName[_MAX_PATH + 2];
+    char                szTrueNameTemp[_MAX_PATH + 2];
     char                *ptrue, *ptruePrev;
     char                *porig, *porigPrev;
     int                 flen;
     WIN32_FIND_DATA     fb;
     HANDLE              hFind;
     int                 c;
+    int                 slen;
 
     flen = (int)STRLEN(name);
     if (flen == 0 || flen > _MAX_PATH)
@@ -2323 +2379 @@
         }
         *ptrue = NUL;
 
+        /* To avoid a slow failure append "\*" when searching a directory,
+         * server or network share. */
+        STRCPY(szTrueNameTemp, szTrueName);
+        slen = (int)strlen(szTrueNameTemp);
+        if (*porig == psepc && slen + 2 < _MAX_PATH)
+            STRCPY(szTrueNameTemp + slen, "\\*");
+
         /* Skip "", "." and "..". */
         if (ptrue > ptruePrev
                 && (ptruePrev[0] != '.'
                     || (ptruePrev[1] != NUL
                         && (ptruePrev[1] != '.' || ptruePrev[2] != NUL)))
-                && (hFind = FindFirstFile(szTrueName, &fb))
+                && (hFind = FindFirstFile(szTrueNameTemp, &fb))
                                                       != INVALID_HANDLE_VALUE)
         {
             c = *porig;
@@ -3120 +3183 @@
      * It's nicer to run a filter command in a minimized window, but in
      * Windows 95 this makes the command MUCH slower.  We can't do it under
      * Win32s either as it stops the synchronous spawn workaround working.
+     * Don't activate the window to keep focus on Vim.
      */
     if ((options & SHELL_DOOUT) && !mch_windows95() && !gui_is_win32s())
-        si.wShowWindow = SW_SHOWMINIMIZED;
+        si.wShowWindow = SW_SHOWMINNOACTIVE;
     else
         si.wShowWindow = SW_SHOWNORMAL;
     si.cbReserved2 = 0;

src/popupmnu.c

@@ -558 +558 @@
             win_T       *curwin_save = curwin;
             int         res = OK;
 
-            /* Open a preview window.  3 lines by default. */
+            /* Open a preview window.  3 lines by default.  Prefer
+             * 'previewheight' if set and smaller. */
             g_do_tagpreview = 3;
+            if (p_pvh > 0 && p_pvh < g_do_tagpreview)
+                g_do_tagpreview = p_pvh;
             resized = prepare_tagpreview(FALSE);
             g_do_tagpreview = 0;
 

src/proto/fileio.pro

@@ -54 +54 @@
 int match_file_pat __ARGS((char_u *pattern, regprog_T *prog, char_u *fname, char_u *sfname, char_u *tail, int allow_dirs));
 int match_file_list __ARGS((char_u *list, char_u *sfname, char_u *ffname));
 char_u *file_pat_to_reg_pat __ARGS((char_u *pat, char_u *pat_end, char *allow_dirs, int no_bslash));
+long read_eintr __ARGS((int fd, void *buf, size_t bufsize));
+long write_eintr __ARGS((int fd, void *buf, size_t bufsize));
 /* vim: set ft=c : */