To: vim_dev@googlegroups.com

Subject: Patch 7.3.925

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.925

Problem:    Typos in source files.

Solution:   Fix the typos. (Ken Takata)

Files:	    runtime/plugin/matchparen.vim, runtime/tools/vim_vs_net.cmd,

	    src/GvimExt/gvimext.cpp, src/INSTALLvms.txt, src/Make_cyg.mak,

	    src/Make_mvc.mak, src/Make_sas.mak, src/Make_vms.mms,

	    src/Make_w16.mak, src/Makefile, src/VisVim/OleAut.cpp,

	    src/VisVim/README_VisVim.txt, src/auto/configure, src/buffer.c,

	    src/configure.in, src/diff.c, src/dosinst.c, src/edit.c,

	    src/eval.c, src/ex_cmds2.c, src/ex_docmd.c, src/ex_eval.c,

	    src/farsi.c, src/feature.h, src/fileio.c, src/glbl_ime.cpp,

	    src/gui.c, src/gui_athena.c, src/gui_beval.c, src/gui_gtk_x11.c,

	    src/gui_mac.c, src/gui_motif.c, src/gui_photon.c, src/gui_w16.c,

	    src/gui_w32.c, src/gui_w48.c, src/gui_xmebw.c, src/gui_xmebwp.h,

	    src/hardcopy.c, src/if_cscope.c, src/if_mzsch.c, src/if_ole.cpp,

	    src/if_perl.xs, src/if_py_both.h, src/if_python.c,

	    src/if_python3.c, src/if_ruby.c, src/main.aap, src/mbyte.c,

	    src/memfile.c, src/memline.c, src/misc1.c, src/misc2.c,

	    src/nbdebug.c, src/normal.c, src/ops.c, src/os_amiga.c,

	    src/os_mac.h, src/os_msdos.c, src/os_mswin.c, src/os_win16.h,

	    src/os_win32.c, src/os_win32.h, src/quickfix.c, src/screen.c,

	    src/search.c, src/spell.c, src/structs.h, src/syntax.c,

	    src/window.c, vimtutor.com

*** ../vim-7.3.924/runtime/plugin/matchparen.vim	2013-03-19 13:33:18.000000000 +0100

--- runtime/plugin/matchparen.vim	2013-05-06 04:06:04.000000000 +0200

***************

*** 5,11 ****

  " Exit quickly when:

  " - this plugin was already loaded (or disabled)

  " - when 'compatible' is set

! " - the "CursorMoved" autocmd event is not availble.

  if exists("g:loaded_matchparen") || &cp || !exists("##CursorMoved")

    finish

  endif

--- 5,11 ----

  " Exit quickly when:

  " - this plugin was already loaded (or disabled)

  " - when 'compatible' is set

! " - the "CursorMoved" autocmd event is not available.

  if exists("g:loaded_matchparen") || &cp || !exists("##CursorMoved")

    finish

  endif

*** ../vim-7.3.924/runtime/tools/vim_vs_net.cmd	2010-08-15 21:57:12.000000000 +0200

--- runtime/tools/vim_vs_net.cmd	2013-05-06 04:06:04.000000000 +0200

***************

*** 7,18 ****

  @rem      Arguments - +$(CurLine) $(ItemPath)

  @rem      Init Dir  - Empty

  @rem

! @rem Coutesy of Brian Sturk

  @rem

  @rem --remote-silent +%1 is a command +954, move ahead 954 lines

  @rem --remote-silent %2 full path to file

  @rem In Vim

! @rem    :h --remote-silent for mor details

  @rem

  @rem --servername VS_NET

  @rem This will create a new instance of vim called VS_NET.  So if you

--- 7,18 ----

  @rem      Arguments - +$(CurLine) $(ItemPath)

  @rem      Init Dir  - Empty

  @rem

! @rem Courtesy of Brian Sturk

  @rem

  @rem --remote-silent +%1 is a command +954, move ahead 954 lines

  @rem --remote-silent %2 full path to file

  @rem In Vim

! @rem    :h --remote-silent for more details

  @rem

  @rem --servername VS_NET

  @rem This will create a new instance of vim called VS_NET.  So if you

*** ../vim-7.3.924/src/GvimExt/gvimext.cpp	2011-08-10 16:31:18.000000000 +0200

--- src/GvimExt/gvimext.cpp	2013-05-06 04:06:04.000000000 +0200

***************

*** 527,533 ****

  //

  //  PARAMETERS:

  //    pIDFolder - Specifies the parent folder

! //    pDataObj  - Spefifies the set of items selected in that folder.

  //    hRegKey   - Specifies the type of the focused item in the selection.

  //

  //  RETURN VALUE:

--- 527,533 ----

  //

  //  PARAMETERS:

  //    pIDFolder - Specifies the parent folder

! //    pDataObj  - Specifies the set of items selected in that folder.

  //    hRegKey   - Specifies the type of the focused item in the selection.

  //

  //  RETURN VALUE:

*** ../vim-7.3.924/src/INSTALLvms.txt	2010-08-15 21:57:25.000000000 +0200

--- src/INSTALLvms.txt	2013-05-06 04:06:04.000000000 +0200

***************

*** 330,336 ****

       Also VMS_JACKETS.EXE from OpenVMS Porting Library.

       Please note, that GTK uses /name=(as_is,short)/float=ieee/ieee=denorm

!      complier directives that is not compatible with "standard" VMS usage,

       therefore other external features might fail as PERL, PYTHON and TCL

       support.

--- 330,336 ----

       Also VMS_JACKETS.EXE from OpenVMS Porting Library.

       Please note, that GTK uses /name=(as_is,short)/float=ieee/ieee=denorm

!      compiler directives that is not compatible with "standard" VMS usage,

       therefore other external features might fail as PERL, PYTHON and TCL

       support.

*** ../vim-7.3.924/src/Make_cyg.mak	2013-03-07 15:16:16.000000000 +0100

--- src/Make_cyg.mak	2013-05-06 04:06:04.000000000 +0200

***************

*** 1,6 ****

  #

  # Makefile for VIM on Win32, using Cygnus gcc

! # Last updated by Dan Sharp.  Last Change: 2013 Feb 17

  #

  # Also read INSTALLpc.txt!

  #

--- 1,6 ----

  #

  # Makefile for VIM on Win32, using Cygnus gcc

! # Last updated by Dan Sharp.  Last Change: 2013 Apr 22

  #

  # Also read INSTALLpc.txt!

  #

***************

*** 48,54 ****

  # USEDLL	no or yes: set to yes to use the Runtime library DLL (no)

  #		For USEDLL=yes the cygwin1.dll is required to run Vim.

  #		For "no" the mingw-gcc-g++ package or the mingw64-i686-gcc-g++

! #		package is required to complie Vim.  Or set CC to gcc-3 and add

  #		-L/lib/w32api to EXTRA_LIBS.

  # POSTSCRIPT	no or yes: set to yes for PostScript printing (no)

  # FEATURES	TINY, SMALL, NORMAL, BIG or HUGE (BIG)

--- 48,54 ----

  # USEDLL	no or yes: set to yes to use the Runtime library DLL (no)

  #		For USEDLL=yes the cygwin1.dll is required to run Vim.

  #		For "no" the mingw-gcc-g++ package or the mingw64-i686-gcc-g++

! #		package is required to compile Vim.  Or set CC to gcc-3 and add

  #		-L/lib/w32api to EXTRA_LIBS.

  # POSTSCRIPT	no or yes: set to yes for PostScript printing (no)

  # FEATURES	TINY, SMALL, NORMAL, BIG or HUGE (BIG)

*** ../vim-7.3.924/src/Make_mvc.mak	2013-02-26 14:56:24.000000000 +0100

--- src/Make_mvc.mak	2013-05-06 04:06:04.000000000 +0200

***************

*** 418,424 ****

  !endif

  !endif

! # Abort bulding VIM if version of VC is unrecognised.

  !ifndef MSVCVER

  !message *** ERROR

  !message Cannot determine Visual C version being used.  If you are using the

--- 418,424 ----

  !endif

  !endif

! # Abort building VIM if version of VC is unrecognised.

  !ifndef MSVCVER

  !message *** ERROR

  !message Cannot determine Visual C version being used.  If you are using the

*** ../vim-7.3.924/src/Make_sas.mak	2010-08-15 21:57:27.000000000 +0200

--- src/Make_sas.mak	2013-05-06 04:06:04.000000000 +0200

***************

*** 251,257 ****

  # generate GlobalSymbolTable, which speeds up the compile time.

  #

! # A preprocessing stage is used to work arounda bug in the GST generator, in

  # that it does not handle nested makefiles properly in this stage.

  # Ignore error message for not producing any code (105).

  $(GST): scoptions vim.h keymap.h macros.h ascii.h term.h structs.h

--- 251,257 ----

  # generate GlobalSymbolTable, which speeds up the compile time.

  #

! # A preprocessing stage is used to work around a bug in the GST generator, in

  # that it does not handle nested makefiles properly in this stage.

  # Ignore error message for not producing any code (105).

  $(GST): scoptions vim.h keymap.h macros.h ascii.h term.h structs.h

***************

*** 283,289 ****

  .c.pro:

  	$(CC) $(CFLAGS) GPFILE=proto/$*.pro $(PROPT) $*.c

! # dependancies

  blowfish.o:		blowfish.c

  proto/blowfish.pro:	blowfish.c

  buffer.o:		buffer.c

--- 283,289 ----

  .c.pro:

  	$(CC) $(CFLAGS) GPFILE=proto/$*.pro $(PROPT) $*.c

! # dependencies

  blowfish.o:		blowfish.c

  proto/blowfish.pro:	blowfish.c

  buffer.o:		buffer.c

*** ../vim-7.3.924/src/Make_vms.mms	2010-08-15 21:57:32.000000000 +0200

--- src/Make_vms.mms	2013-05-06 04:06:04.000000000 +0200

***************

*** 34,40 ****

  # SMALL  - Few features enabled, as basic as possible

  # NORMAL - A default selection of features enabled

  # BIG    - Many features enabled, as rich as possible. (default)

! # HUGE   - All possible featues enabled.

  # Please select one of these alternatives above.

  MODEL = HUGE

--- 34,40 ----

  # SMALL  - Few features enabled, as basic as possible

  # NORMAL - A default selection of features enabled

  # BIG    - Many features enabled, as rich as possible. (default)

! # HUGE   - All possible features enabled.

  # Please select one of these alternatives above.

  MODEL = HUGE

***************

*** 55,61 ****

  # Comment out if you want the compiler version with :ver command.

  # NOTE: This part can make some complications if you're using some

  # predefined symbols/flags for your compiler. If does, just leave behind

! # the comment varialbe CCVER.

  CCVER = YES

  # Uncomment if want a debug version. Resulting executable is DVIM.EXE

--- 55,61 ----

  # Comment out if you want the compiler version with :ver command.

  # NOTE: This part can make some complications if you're using some

  # predefined symbols/flags for your compiler. If does, just leave behind

! # the comment variable CCVER.

  CCVER = YES

  # Uncomment if want a debug version. Resulting executable is DVIM.EXE

*** ../vim-7.3.924/src/Make_w16.mak	2013-02-26 14:56:24.000000000 +0100

--- src/Make_w16.mak	2013-05-06 04:06:04.000000000 +0200

***************

*** 4,10 ****

  # *************************************************************

  # * WARNING!

  # * This was originally produced by the IDE, but has since been

! # * modifed to make it work properly. Adjust with care!

  # * In particular, leave LinkerLocalOptsAtW16_gvim16dexe alone

  # * unless you are a guru.

  # *************************************************************

--- 4,10 ----

  # *************************************************************

  # * WARNING!

  # * This was originally produced by the IDE, but has since been

! # * modified to make it work properly. Adjust with care!

  # * In particular, leave LinkerLocalOptsAtW16_gvim16dexe alone

  # * unless you are a guru.

  # *************************************************************

*** ../vim-7.3.924/src/Makefile	2013-02-26 14:56:24.000000000 +0100

--- src/Makefile	2013-05-06 04:06:04.000000000 +0200

***************

*** 200,206 ****

  #Solaris 2.5 (sun4m)  cc (SC4.0)     +X11R6 +GUI (CDE)	4.6b (E) Andrew Large

  #Solaris 2.5	      cc	     +X11 +GUI Athena	4.2  (9) Sonia Heimann

  #Solaris 2.5	      gcc 2.5.6      +X11 Motif		5.0m (R) Ant. Colombo

! #Solaris 2.6	      gcc 2.8.1      ncursus		5.3  (G) Larry W. Virden

  #Solaris with -lthread					5.5  (W) K. Nagano

  #Solaris	      gcc				     (b) Riccardo

  #SunOS 4.1.x			     +X11 -GUI		5.1b (J) Bram Moolenaar

--- 200,206 ----

  #Solaris 2.5 (sun4m)  cc (SC4.0)     +X11R6 +GUI (CDE)	4.6b (E) Andrew Large

  #Solaris 2.5	      cc	     +X11 +GUI Athena	4.2  (9) Sonia Heimann

  #Solaris 2.5	      gcc 2.5.6      +X11 Motif		5.0m (R) Ant. Colombo

! #Solaris 2.6	      gcc 2.8.1      ncurses		5.3  (G) Larry W. Virden

  #Solaris with -lthread					5.5  (W) K. Nagano

  #Solaris	      gcc				     (b) Riccardo

  #SunOS 4.1.x			     +X11 -GUI		5.1b (J) Bram Moolenaar

***************

*** 231,238 ****

  # (D)  Uncomment lines below for QNX

  # (E)  You might want to use termlib instead of termcap, see below.

  # (F)  See below for instructions.

! # (G)  Using ncursus version 4.2 has reported to cause a crash.  Use the

! #      Sun cursus library instead.

  # (H)  See line for EXTRA_LIBS below.

  # (I)  SINIX-N 5.42 and 5.43 need some EXTRA_LIBS.  Also for Reliant-Unix.

  # (J)  If you get undefined symbols, see below for a solution.

--- 231,238 ----

  # (D)  Uncomment lines below for QNX

  # (E)  You might want to use termlib instead of termcap, see below.

  # (F)  See below for instructions.

! # (G)  Using ncurses version 4.2 has reported to cause a crash.  Use the

! #      Sun curses library instead.

  # (H)  See line for EXTRA_LIBS below.

  # (I)  SINIX-N 5.42 and 5.43 need some EXTRA_LIBS.  Also for Reliant-Unix.

  # (J)  If you get undefined symbols, see below for a solution.

***************

*** 402,408 ****

  # to the command line.	If you see strange flags during compilation, check in

  # auto/config.mk where they come from.  If it's PERL_CFLAGS, try commenting

  # the next line.

! # When you get an error for a missing "perl.exp" file, try creating an emtpy

  # one: "touch perl.exp".

  # This requires at least "small" features, "tiny" doesn't work.

  #CONF_OPT_PERL = --enable-perlinterp

--- 402,408 ----

  # to the command line.	If you see strange flags during compilation, check in

  # auto/config.mk where they come from.  If it's PERL_CFLAGS, try commenting

  # the next line.

! # When you get an error for a missing "perl.exp" file, try creating an empty

  # one: "touch perl.exp".

  # This requires at least "small" features, "tiny" doesn't work.

  #CONF_OPT_PERL = --enable-perlinterp

***************

*** 601,607 ****

  # Might not work with GUI or Perl.

  # For unknown reasons adding "-lc" fixes a linking problem with some versions

  # of GCC.  That's probably a bug in the "-pg" implementation.

! # After running Vim see the profile result with: gmon vim gmon.out | vim -

  # Need to recompile everything after changing this: "make clean" "make".

  #PROFILE_CFLAGS = -pg -g -DWE_ARE_PROFILING

  #PROFILE_LIBS = -pg

--- 601,607 ----

  # Might not work with GUI or Perl.

  # For unknown reasons adding "-lc" fixes a linking problem with some versions

  # of GCC.  That's probably a bug in the "-pg" implementation.

! # After running Vim see the profile result with: gprof vim gmon.out | vim -

  # Need to recompile everything after changing this: "make clean" "make".

  #PROFILE_CFLAGS = -pg -g -DWE_ARE_PROFILING

  #PROFILE_LIBS = -pg

***************

*** 1294,1300 ****

  ### prototype headers are ignored due to -DPROTO, system

  ### headers #include <...> are ignored if we use the -MM option, as

  ### e.g. provided by gcc-cpp.

! ### Include FEAT_GUI to get gependency on gui.h

  ### Need to change "-I /<path>" to "-isystem /<path>" for GCC 3.x.

  CPP_DEPEND = $(CC) -I$(srcdir) -M$(CPP_MM) \

  		`echo "$(DEPEND_CFLAGS)" $(DEPEND_CFLAGS_FILTER)`

--- 1294,1300 ----

  ### prototype headers are ignored due to -DPROTO, system

  ### headers #include <...> are ignored if we use the -MM option, as

  ### e.g. provided by gcc-cpp.

! ### Include FEAT_GUI to get dependency on gui.h

  ### Need to change "-I /<path>" to "-isystem /<path>" for GCC 3.x.

  CPP_DEPEND = $(CC) -I$(srcdir) -M$(CPP_MM) \

  		`echo "$(DEPEND_CFLAGS)" $(DEPEND_CFLAGS_FILTER)`

***************

*** 1717,1723 ****

  # Link the target for normal use or debugging.

! # A shell script is used to try linking without unneccesary libraries.

  $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h

  	$(CCC) version.c -o objects/version.o

  	@LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \

--- 1717,1723 ----

  # Link the target for normal use or debugging.

! # A shell script is used to try linking without unnecessary libraries.

  $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h

  	$(CCC) version.c -o objects/version.o

  	@LINK="$(PURIFY) $(SHRPENV) $(CClink) $(ALL_LIB_DIRS) $(LDFLAGS) \

***************

*** 1837,1844 ****

  #

  # This will produce a lot of garbage on your screen, including a few error

  # messages.  Don't worry about that.

! # If there is a real error, there will be a difference between "test.out" and

! # a "test99.ok" file.

  # If everything is alright, the final message will be "ALL DONE".  If not you

  # get "TEST FAILURE".

  #

--- 1837,1844 ----

  #

  # This will produce a lot of garbage on your screen, including a few error

  # messages.  Don't worry about that.

! # If there is a real error, there will be a difference between "testXX.out" and

! # a "testXX.ok" file.

  # If everything is alright, the final message will be "ALL DONE".  If not you

  # get "TEST FAILURE".

  #

***************

*** 2779,2787 ****

  	mv gui_mac.rsrc.rsrcfork $(RESDIR)/$(VIMNAME).rsrc

  # po/Make_osx.pl says something about generating a Mac message file

! # for Ukrananian.  Would somebody using Mac OS X in Ukranian

  # *really* be upset that Carbon Vim was not localised in

! # Ukranian?

  #

  #bundle-language: bundle-dir po/Make_osx.pl

  #	cd po && perl Make_osx.pl --outdir ../$(RESDIR) $(MULTILANG)

--- 2779,2787 ----

  	mv gui_mac.rsrc.rsrcfork $(RESDIR)/$(VIMNAME).rsrc

  # po/Make_osx.pl says something about generating a Mac message file

! # for Ukrainian.  Would somebody using Mac OS X in Ukrainian

  # *really* be upset that Carbon Vim was not localised in

! # Ukrainian?

  #

  #bundle-language: bundle-dir po/Make_osx.pl

  #	cd po && perl Make_osx.pl --outdir ../$(RESDIR) $(MULTILANG)

*** ../vim-7.3.924/src/VisVim/OleAut.cpp	2010-08-15 21:57:27.000000000 +0200

--- src/VisVim/OleAut.cpp	2013-05-06 04:04:07.000000000 +0200

***************

*** 654,660 ****

  	}

  	char Buf[256];

! 	sprintf (Buf, "An OLE error occured:\r\nCode = %s\r\nResult = %lx.",

  		 (char*) ErrName, m_hResult);

  	MessageBox (NULL, Buf, "OLE Error", MB_OK);

  }

--- 654,660 ----

  	}

  	char Buf[256];

! 	sprintf (Buf, "An OLE error occurred:\r\nCode = %s\r\nResult = %lx.",

  		 (char*) ErrName, m_hResult);

  	MessageBox (NULL, Buf, "OLE Error", MB_OK);

  }

*** ../vim-7.3.924/src/VisVim/README_VisVim.txt	2010-08-15 21:57:27.000000000 +0200

--- src/VisVim/README_VisVim.txt	2013-05-06 04:06:04.000000000 +0200

***************

*** 17,28 ****

  VisVim is based upon VisEmacs by Christopher Payne

  (Copyright (C) Christopher Payne 1997).

! Author: Heiko Erhardt <Heiko.Erhardt@munich.netsurf.de>

  Based upon: VisEmacs by Christopher Payne <payneca@sagian.com>

  Version: 1.0

  Created: 23 Oct 1997

  Date: 23 Oct 1997

  VisVim is free software; you can redistribute it and/or modify

  it under the terms of the GNU General Public License as published by

  the Free Software Foundation; either version 2, or (at your option)

--- 17,32 ----

  VisVim is based upon VisEmacs by Christopher Payne

  (Copyright (C) Christopher Payne 1997).

! Author: Heiko Erhardt <heiko.erhardt@gmx.net>

  Based upon: VisEmacs by Christopher Payne <payneca@sagian.com>

  Version: 1.0

  Created: 23 Oct 1997

  Date: 23 Oct 1997

+ VisVim was originally GNU GPL licensed, as stated below.  On March 21 2012

+ Heiko Erhardt declared this work to be relicensed under the Vim license, as

+ stated in ../../runtime/doc/uganda.txt (or ":help uganda" in Vim).

+ 

  VisVim is free software; you can redistribute it and/or modify

  it under the terms of the GNU General Public License as published by

  the Free Software Foundation; either version 2, or (at your option)

***************

*** 216,222 ****

  		 2. Close Visual Studio.

  		 3. Delete VisVim.dll or move it somewhere it can't be found.

  		 4. Run Visual Studio.

! 		 5. Tools -> Cursomize ->Add-ins and Macro-Files.

  		 6. A message appears:

  		    ".../VisVim.dll" "This add-in no longer exists.  It will

  		    no longer be displayed."

--- 220,226 ----

  		 2. Close Visual Studio.

  		 3. Delete VisVim.dll or move it somewhere it can't be found.

  		 4. Run Visual Studio.

! 		 5. Tools -> Customize ->Add-ins and Macro-Files.

  		 6. A message appears:

  		    ".../VisVim.dll" "This add-in no longer exists.  It will

  		    no longer be displayed."

***************

*** 294,300 ****

  P8  Execute :tag command in Vim for word under cursor in DevStudio

  P7  Controlling the Visual Studio Debugger from inside Vim

!     See message above. Also a 'Debug' highligh group and a

      command to highlight a certain line would be necessary.

  P6  Provide an option to open the current file in VisVim in

--- 298,304 ----

  P8  Execute :tag command in Vim for word under cursor in DevStudio

  P7  Controlling the Visual Studio Debugger from inside Vim

!     See message above. Also a 'Debug' highlight group and a

      command to highlight a certain line would be necessary.

  P6  Provide an option to open the current file in VisVim in

***************

*** 318,322 ****

  Have fun!

  Heiko Erhardt

! Heiko.Erhardt@munich.netsurf.de

--- 322,326 ----

  Have fun!

  Heiko Erhardt

! heiko.erhardt@gmx.net

*** ../vim-7.3.924/src/auto/configure	2013-05-04 04:40:06.000000000 +0200

--- src/auto/configure	2013-05-06 04:06:04.000000000 +0200

***************

*** 5831,5837 ****

      /* 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, char *prefix)

--- 5831,5837 ----

      /* 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 python version used will be switched on.

       */

      int no_rtl_global_needed_for(char *python_instsoname, char *prefix)

***************

*** 5897,5903 ****

      /* 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)

--- 5897,5903 ----

      /* 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 python version used will be switched on.

       */

      int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)

***************

*** 10593,10599 ****

  _ACEOF

    if test "x$vim_cv_tty_mode" = "x" ; then

!     as_fn_error "It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (propably 0620)" "$LINENO" 5

    else

      $as_echo "#define PTYMODE 0620" >>confdefs.h

--- 10593,10599 ----

  _ACEOF

    if test "x$vim_cv_tty_mode" = "x" ; then

!     as_fn_error "It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (probably 0620)" "$LINENO" 5

    else

      $as_echo "#define PTYMODE 0620" >>confdefs.h

*** ../vim-7.3.924/src/buffer.c	2013-04-24 16:52:28.000000000 +0200

--- src/buffer.c	2013-05-06 04:06:04.000000000 +0200

***************

*** 2005,2011 ****

  	 * "buf" if one exists */

  	if (swb_flags & SWB_USEOPEN)

  	    wp = buf_jump_open_win(buf);

! 	/* If 'switchbuf' contians "usetab": jump to first window in any tab

  	 * page containing "buf" if one exists */

  	if (wp == NULL && (swb_flags & SWB_USETAB))

  	    wp = buf_jump_open_tab(buf);

--- 2005,2011 ----

  	 * "buf" if one exists */

  	if (swb_flags & SWB_USEOPEN)

  	    wp = buf_jump_open_win(buf);

! 	/* If 'switchbuf' contains "usetab": jump to first window in any tab

  	 * page containing "buf" if one exists */

  	if (wp == NULL && (swb_flags & SWB_USETAB))

  	    wp = buf_jump_open_tab(buf);

*** ../vim-7.3.924/src/configure.in	2013-05-04 04:40:06.000000000 +0200

--- src/configure.in	2013-05-06 04:06:04.000000000 +0200

***************

*** 306,312 ****

  AC_SUBST(line_break)

  if test "$cf_cv_ebcdic" = "yes"; then

! dnl If we have EBCDIC we most likley have z/OS Unix, let's test it!

  AC_MSG_CHECKING(for z/OS Unix)

  case `uname` in

      OS/390)	zOSUnix="yes";

--- 306,312 ----

  AC_SUBST(line_break)

  if test "$cf_cv_ebcdic" = "yes"; then

! dnl If we have EBCDIC we most likely have z/OS Unix, let's test it!

  AC_MSG_CHECKING(for z/OS Unix)

  case `uname` in

      OS/390)	zOSUnix="yes";

***************

*** 1228,1234 ****

      /* 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, char *prefix)

--- 1228,1234 ----

      /* 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 python version used will be switched on.

       */

      int no_rtl_global_needed_for(char *python_instsoname, char *prefix)

***************

*** 1274,1280 ****

      /* 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)

--- 1274,1280 ----

      /* 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 python version used will be switched on.

       */

      int no_rtl_global_needed_for(char *python_instsoname, wchar_t *prefix)

***************

*** 3002,3008 ****

  if test "x$vim_cv_tty_group" != "xworld" ; then

    AC_DEFINE_UNQUOTED(PTYGROUP,$vim_cv_tty_group)

    if test "x$vim_cv_tty_mode" = "x" ; then

!     AC_MSG_ERROR([It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (propably 0620)])

    else

      AC_DEFINE(PTYMODE, 0620)

    fi

--- 3002,3008 ----

  if test "x$vim_cv_tty_group" != "xworld" ; then

    AC_DEFINE_UNQUOTED(PTYGROUP,$vim_cv_tty_group)

    if test "x$vim_cv_tty_mode" = "x" ; then

!     AC_MSG_ERROR([It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (probably 0620)])

    else

      AC_DEFINE(PTYMODE, 0620)

    fi

*** ../vim-7.3.924/src/diff.c	2013-03-19 14:25:50.000000000 +0100

--- src/diff.c	2013-05-06 04:06:04.000000000 +0200

***************

*** 1110,1116 ****

  }

  /*

!  * Set options to show difs for the current window.

   */

      void

  ex_diffthis(eap)

--- 1110,1116 ----

  }

  /*

!  * Set options to show diffs for the current window.

   */

      void

  ex_diffthis(eap)

*** ../vim-7.3.924/src/dosinst.c	2013-02-13 14:36:39.000000000 +0100

--- src/dosinst.c	2013-05-06 04:06:04.000000000 +0200

***************

*** 1609,1615 ****

  /*

   * Only add the choice for the open-with menu entry when gvim.exe was found

!  * and and regedit.exe exist.

   */

      static void

  init_openwith_choice(void)

--- 1609,1615 ----

  /*

   * Only add the choice for the open-with menu entry when gvim.exe was found

!  * and regedit.exe exist.

   */

      static void

  init_openwith_choice(void)

*** ../vim-7.3.924/src/edit.c	2013-03-19 16:46:59.000000000 +0100

--- src/edit.c	2013-05-06 04:06:04.000000000 +0200

***************

*** 1418,1424 ****

  normalchar:

  	    /*

! 	     * Insert a nomal character.

  	     */

  #ifdef FEAT_AUTOCMD

  	    if (!p_paste)

--- 1418,1424 ----

  normalchar:

  	    /*

! 	     * Insert a normal character.

  	     */

  #ifdef FEAT_AUTOCMD

  	    if (!p_paste)

***************

*** 7162,7168 ****

  	    /*

  	     * Count each sequence of folded lines as one logical line.

  	     */

! 	    /* go to the the start of the current fold */

  	    (void)hasFolding(lnum, &lnum, NULL);

  	    while (n--)

--- 7162,7168 ----

  	    /*

  	     * Count each sequence of folded lines as one logical line.

  	     */

! 	    /* go to the start of the current fold */

  	    (void)hasFolding(lnum, &lnum, NULL);

  	    while (n--)

***************

*** 7213,7219 ****

  	(void)hasFolding(lnum, NULL, &lnum);

  #endif

  	/* This fails if the cursor is already in the last line or would move

! 	 * beyound the last line and '-' is in 'cpoptions' */

  	if (lnum >= curbuf->b_ml.ml_line_count

  		|| (lnum + n > curbuf->b_ml.ml_line_count

  		    && vim_strchr(p_cpo, CPO_MINUS) != NULL))

--- 7213,7219 ----

  	(void)hasFolding(lnum, NULL, &lnum);

  #endif

  	/* This fails if the cursor is already in the last line or would move

! 	 * beyond the last line and '-' is in 'cpoptions' */

  	if (lnum >= curbuf->b_ml.ml_line_count

  		|| (lnum + n > curbuf->b_ml.ml_line_count

  		    && vim_strchr(p_cpo, CPO_MINUS) != NULL))

***************

*** 7715,7721 ****

  /*

   * return TRUE if 'cinkeys' contains the key "keytyped",

   * when == '*':	    Only if key is preceded with '*'	(indent before insert)

!  * when == '!':	    Only if key is prededed with '!'	(don't insert)

   * when == ' ':	    Only if key is not preceded with '*'(indent afterwards)

   *

   * "keytyped" can have a few special values:

--- 7715,7721 ----

  /*

   * return TRUE if 'cinkeys' contains the key "keytyped",

   * when == '*':	    Only if key is preceded with '*'	(indent before insert)

!  * when == '!':	    Only if key is preceded with '!'	(don't insert)

   * when == ' ':	    Only if key is not preceded with '*'(indent afterwards)

   *

   * "keytyped" can have a few special values:

***************

*** 8541,8547 ****

  #endif

  /*

!  * <Insert> key in Insert mode: toggle insert/remplace mode.

   */

      static void

  ins_insert(replaceState)

--- 8541,8547 ----

  #endif

  /*

!  * <Insert> key in Insert mode: toggle insert/replace mode.

   */

      static void

  ins_insert(replaceState)

*** ../vim-7.3.924/src/eval.c	2013-05-06 03:52:44.000000000 +0200

--- src/eval.c	2013-05-06 04:07:45.000000000 +0200

***************

*** 16669,16675 ****

      tabpage_T	*save_curtab;

  {

  #ifdef FEAT_WINDOWS

!     /* Restore current tabpage and window, if still valid (autocomands can

       * make them invalid). */

      if (valid_tabpage(save_curtab))

  	goto_tabpage_tp(save_curtab, TRUE);

--- 16669,16675 ----

      tabpage_T	*save_curtab;

  {

  #ifdef FEAT_WINDOWS

!     /* Restore current tabpage and window, if still valid (autocommands can

       * make them invalid). */

      if (valid_tabpage(save_curtab))

  	goto_tabpage_tp(save_curtab, TRUE);

*** ../vim-7.3.924/src/ex_cmds2.c	2013-03-19 16:46:59.000000000 +0100

--- src/ex_cmds2.c	2013-05-06 04:06:04.000000000 +0200

***************

*** 2851,2857 ****

  	EMSG(_(e_argreq));

      else if (eap != NULL && eap->forceit)

! 	/* ":source!": read Normal mdoe commands

  	 * Need to execute the commands directly.  This is required at least

  	 * for:

  	 * - ":g" command busy

--- 2851,2857 ----

  	EMSG(_(e_argreq));

      else if (eap != NULL && eap->forceit)

! 	/* ":source!": read Normal mode commands

  	 * Need to execute the commands directly.  This is required at least

  	 * for:

  	 * - ":g" command busy

*** ../vim-7.3.924/src/ex_docmd.c	2013-03-19 14:25:50.000000000 +0100

--- src/ex_docmd.c	2013-05-06 04:06:04.000000000 +0200

***************

*** 1093,1099 ****

  		msg_didany = FALSE; /* no output yet */

  		msg_start();

  		msg_scroll = TRUE;  /* put messages below each other */

! 		++no_wait_return;   /* dont wait for return until finished */

  		++RedrawingDisabled;

  		did_inc = TRUE;

  	    }

--- 1093,1099 ----

  		msg_didany = FALSE; /* no output yet */

  		msg_start();

  		msg_scroll = TRUE;  /* put messages below each other */

! 		++no_wait_return;   /* don't wait for return until finished */

  		++RedrawingDisabled;

  		did_inc = TRUE;

  	    }

***************

*** 1298,1304 ****

  	    && !(did_emsg

  #ifdef FEAT_EVAL

  		/* Keep going when inside try/catch, so that the error can be

! 		 * dealth with, except when it is a syntax error, it may cause

  		 * the :endtry to be missed. */

  		&& (cstack.cs_trylevel == 0 || did_emsg_syntax)

  #endif

--- 1298,1304 ----

  	    && !(did_emsg

  #ifdef FEAT_EVAL

  		/* Keep going when inside try/catch, so that the error can be

! 		 * deal with, except when it is a syntax error, it may cause

  		 * the :endtry to be missed. */

  		&& (cstack.cs_trylevel == 0 || did_emsg_syntax)

  #endif

***************

*** 10982,10988 ****

  		*p = '/';

      }

!     /* escapse special characters */

      p = vim_strsave_fnameescape(sname, FALSE);

      vim_free(sname);

      if (p == NULL)

--- 10982,10988 ----

  		*p = '/';

      }

!     /* escape special characters */

      p = vim_strsave_fnameescape(sname, FALSE);

      vim_free(sname);

      if (p == NULL)

*** ../vim-7.3.924/src/ex_eval.c	2010-08-15 21:57:25.000000000 +0200

--- src/ex_eval.c	2013-05-06 04:06:04.000000000 +0200

***************

*** 44,50 ****

   * executed.  Otherwise, errors and/or interrupts are converted into catchable

   * exceptions (did_throw additionally set), which terminate the script only if

   * not caught.  For user exceptions, only did_throw is set.  (Note: got_int can

!  * be set asyncronously afterwards by a SIGINT, so did_throw && got_int is not

   * a reliant test that the exception currently being thrown is an interrupt

   * exception.  Similarly, did_emsg can be set afterwards on an error in an

   * (unskipped) conditional command inside an inactive conditional, so did_throw

--- 44,50 ----