Vim 7.2b ready for testing.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1106 2a77ed30-b011-0410-a7ad-c7884a0aa172
runpaint · Jul 14, 2008 · 7b494a4 · 7b494a4
1 parent e662232
commit 7b494a4
Show file tree

Hide file tree

Showing 299 changed files with 3,852 additions and 2,134 deletions.
diff --git a/Contents b/Contents
@@ -9,10 +9,10 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...
 
-		Version 7.2a.  Also runs under UNIX, MSDOS and other systems.
-		vim72art.tgz  contains the documentation and syntax files.
-		vim72abin.tgz contains the binaries.
-		vim72asrc.tgz contains the sources.
+		Version 7.2b.  Also runs under UNIX, MSDOS and other systems.
+		vim72brt.tgz  contains the documentation and syntax files.
+		vim72bbin.tgz contains the binaries.
+		vim72bsrc.tgz contains the sources.
 		Author: Bram Moolenaar et al.
 
 

diff --git a/Filelist b/Filelist
@@ -516,6 +516,7 @@ RT_SCRIPTS =	\
 		runtime/indent/*.vim \
 		runtime/indent/README.txt \
 		runtime/ftplugin/*.vim \
+		runtime/ftplugin/logtalk.dict \
 		runtime/ftplugin/README.txt \
 		runtime/plugin/*.vim \
 		runtime/plugin/README.txt \

diff --git a/Makefile b/Makefile
@@ -69,7 +69,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 #    Before creating an archive first delete all backup files, *.orig, etc.
 
 MAJOR = 7
-MINOR = 2a
+MINOR = 2b
 
 # Uncomment this line if the Win32s version is to be included.
 DOSBIN_S =  dosbin_s
@@ -133,7 +133,7 @@ DOSBIN_S =  dosbin_s
 # Win32 console version:
 # - Set environment for Visual C++ 2008 Express Edition: "msvc2008.bat".  Or,
 #   when using the Visual C++ Toolkit 2003: "msvcsetup.bat" (adjust the paths
-#   when necessary).
+#   when necessary).  For Windows 98 the 2003 version is required.
 # - "nmake -f Make_mvc.mak"
 # - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
 # - Rename the executables to "vimw32.exe", "xxdw32.exe".

diff --git a/README.txt b/README.txt
@@ -1,4 +1,4 @@
-README.txt for version 7.2a of Vim: Vi IMproved.
+README.txt for version 7.2b of Vim: Vi IMproved.
 
 
 WHAT IS VIM

diff --git a/README_ami.txt b/README_ami.txt
@@ -1,4 +1,4 @@
-README_ami.txt for version 7.2a of Vim: Vi IMproved.
+README_ami.txt for version 7.2b of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.

diff --git a/README_amibin.txt b/README_amibin.txt
@@ -1,4 +1,4 @@
-README_amibin.txt for version 7.2a of Vim: Vi IMproved.
+README_amibin.txt for version 7.2b of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.

diff --git a/README_amisrc.txt b/README_amisrc.txt
@@ -1,4 +1,4 @@
-README_amisrc.txt for version 7.2a of Vim: Vi IMproved.
+README_amisrc.txt for version 7.2b of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.

diff --git a/README_bindos.txt b/README_bindos.txt
@@ -1,4 +1,4 @@
-README_bindos.txt for version 7.2a of Vim: Vi IMproved.
+README_bindos.txt for version 7.2b of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.

diff --git a/README_dos.txt b/README_dos.txt
@@ -1,4 +1,4 @@
-README_dos.txt for version 7.2a of Vim: Vi IMproved.
+README_dos.txt for version 7.2b of Vim: Vi IMproved.
 
 This file explains the installation of Vim on MS-DOS and MS-Windows systems.
 See "README.txt" for general information about Vim.

diff --git a/README_extra.txt b/README_extra.txt
@@ -1,4 +1,4 @@
-README_extra.txt for version 7.2a of Vim: Vi IMproved.
+README_extra.txt for version 7.2b of Vim: Vi IMproved.
 
 The extra archive of Vim is to be used in combination with the source archive
 (vim-7.0-src.tar.gz).  The extra archive is useless without it.

diff --git a/README_lang.txt b/README_lang.txt
@@ -1,4 +1,4 @@
-README_lang.txt for version 7.2a of Vim: Vi IMproved.
+README_lang.txt for version 7.2b of Vim: Vi IMproved.
 
 This file contains files for non-English languages:
 - Translated messages.

diff --git a/README_mac.txt b/README_mac.txt
@@ -1,4 +1,4 @@
-README_mac.txt for version 7.2a of Vim: Vi IMproved.
+README_mac.txt for version 7.2b of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Macintosh systems.
 See "README.txt" for general information about Vim.

diff --git a/README_ole.txt b/README_ole.txt
@@ -1,4 +1,4 @@
-README_ole.txt for version 7.2a of Vim: Vi IMproved.
+README_ole.txt for version 7.2b of Vim: Vi IMproved.
 
 This archive contains gvim.exe with OLE interface and VisVim.
 This version of gvim.exe can also load a number of interface dynamically (you

diff --git a/README_os2.txt b/README_os2.txt
@@ -1,4 +1,4 @@
-README_os2.txt for version 7.2a of Vim: Vi IMproved.
+README_os2.txt for version 7.2b of Vim: Vi IMproved.
 
 This file explains the installation of Vim on OS/2 systems.
 See "README.txt" for general information about Vim.

diff --git a/README_os390.txt b/README_os390.txt
@@ -1,4 +1,4 @@
-README_os_390.txt for version 7.2a of Vim: Vi IMproved.
+README_os_390.txt for version 7.2b of Vim: Vi IMproved.
 
 Welcome to the OS/390 Unix port of VIM.
 

diff --git a/README_src.txt b/README_src.txt
@@ -1,4 +1,4 @@
-README_src.txt for version 7.2a of Vim: Vi IMproved.
+README_src.txt for version 7.2b of Vim: Vi IMproved.
 
 The source archive contains the files needed to compile Vim on Unix systems.
 It is packed for Unix systems (NL line separator).  It is also used for other

diff --git a/README_srcdos.txt b/README_srcdos.txt
@@ -1,4 +1,4 @@
-README_srcdos.txt for version 7.2a of Vim: Vi IMproved.
+README_srcdos.txt for version 7.2b of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.

diff --git a/README_unix.txt b/README_unix.txt
@@ -1,4 +1,4 @@
-README_unix.txt for version 7.2a of Vim: Vi IMproved.
+README_unix.txt for version 7.2b of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.

diff --git a/README_vms.txt b/README_vms.txt
@@ -1,4 +1,4 @@
-README_vms.txt for version 7.2a of Vim: Vi IMproved.
+README_vms.txt for version 7.2b of Vim: Vi IMproved.
 
 This file explains the installation of Vim on VMS systems.
 See "README.txt" in the runtime archive for information about Vim.

diff --git a/README_w32s.txt b/README_w32s.txt
@@ -1,4 +1,4 @@
-README_w32s.txt for version 7.2a of Vim: Vi IMproved.
+README_w32s.txt for version 7.2b of Vim: Vi IMproved.
 
 This archive contains the gvim.exe that was specifically compiled for use in
 the Win32s subsystem in MS-Windows 3.1 and 3.11.

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
@@ -22,7 +22,7 @@
 !define HAVE_NLS
 
 !define VER_MAJOR 7
-!define VER_MINOR 2a
+!define VER_MINOR 2b
 
 # ----------- No configurable settings below this line -----------
 

diff --git a/runtime/autoload/ada.vim b/runtime/autoload/ada.vim
@@ -1,14 +1,16 @@
 "------------------------------------------------------------------------------
 "  Description: Perform Ada specific completion & tagging.
 "     Language: Ada (2005)
-"	   $Id: ada.vim,v 1.6 2008/06/25 19:58:36 vimboss Exp $
-"   Maintainer: Martin Krischik
+"	   $Id: ada.vim,v 1.7 2008/07/13 17:33:59 vimboss Exp $
+"   Maintainer: Martin Krischik <krischik@users.sourceforge.net>
+"		Taylor Venable <taylor@metasyntax.net>
 "		Neil Bird <neil@fnxweb.com>
+"		Ned Okie <nokie@radford.edu>
 "      $Author: vimboss $
-"	 $Date: 2008/06/25 19:58:36 $
-"      Version: 4.2
-"    $Revision: 1.6 $
-"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
+"	 $Date: 2008/07/13 17:33:59 $
+"      Version: 4.6
+"    $Revision: 1.7 $
+"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
 "      History: 24.05.2006 MK Unified Headers
 "		26.05.2006 MK ' should not be in iskeyword.
 "		16.07.2006 MK Ada-Mode as vim-ball
@@ -17,6 +19,10 @@
 "		05.11.2006 MK Bram suggested not to use include protection for
 "			      autoload
 "		05.11.2006 MK Bram suggested to save on spaces
+"		08.07.2007 TV fix mapleader problems.
+"	        09.05.2007 MK Session just won't work no matter how much
+"			      tweaking is done
+"		19.09.2007 NO still some mapleader problems
 "    Help Page: ft-ada-functions
 "------------------------------------------------------------------------------
 
@@ -425,30 +431,49 @@ function ada#Create_Tags (option)
    execute '!ctags --excmd=number ' . l:Filename
 endfunction ada#Create_Tags
 
-function ada#Switch_Session (New_Session)   "{{{1
-   if a:New_Session != v:this_session
-      "
-      "  We actualy got a new session - otherwise there
-      "  is nothing to do.
-      "
-      if strlen (v:this_session) > 0
-	 execute 'mksession! ' . v:this_session
-      endif
+" Section: ada#Switch_Session {{{1
+"
+function ada#Switch_Session (New_Session)
+   " 
+   " you should not save to much date into the seession since they will
+   " be sourced
+   "
+   let l:sessionoptions=&sessionoptions
 
-      let v:this_session = a:New_Session
+   try
+      set sessionoptions=buffers,curdir,folds,globals,resize,slash,tabpages,tabpages,unix,winpos,winsize
 
-      if filereadable (v:this_session)
-	 execute 'source ' . v:this_session
-      endif
+      if a:New_Session != v:this_session
+	 "
+	 "  We actualy got a new session - otherwise there
+	 "  is nothing to do.
+	 "
+	 if strlen (v:this_session) > 0
+	    execute 'mksession! ' . v:this_session
+	 endif
 
-      augroup ada_session
-	 autocmd!
-	 autocmd VimLeavePre * execute 'mksession! ' . v:this_session
-      augroup END
-   endif
+	 let v:this_session = a:New_Session
+
+	 "if filereadable (v:this_session)
+	    "execute 'source ' . v:this_session
+	 "endif
+
+	 augroup ada_session
+	    autocmd!
+	    autocmd VimLeavePre * execute 'mksession! ' . v:this_session
+	 augroup END
+
+	 "if exists ("g:Tlist_Auto_Open") && g:Tlist_Auto_Open
+	    "TlistOpen
+	 "endif
+
+      endif
+   finally
+      let &sessionoptions=l:sessionoptions
+   endtry
 
    return
-endfunction ada#Switch_Session	 "}}}1
+endfunction ada#Switch_Session	
 
 " Section: GNAT Pretty Printer folding {{{1
 "
@@ -546,18 +571,23 @@ function ada#Map_Menu (Text, Keys, Command)
 	\ a:Keys		 .
 	\" <C-O>:" . a:Command . "<CR>"
    else
+      if exists("g:mapleader")
+         let l:leader = g:mapleader
+      else
+         let l:leader = '\'
+      endif
       execute
 	\ "50amenu " .
 	\ "Ada."  . escape(a:Text, ' ') .
-	\ "<Tab>" . escape(g:mapleader . "a" . a:Keys , '\') .
+	\ "<Tab>" . escape(l:leader . "a" . a:Keys , '\') .
 	\ " :"	  . a:Command . "<CR>"
       execute
 	\ "nnoremap <buffer>" .
-	\ escape(g:mapleader . "a" . a:Keys , '\') .
+	\ escape(l:leader . "a" . a:Keys , '\') .
 	\" :" . a:Command
       execute
 	\ "inoremap <buffer>" .
-	\ escape(g:mapleader . "a" . a:Keys , '\') .
+	\ escape(l:leader . "a" . a:Keys , '\') .
 	\" <C-O>:" . a:Command
    endif
    return
@@ -566,10 +596,15 @@ endfunction
 " Section: ada#Map_Popup {{{2
 "
 function ada#Map_Popup (Text, Keys, Command)
+   if exists("g:mapleader")
+      let l:leader = g:mapleader
+   else
+      let l:leader = '\'
+   endif
    execute
      \ "50amenu " .
      \ "PopUp."   . escape(a:Text, ' ') .
-     \ "<Tab>"	  . escape(g:mapleader . "a" . a:Keys , '\') .
+     \ "<Tab>"	  . escape(l:leader . "a" . a:Keys , '\') .
      \ " :"	  . a:Command . "<CR>"
 
    call ada#Map_Menu (a:Text, a:Keys, a:Command)

diff --git a/runtime/autoload/adacomplete.vim b/runtime/autoload/adacomplete.vim
@@ -1,13 +1,13 @@
 "------------------------------------------------------------------------------
 "  Description: Vim Ada omnicompletion file
 "     Language:	Ada (2005)
-"	   $Id: adacomplete.vim,v 1.6 2008/06/25 19:56:24 vimboss Exp $
+"	   $Id: adacomplete.vim,v 1.7 2008/07/13 17:24:52 vimboss Exp $
 "   Maintainer:	Martin Krischik
 "      $Author: vimboss $
-"	 $Date: 2008/06/25 19:56:24 $
-"      Version: 4.2
-"    $Revision: 1.6 $
-"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/adacomplete.vim $
+"	 $Date: 2008/07/13 17:24:52 $
+"      Version: 4.6
+"    $Revision: 1.7 $
+"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/adacomplete.vim $
 "      History: 24.05.2006 MK Unified Headers
 "		26.05.2006 MK improved search for begin of word.
 "		16.07.2006 MK Ada-Mode as vim-ball

diff --git a/runtime/autoload/decada.vim b/runtime/autoload/decada.vim
@@ -1,14 +1,14 @@
 "------------------------------------------------------------------------------
 "  Description: Vim Ada/Dec Ada compiler file
 "     Language: Ada (Dec Ada)
-"          $Id: decada.vim,v 1.6 2008/06/25 19:55:42 vimboss Exp $
+"          $Id: decada.vim,v 1.7 2008/07/13 17:22:10 vimboss Exp $
 "    Copyright: Copyright (C) 2006 Martin Krischik
-"   Maintainer:	Martin Krischik
+"   Maintainer:	Martin Krischik <krischik@users.sourceforge.net>
 "      $Author: vimboss $
-"        $Date: 2008/06/25 19:55:42 $
-"      Version: 4.2
-"    $Revision: 1.6 $
-"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/decada.vim $
+"        $Date: 2008/07/13 17:22:10 $
+"      Version: 4.6      
+"    $Revision: 1.7 $
+"     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/decada.vim $
 "      History: 21.07.2006 MK New Dec Ada
 "               15.10.2006 MK Bram's suggestion for runtime integration
 "               05.11.2006 MK Bram suggested not to use include protection for
@@ -45,7 +45,7 @@ function decada#Set_Session (...) dict				     " {{{1
       call ada#Switch_Session (a:1)
    elseif argc() == 0 && strlen (v:servername) > 0
       call ada#Switch_Session (
-	 \ expand('~')[0:-2] . ".vimfiles.session]" .
+	 \ expand('~')[0:-2] . ".vimfiles.session]decada_" .
 	 \ v:servername . ".vim")
    endif
    return