Loading ...
Sorry, an error occurred while loading the content.

Patch 7.3.925

Expand Messages
  • Bram Moolenaar
    Patch 7.3.925 Problem: Typos in source files. Solution: Fix the typos. (Ken Takata) Files: runtime/plugin/matchparen.vim,
    Message 1 of 1 , May 5, 2013
    • 0 Attachment
      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@...>
      Based upon: VisEmacs by Christopher Payne <payneca@...>
      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@...>
      Based upon: VisEmacs by Christopher Payne <payneca@...>
      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@...

      --- 322,326 ----
      Have fun!

      Heiko Erhardt
      ! heiko.erhardt@...

      *** ../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 ----
      * 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 asynchronously 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
      ***************
      *** 2091,2101 ****
      * Values used for "searched_cond" are (CSF_WHILE | CSF_FOR) or CSF_TRY or 0,
      * the latter meaning the innermost try conditional not in its finally clause.
      * "inclusive" tells whether the conditional searched for should be made
      ! * inactive itself (a try conditional not in its finally claused possibly find
      * before is always made inactive). If "inclusive" is TRUE and
      * "searched_cond" is CSF_TRY|CSF_SILENT, the saved former value of
      * "emsg_silent", if reset when the try conditional finally reached was
      ! * entered, is restored (unsed by ex_endtry()). This is normally done only
      * when such a try conditional is left.
      */
      int
      --- 2091,2101 ----
      * Values used for "searched_cond" are (CSF_WHILE | CSF_FOR) or CSF_TRY or 0,
      * the latter meaning the innermost try conditional not in its finally clause.
      * "inclusive" tells whether the conditional searched for should be made
      ! * inactive itself (a try conditional not in its finally clause possibly find
      * before is always made inactive). If "inclusive" is TRUE and
      * "searched_cond" is CSF_TRY|CSF_SILENT, the saved former value of
      * "emsg_silent", if reset when the try conditional finally reached was
      ! * entered, is restored (used by ex_endtry()). This is normally done only
      * when such a try conditional is left.
      */
      int
      *** ../vim-7.3.924/src/farsi.c 2012-07-16 17:26:18.000000000 +0200
      --- src/farsi.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 1841,1847 ****
      }

      /*
      ! * Convert the Farsi VIM into Farsi 3342 standad.
      */
      void
      conv_to_pstd()
      --- 1841,1847 ----
      }

      /*
      ! * Convert the Farsi VIM into Farsi 3342 standard.
      */
      void
      conv_to_pstd()
      *** ../vim-7.3.924/src/feature.h 2013-04-15 15:40:08.000000000 +0200
      --- src/feature.h 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 1007,1013 ****

      /*
      * MODIFIED_BY Name of who modified Vim. Required when distributing
      ! * a modifed version of Vim.
      * Also from the "--with-modified-by" configure argument.
      */
      /* #define MODIFIED_BY "John Doe" */
      --- 1007,1013 ----

      /*
      * MODIFIED_BY Name of who modified Vim. Required when distributing
      ! * a modified version of Vim.
      * Also from the "--with-modified-by" configure argument.
      */
      /* #define MODIFIED_BY "John Doe" */
      *** ../vim-7.3.924/src/fileio.c 2013-04-24 16:33:58.000000000 +0200
      --- src/fileio.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 3279,3285 ****
      overwriting = FALSE;

      if (exiting)
      ! settmode(TMODE_COOK); /* when exiting allow typahead now */

      ++no_wait_return; /* don't wait for return yet */

      --- 3279,3285 ----
      overwriting = FALSE;

      if (exiting)
      ! settmode(TMODE_COOK); /* when exiting allow typeahead now */

      ++no_wait_return; /* don't wait for return yet */

      ***************
      *** 3303,3309 ****
      int empty_memline = (buf->b_ml.ml_mfp == NULL);

      /*
      ! * Apply PRE aucocommands.
      * Set curbuf to the buffer to be written.
      * Careful: The autocommands may call buf_write() recursively!
      */
      --- 3303,3309 ----
      int empty_memline = (buf->b_ml.ml_mfp == NULL);

      /*
      ! * Apply PRE autocommands.
      * Set curbuf to the buffer to be written.
      * Careful: The autocommands may call buf_write() recursively!
      */
      ***************
      *** 8866,8872 ****
      else
      {
      /* There is no window for "buf", use "aucmd_win". To minimize the side
      ! * effects, insert it in a the current tab page.
      * Anything related to a window (e.g., setting folds) may have
      * unexpected results. */
      aco->use_aucmd_win = TRUE;
      --- 8866,8872 ----
      else
      {
      /* There is no window for "buf", use "aucmd_win". To minimize the side
      ! * effects, insert it in the current tab page.
      * Anything related to a window (e.g., setting folds) may have
      * unexpected results. */
      aco->use_aucmd_win = TRUE;
      *** ../vim-7.3.924/src/glbl_ime.cpp 2010-08-15 21:57:27.000000000 +0200
      --- src/glbl_ime.cpp 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 156,162 ****
      }

      /*
      ! * Set position of IME compotision window.
      *
      * You have to call this before starting composition. If once composition
      * started, this can take no effect until that composition have finished. So
      --- 156,162 ----
      }

      /*
      ! * Set position of IME composition window.
      *
      * You have to call this before starting composition. If once composition
      * started, this can take no effect until that composition have finished. So
      *** ../vim-7.3.924/src/gui.c 2013-04-03 21:11:33.000000000 +0200
      --- src/gui.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 826,832 ****
      #endif

      /*
      ! * Set the font. "font_list" is a a comma separated list of font names. The
      * first font name that works is used. If none is found, use the default
      * font.
      * If "fontset" is TRUE, the "font_list" is used as one name for the fontset.
      --- 826,832 ----
      #endif

      /*
      ! * Set the font. "font_list" is a comma separated list of font names. The
      * first font name that works is used. If none is found, use the default
      * font.
      * If "fontset" is TRUE, the "font_list" is used as one name for the fontset.
      ***************
      *** 2376,2382 ****
      {
      int start; /* index of bytes to be drawn */
      int cells; /* cellwidth of bytes to be drawn */
      ! int thislen; /* length of bytes to be drawin */
      int cn; /* cellwidth of current char */
      int i; /* index of current char */
      int c; /* current char value */
      --- 2376,2382 ----
      {
      int start; /* index of bytes to be drawn */
      int cells; /* cellwidth of bytes to be drawn */
      ! int thislen; /* length of bytes to be drawn */
      int cn; /* cellwidth of current char */
      int i; /* index of current char */
      int c; /* current char value */
      ***************
      *** 3886,3892 ****
      gui.dragged_sb = SBAR_NONE;
      #ifdef FEAT_GUI_GTK
      /* Keep the "dragged_wp" value until after the scrolling, for when the
      ! * moust button is released. GTK2 doesn't send the button-up event. */
      gui.dragged_wp = NULL;
      #endif
      }
      --- 3886,3892 ----
      gui.dragged_sb = SBAR_NONE;
      #ifdef FEAT_GUI_GTK
      /* Keep the "dragged_wp" value until after the scrolling, for when the
      ! * mouse button is released. GTK2 doesn't send the button-up event. */
      gui.dragged_wp = NULL;
      #endif
      }
      *** ../vim-7.3.924/src/gui_athena.c 2011-01-17 20:08:03.000000000 +0100
      --- src/gui_athena.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 519,525 ****
      &color[TOP_SHADOW].pixel,
      &color[HIGHLIGHT].pixel);

      ! /* Setup the color subsititution table */
      attrs.valuemask = XpmColorSymbols;
      attrs.colorsymbols = color;
      attrs.numsymbols = 5;
      --- 519,525 ----
      &color[TOP_SHADOW].pixel,
      &color[HIGHLIGHT].pixel);

      ! /* Setup the color substitution table */
      attrs.valuemask = XpmColorSymbols;
      attrs.colorsymbols = color;
      attrs.numsymbols = 5;
      *** ../vim-7.3.924/src/gui_beval.c 2012-10-21 00:58:34.000000000 +0200
      --- src/gui_beval.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 726,732 ****
      BalloonEval *beval;
      XEvent *event;
      {
      ! Position distance; /* a measure of how much the ponter moved */
      Position delta; /* used to compute distance */

      switch (event->type)
      --- 726,732 ----
      BalloonEval *beval;
      XEvent *event;
      {
      ! Position distance; /* a measure of how much the pointer moved */
      Position delta; /* used to compute distance */

      switch (event->type)
      *** ../vim-7.3.924/src/gui_gtk_x11.c 2013-03-13 17:50:20.000000000 +0100
      --- src/gui_gtk_x11.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 1257,1263 ****
      }
      }

      ! /* Chop off any traiing NUL bytes. OpenOffice sends these. */
      while (len > 0 && text[len - 1] == NUL)
      --len;

      --- 1257,1263 ----
      }
      }

      ! /* Chop off any trailing NUL bytes. OpenOffice sends these. */
      while (len > 0 && text[len - 1] == NUL)
      --len;

      *** ../vim-7.3.924/src/gui_mac.c 2012-11-20 17:18:56.000000000 +0100
      --- src/gui_mac.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 41,47 ****
      #define USE_AEVENT /* Enable AEVENT */
      #undef USE_OFFSETED_WINDOW /* Debugging feature: start Vim window OFFSETed */

      ! /* Compile as CodeWarior External Editor */
      #if defined(FEAT_CW_EDITOR) && !defined(USE_AEVENT)
      # define USE_AEVENT /* Need Apple Event Support */
      #endif
      --- 41,47 ----
      #define USE_AEVENT /* Enable AEVENT */
      #undef USE_OFFSETED_WINDOW /* Debugging feature: start Vim window OFFSETed */

      ! /* Compile as CodeWarrior External Editor */
      #if defined(FEAT_CW_EDITOR) && !defined(USE_AEVENT)
      # define USE_AEVENT /* Need Apple Event Support */
      #endif
      ***************
      *** 1478,1484 ****
      /*
      * gui_mac_get_menu_item_index
      *
      ! * Returns the index inside the menu wher
      */
      short /* Should we return MenuItemIndex? */
      gui_mac_get_menu_item_index(vimmenu_T *pMenu)
      --- 1478,1484 ----
      /*
      * gui_mac_get_menu_item_index
      *
      ! * Returns the index inside the menu where
      */
      short /* Should we return MenuItemIndex? */
      gui_mac_get_menu_item_index(vimmenu_T *pMenu)
      ***************
      *** 1693,1699 ****

      if (theControl != NUL)
      {
      ! /* We hit a scollbar */

      if (thePortion != kControlIndicatorPart)
      {
      --- 1693,1699 ----

      if (theControl != NUL)
      {
      ! /* We hit a scrollbar */

      if (thePortion != kControlIndicatorPart)
      {
      ***************
      *** 2630,2636 ****
      {
      /* Handle the menu CntxMenuID, CntxMenuItem */
      /* The submenu can be handle directly by gui_mac_handle_menu */
      ! /* But what about the current menu, is the meny changed by ContextualMenuSelect */
      gui_mac_handle_menu((CntxMenuID << 16) + CntxMenuItem);
      }
      else if (CntxMenuID == kCMShowHelpSelected)
      --- 2630,2636 ----
      {
      /* Handle the menu CntxMenuID, CntxMenuItem */
      /* The submenu can be handle directly by gui_mac_handle_menu */
      ! /* But what about the current menu, is the many changed by ContextualMenuSelect */
      gui_mac_handle_menu((CntxMenuID << 16) + CntxMenuItem);
      }
      else if (CntxMenuID == kCMShowHelpSelected)
      ***************
      *** 5356,5362 ****
      char_u *initdir,
      char_u *filter)
      {
      ! /* TODO: Add Ammon's safety checl (Dany) */
      NavReplyRecord reply;
      char_u *fname = NULL;
      char_u **fnames = NULL;
      --- 5356,5362 ----
      char_u *initdir,
      char_u *filter)
      {
      ! /* TODO: Add Ammon's safety check (Dany) */
      NavReplyRecord reply;
      char_u *fname = NULL;
      char_u **fnames = NULL;
      ***************
      *** 5704,5710 ****

      /* Resize the button to fit its name */
      width = StringWidth(name) + 2 * dfltButtonEdge;
      ! /* Limite the size of any button to an acceptable value. */
      /* TODO: Should be based on the message width */
      if (width > maxButtonWidth)
      width = maxButtonWidth;
      --- 5704,5710 ----

      /* Resize the button to fit its name */
      width = StringWidth(name) + 2 * dfltButtonEdge;
      ! /* Limit the size of any button to an acceptable value. */
      /* TODO: Should be based on the message width */
      if (width > maxButtonWidth)
      width = maxButtonWidth;
      ***************
      *** 5887,5893 ****
      /* Free the modal filterProc */
      DisposeRoutineDescriptor(dialogUPP);

      ! /* Get ride of th edialog (free memory) */
      DisposeDialog(theDialog);

      return itemHit;
      --- 5887,5893 ----
      /* Free the modal filterProc */
      DisposeRoutineDescriptor(dialogUPP);

      ! /* Get ride of the dialog (free memory) */
      DisposeDialog(theDialog);

      return itemHit;
      ***************
      *** 5967,5975 ****
      /* New way */

      /*
      ! * Get first devoice with one button.
      ! * This will probably be the standad mouse
      ! * startat head of cursor dev list
      *
      */

      --- 5967,5975 ----
      /* New way */

      /*
      ! * Get first device with one button.
      ! * This will probably be the standard mouse
      ! * start at head of cursor dev list
      *
      */

      ***************
      *** 6151,6157 ****
      }

      /*
      ! * Convert a FSSpec to a fuill path
      */

      char_u *FullPathFromFSSpec_save(FSSpec file)
      --- 6151,6157 ----
      }

      /*
      ! * Convert a FSSpec to a full path
      */

      char_u *FullPathFromFSSpec_save(FSSpec file)
      ***************
      *** 6215,6222 ****

      #ifdef USE_UNIXFILENAME
      /*
      ! * The function used here are available in Carbon, but
      ! * do nothing une MacOS 8 and 9
      */
      if (error == fnfErr)
      {
      --- 6215,6222 ----

      #ifdef USE_UNIXFILENAME
      /*
      ! * The functions used here are available in Carbon, but do nothing on
      ! * MacOS 8 and 9.
      */
      if (error == fnfErr)
      {
      ***************
      *** 6544,6550 ****

      // when the tabline is hidden, vim doesn't call update_tabline(). When
      // 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).
      static CFStringRef *tabLabels = NULL;
      --- 6544,6550 ----

      // when the tabline is hidden, vim doesn't call update_tabline(). When
      // the tabline is shown again, show_tabline() is called before update_tabline(),
      ! // and because of this, the tab labels and vim's 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).
      static CFStringRef *tabLabels = NULL;
      ***************
      *** 6578,6584 ****

      // assert(property == kTabsColumn); // why is this violated??

      ! // changeValue is true if we have a modifieable list and data was changed.
      // In our case, it's always false.
      // (that is: if (changeValue) updateInternalData(); else return
      // internalData();
      --- 6578,6584 ----

      // assert(property == kTabsColumn); // why is this violated??

      ! // changeValue is true if we have a modifiable list and data was changed.
      // In our case, it's always false.
      // (that is: if (changeValue) updateInternalData(); else return
      // internalData();
      *** ../vim-7.3.924/src/gui_motif.c 2011-01-17 20:08:03.000000000 +0100
      --- src/gui_motif.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 1344,1350 ****
      else
      {
      /* Without shadows one can't sense whatever the button has been
      ! * pressed or not! However we wan't to save a bit of space...
      * Need the highlightThickness to see the focus.
      */
      XtSetArg(args[n], XmNhighlightThickness, 1); n++;
      --- 1344,1350 ----
      else
      {
      /* Without shadows one can't sense whatever the button has been
      ! * pressed or not! However we want to save a bit of space...
      * Need the highlightThickness to see the focus.
      */
      XtSetArg(args[n], XmNhighlightThickness, 1); n++;
      ***************
      *** 3205,3211 ****
      # ifdef FEAT_FOOTER
      /*
      * The next toolbar enter/leave callbacks should really do balloon help. But
      ! * I have to use footer help for backwards compatability. Hopefully both will
      * get implemented and the user will have a choice.
      */
      static void
      --- 3205,3211 ----
      # ifdef FEAT_FOOTER
      /*
      * The next toolbar enter/leave callbacks should really do balloon help. But
      ! * I have to use footer help for backwards compatibility. Hopefully both will
      * get implemented and the user will have a choice.
      */
      static void
      *** ../vim-7.3.924/src/gui_photon.c 2012-11-20 16:53:34.000000000 +0100
      --- src/gui_photon.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 61,67 ****
      static PhPoint_t gui_ph_raw_offset;
      static PtWidget_t *gui_ph_timer_cursor; /* handle cursor blinking */
      static PtWidget_t *gui_ph_timer_timeout; /* used in gui_mch_wait_for_chars */
      ! static short is_timeout; /* Has the timeout occured? */

      /*
      * This is set inside the mouse callback for a right mouse
      --- 61,67 ----
      static PhPoint_t gui_ph_raw_offset;
      static PtWidget_t *gui_ph_timer_cursor; /* handle cursor blinking */
      static PtWidget_t *gui_ph_timer_timeout; /* used in gui_mch_wait_for_chars */
      ! static short is_timeout; /* Has the timeout occurred? */

      /*
      * This is set inside the mouse callback for a right mouse
      ***************
      *** 1156,1162 ****
      PtSetArg(&args[ n++ ], Pt_ARG_POS, &pos, 0);

      #ifdef USE_PANEL_GROUP
      ! /* Put in a temprary place holder title */
      PtSetArg(&args[ n++ ], Pt_ARG_PG_PANEL_TITLES, &empty_title, 1);

      gui.vimPanelGroup = PtCreateWidget(PtPanelGroup, gui.vimWindow, n, args);
      --- 1156,1162 ----
      PtSetArg(&args[ n++ ], Pt_ARG_POS, &pos, 0);

      #ifdef USE_PANEL_GROUP
      ! /* Put in a temporary place holder title */
      PtSetArg(&args[ n++ ], Pt_ARG_PG_PANEL_TITLES, &empty_title, 1);

      gui.vimPanelGroup = PtCreateWidget(PtPanelGroup, gui.vimWindow, n, args);
      ***************
      *** 1527,1533 ****
      /* There is one less separator than buttons, so bump up the button count */
      button_count = 1;

      ! /* Count string length and number of seperators */
      for (str = buttons; *str; str++)
      {
      len++;
      --- 1527,1533 ----
      /* There is one less separator than buttons, so bump up the button count */
      button_count = 1;

      ! /* Count string length and number of separators */
      for (str = buttons; *str; str++)
      {
      len++;
      *** ../vim-7.3.924/src/gui_w16.c 2012-11-20 16:53:34.000000000 +0100
      --- src/gui_w16.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 511,517 ****
      workarea_rect.right = GetSystemMetrics(SM_CXSCREEN);
      workarea_rect.bottom = GetSystemMetrics(SM_CYFULLSCREEN);

      ! /* get current posision of our window */
      wndpl.length = sizeof(WINDOWPLACEMENT);
      GetWindowPlacement(s_hwnd, &wndpl);
      if (wndpl.showCmd == SW_SHOWNORMAL)
      --- 511,517 ----
      workarea_rect.right = GetSystemMetrics(SM_CXSCREEN);
      workarea_rect.bottom = GetSystemMetrics(SM_CYFULLSCREEN);

      ! /* get current position of our window */
      wndpl.length = sizeof(WINDOWPLACEMENT);
      GetWindowPlacement(s_hwnd, &wndpl);
      if (wndpl.showCmd == SW_SHOWNORMAL)
      ***************
      *** 1161,1167 ****
      return -1;

      /*
      ! * make a copy of 'buttons' to fiddle with it. complier grizzles because
      * vim_strsave() doesn't take a const arg (why not?), so cast away the
      * const.
      */
      --- 1161,1167 ----
      return -1;

      /*
      ! * make a copy of 'buttons' to fiddle with it. compiler grizzles because
      * vim_strsave() doesn't take a const arg (why not?), so cast away the
      * const.
      */
      *** ../vim-7.3.924/src/gui_w32.c 2013-03-19 14:48:25.000000000 +0100
      --- src/gui_w32.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 1258,1264 ****

      #ifdef FEAT_NETBEANS_INTG
      {
      ! /* stolen from gui_x11.x */
      int arg;

      for (arg = 1; arg < *argc; arg++)
      --- 1258,1264 ----

      #ifdef FEAT_NETBEANS_INTG
      {
      ! /* stolen from gui_x11.c */
      int arg;

      for (arg = 1; arg < *argc; arg++)
      ***************
      *** 1676,1682 ****
      * used by the taskbar or appbars. */
      get_work_area(&workarea_rect);

      ! /* Get current posision of our window. Note that the .left and .top are
      * relative to the work area. */
      wndpl.length = sizeof(WINDOWPLACEMENT);
      GetWindowPlacement(s_hwnd, &wndpl);
      --- 1676,1682 ----
      * used by the taskbar or appbars. */
      get_work_area(&workarea_rect);

      ! /* Get current position of our window. Note that the .left and .top are
      * relative to the work area. */
      wndpl.length = sizeof(WINDOWPLACEMENT);
      GetWindowPlacement(s_hwnd, &wndpl);
      ***************
      *** 3100,3106 ****
      return -1;

      /*
      ! * make a copy of 'buttons' to fiddle with it. complier grizzles because
      * vim_strsave() doesn't take a const arg (why not?), so cast away the
      * const.
      */
      --- 3100,3106 ----
      return -1;

      /*
      ! * make a copy of 'buttons' to fiddle with it. compiler grizzles because
      * vim_strsave() doesn't take a const arg (why not?), so cast away the
      * const.
      */
      ***************
      *** 4391,4397 ****
      }

      sign.hImage = NULL;
      ! ext = signfile + STRLEN(signfile) - 4; /* get extention */
      if (ext > signfile)
      {
      int do_load = 1;
      --- 4391,4397 ----
      }

      sign.hImage = NULL;
      ! ext = signfile + STRLEN(signfile) - 4; /* get extension */
      if (ext > signfile)
      {
      int do_load = 1;
      *** ../vim-7.3.924/src/gui_w48.c 2013-03-19 14:48:25.000000000 +0100
      --- src/gui_w48.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 1222,1228 ****

      /* When side scroll bar is unshown, the size of window will change.
      * then, the text area move left or right. thus client rect should be
      ! * forcely redraw. (Yasuhiro Matsumoto) */
      if (oldx != x || oldy != y)
      {
      InvalidateRect(s_hwnd, NULL, FALSE);
      --- 1222,1228 ----

      /* When side scroll bar is unshown, the size of window will change.
      * then, the text area move left or right. thus client rect should be
      ! * forcedly redrawn. (Yasuhiro Matsumoto) */
      if (oldx != x || oldy != y)
      {
      InvalidateRect(s_hwnd, NULL, FALSE);
      *** ../vim-7.3.924/src/gui_xmebw.c 2012-06-29 13:19:23.000000000 +0200
      --- src/gui_xmebw.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 345,351 ****
      &eb->primitive.top_shadow_color,
      &eb->primitive.highlight_color);

      ! /* Setup color subsititution table. */
      color[0].pixel = eb->core.background_pixel;
      color[1].pixel = eb->core.background_pixel;
      color[2].pixel = eb->core.background_pixel;
      --- 345,351 ----
      &eb->primitive.top_shadow_color,
      &eb->primitive.highlight_color);

      ! /* Setup color substitution table. */
      color[0].pixel = eb->core.background_pixel;
      color[1].pixel = eb->core.background_pixel;
      color[2].pixel = eb->core.background_pixel;
      ***************
      *** 919,926 ****
      }

      /*
      ! * Plase note that we manipulate the width only in case of push buttons not
      ! * used in the context of a menu pane.
      */
      if (Lab_IsMenupane(newtb))
      {
      --- 919,926 ----
      }

      /*
      ! * Please note that we manipulate the width only in case of push buttons
      ! * not used in the context of a menu pane.
      */
      if (Lab_IsMenupane(newtb))
      {
      ***************
      *** 1006,1012 ****
      XmString str;
      set_pixmap(eb);

      ! /* FIXME: this is not the perfect way to deal with menues, which do not
      * have any string set right now. */
      str = XmStringCreateLocalized("");
      XtVaSetValues((Widget) eb, XmNlabelString, str, NULL);
      --- 1006,1012 ----
      XmString str;
      set_pixmap(eb);

      ! /* FIXME: this is not the perfect way to deal with menus, which do not
      * have any string set right now. */
      str = XmStringCreateLocalized("");
      XtVaSetValues((Widget) eb, XmNlabelString, str, NULL);
      *** ../vim-7.3.924/src/gui_xmebwp.h 2010-08-15 21:57:27.000000000 +0200
      --- src/gui_xmebwp.h 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 26,32 ****


      /*
      ! * EnahncedButton class structure.
      */
      typedef struct _XmEnhancedButtonClassPart
      {
      --- 26,32 ----


      /*
      ! * EnhancedButton class structure.
      */
      typedef struct _XmEnhancedButtonClassPart
      {
      ***************
      *** 49,55 ****
      extern XmEnhancedButtonClassRec xmEnhancedButtonClassRec;

      /*
      ! * EnahncedButton instance record.
      */
      typedef struct _XmEnhancedButtonPart
      {
      --- 49,55 ----
      extern XmEnhancedButtonClassRec xmEnhancedButtonClassRec;

      /*
      ! * EnhancedButton instance record.
      */
      typedef struct _XmEnhancedButtonPart
      {
      *** ../vim-7.3.924/src/hardcopy.c 2011-04-11 21:35:03.000000000 +0200
      --- src/hardcopy.c 2013-05-06 04:00:47.000000000 +0200
      ***************
      *** 2186,2192 ****
      if (num_copies > 1)
      {
      prt_write_string(" numcopies(");
      ! /* Note: no space wanted so dont use prt_write_int() */
      sprintf((char *)prt_line_buffer, "%d", num_copies);
      prt_write_file(prt_line_buffer);
      prt_write_string(")");
      --- 2186,2192 ----
      if (num_copies > 1)
      {
      prt_write_string(" numcopies(");
      ! /* Note: no space wanted so don't use prt_write_int() */
      sprintf((char *)prt_line_buffer, "%d", num_copies);
      prt_write_file(prt_line_buffer);
      prt_write_string(")");
      *** ../vim-7.3.924/src/if_cscope.c 2011-06-12 21:24:56.000000000 +0200
      --- src/if_cscope.c 2013-05-06 03:58:29.000000000 +0200
      ***************
      *** 1192,1200 ****
      if (nummatches == NULL)
      return FALSE;

      ! /* send query to all open connections, then count the total number
      ! * of matches so we can alloc matchesp all in one swell foop
      ! */
      for (i = 0; i < csinfo_size; i++)
      nummatches[i] = 0;
      totmatches = 0;
      --- 1192,1199 ----
      if (nummatches == NULL)
      return FALSE;

      ! /* Send query to all open connections, then count the total number
      ! * of matches so we can alloc all in one swell foop. */
      for (i = 0; i < csinfo_size; i++)
      nummatches[i] = 0;
      totmatches = 0;
      *** ../vim-7.3.924/src/if_mzsch.c 2013-01-31 21:09:10.000000000 +0100
      --- src/if_mzsch.c 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 3053,3059 ****
      status = FAIL;
      else
      {
      ! /* add the value in advance to allow handling of self-referencial
      * data structures */
      typval_T *visited_tv = (typval_T *)alloc(sizeof(typval_T));
      copy_tv(tv, visited_tv);
      --- 3053,3059 ----
      status = FAIL;
      else
      {
      ! /* add the value in advance to allow handling of self-referential
      * data structures */
      typval_T *visited_tv = (typval_T *)alloc(sizeof(typval_T));
      copy_tv(tv, visited_tv);
      ***************
      *** 3088,3094 ****
      if (status == FAIL)
      break;
      }
      ! /* impoper list not terminated with null
      * need to handle the last element */
      if (status == OK && !SCHEME_NULLP(curr))
      {
      --- 3088,3094 ----
      if (status == FAIL)
      break;
      }
      ! /* improper list not terminated with null
      * need to handle the last element */
      if (status == OK && !SCHEME_NULLP(curr))
      {
      ***************
      *** 3136,3142 ****
      {
      if (((Scheme_Hash_Table *) obj)->vals[i] != NULL)
      {
      ! /* generate item for `diplay'ed Scheme key */
      dictitem_T *item = dictitem_alloc((char_u *)string_to_line(
      ((Scheme_Hash_Table *) obj)->keys[i]));
      /* convert Scheme val to Vim and add it to the dict */
      --- 3136,3142 ----
      {
      if (((Scheme_Hash_Table *) obj)->vals[i] != NULL)
      {
      ! /* generate item for `display'ed Scheme key */
      dictitem_T *item = dictitem_alloc((char_u *)string_to_line(
      ((Scheme_Hash_Table *) obj)->keys[i]));
      /* convert Scheme val to Vim and add it to the dict */
      *** ../vim-7.3.924/src/if_ole.cpp 2010-08-15 21:57:32.000000000 +0200
      --- src/if_ole.cpp 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 645,651 ****
      CoTaskMemFree(wGUID);
      }

      ! // Delete a key and all of its descendents
      static void RecursiveDeleteKey(HKEY hKeyParent, const char *child)
      {
      // Open the child
      --- 645,651 ----
      CoTaskMemFree(wGUID);
      }

      ! // Delete a key and all of its descendants
      static void RecursiveDeleteKey(HKEY hKeyParent, const char *child)
      {
      // Open the child
      ***************
      *** 655,661 ****
      if (result != ERROR_SUCCESS)
      return;

      ! // Enumerate all of the decendents of this child
      FILETIME time;
      char buffer[1024];
      DWORD size = 1024;
      --- 655,661 ----
      if (result != ERROR_SUCCESS)
      return;

      ! // Enumerate all of the descendants of this child
      FILETIME time;
      char buffer[1024];
      DWORD size = 1024;
      ***************
      *** 663,669 ****
      while (RegEnumKeyEx(hKeyChild, 0, buffer, &size, NULL,
      NULL, NULL, &time) == S_OK)
      {
      ! // Delete the decendents of this child
      RecursiveDeleteKey(hKeyChild, buffer);
      size = 256;
      }
      --- 663,669 ----
      while (RegEnumKeyEx(hKeyChild, 0, buffer, &size, NULL,
      NULL, NULL, &time) == S_OK)
      {
      ! // Delete the descendants of this child
      RecursiveDeleteKey(hKeyChild, buffer);
      size = 256;
      }
      *** ../vim-7.3.924/src/if_perl.xs 2013-03-19 14:25:50.000000000 +0100
      --- src/if_perl.xs 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 657,663 ****

      /*
      * perl_win_free
      ! * Remove all refences to the window to be destroyed
      */
      void
      perl_win_free(wp)
      --- 657,663 ----

      /*
      * perl_win_free
      ! * Remove all references to the window to be destroyed
      */
      void
      perl_win_free(wp)
      *** ../vim-7.3.924/src/if_py_both.h 2013-05-06 03:52:44.000000000 +0200
      --- src/if_py_both.h 2013-05-06 04:06:04.000000000 +0200
      ***************
      *** 2160,2166 ****
      static int
      SetBufferLine(buf_T *buf, PyInt n, PyObject *line, PyInt *len_change)
      {
      ! /* First of all, we check the thpe of the supplied Python object.
      * There are three cases:
      * 1. NULL, or None - this is a deletion.
      * 2. A string - this is a replacement.
      --- 2160,2166 ----
      static int
      SetBufferLine(buf_T *buf, PyInt n, PyObject *line, PyInt *len_change)
      {
      ! /* First of all, we check the type of the supplied Python object.
      * There are three cases:
      * 1. NULL, or None - this is a deletion.
      * 2. A string - this is a replacement.
      ***************
      *** 2251,2257 ****
      static int
      SetBufferLineList(buf_T *buf, PyInt lo, PyInt hi, PyObject *list, PyInt *len_change)
      {
      ! /* First of all, we check the thpe of the supplied Python object.
      * There are three cases:
      * 1. NULL, or None - this is a deletion.
      * 2. A list - this is a replacement.
      --- 2251,2257 ----
      static int
      SetBufferLineList(buf_T *buf, PyInt lo, PyInt hi, PyObject *list, PyInt *len_change)
      {
      ! /* First of all, we check the type of the supplied Python object.
      * There are three cases:
      * 1. NULL, or None - this is a deletion.
      * 2. A list - this is a replacement.
      ***************
      *** 2428,2434 ****
      }
      }

      ! /* Insert a number of lines into the specified buffer after the specifed line.
      * The line number is in Vim format (1-based). The lines to be inserted are
      * given as a Python list of string objects or as a single string. The lines
      * to be added are checked for validity and correct format. Errors are
      --- 2428,2434 ----
      }
      }

      ! /* Insert a number of lines into the specified buffer after the specified line.
      * The line number is in Vim format (1-based). The lines to be inserted are
      * given as a Python list of string objects or as a single string. The lines
      * to be added are checked for validity and correct format. Errors are
      ***************
      *** 2819,2825 ****
      return NULL;
      }

      ! /* Ckeck for keyboard interrupt */
      if (VimErrorCheck())
      return NULL;

      --- 2819,2825 ----
      return NULL;
      }

      ! /* Check for keyboard interrupt */
      if (VimErrorCheck())
      return NULL;

      *** ../vim-7.3.924/src/if_python.c 2013-05-06 03:52:44.000000000 +0200
      --- src/if_python.c 2013-05-06 04:06:04.000000000 +0200
      ***********<br/><br/>(Message over 64 KB, truncated)
    Your message has been successfully submitted and would be delivered to recipients shortly.