r1080 - in /trunk/packages/vim: debian/README debian/changelog patches/gnuada.diff upstream/patches/7.1.150 upstream/patches/7.1.151 upstream/patches/7.1.152 upstream/patches/7.1.153 upstream/patches/7.1.154
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Sat Nov 10 07:29:58 UTC 2007
Author: jamessan
Date: Sat Nov 10 07:29:58 2007
New Revision: 1080
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1080
Log:
* New upstream patches (139 - 154), see README.gz for details.
- gnuada.diff, which updates the ada runtime files so they gracefully
handle the user not having certain variables defined. (Closes: #440221)
Added:
trunk/packages/vim/patches/gnuada.diff
trunk/packages/vim/upstream/patches/7.1.150
trunk/packages/vim/upstream/patches/7.1.151
trunk/packages/vim/upstream/patches/7.1.152
trunk/packages/vim/upstream/patches/7.1.153
trunk/packages/vim/upstream/patches/7.1.154
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1080&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sat Nov 10 07:29:58 2007
@@ -178,3 +178,8 @@
2079 7.1.147 (after 7.1.127) freeing memory twice completing user name
2557 7.1.148 QNX and some other systems require testing for sys/types.h
4823 7.1.149 completion menu messed up when using the scroll bar
+ 1759 7.1.150 Visual mode "p" doesn't work when 'clipboard' has "unnamed"
+ 2108 7.1.151 lalloc(0) error for line completion with 'ic' and 'inf' set
+ 3183 7.1.152 display problem when 'hls' and 'cursorcolumn' are set
+ 4610 7.1.153 compiler warnings on SGI
+ 1547 7.1.154 (after 7.1.152) compiler warning for signed/unsigned compare
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1080&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Nov 10 07:29:58 2007
@@ -1,7 +1,7 @@
-vim (1:7.1-149+1) UNRELEASED; urgency=low
+vim (1:7.1-154+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (139 - 149), see README.gz for details.
+ * New upstream patches (139 - 154), see README.gz for details.
[ James Vega ]
* ftplugin/debchangelog.vim:
@@ -14,6 +14,8 @@
* Added patches:
- sh.vim_syntax.diff, which fixes the syntax highlighting of escaped
single-quotes. (Closes: #425443)
+ - gnuada.diff, which updates the ada runtime files so they gracefully
+ handle the user not having certain variables defined. (Closes: #440221)
* syntax/debcontrol.vim:
- Add syntax highlighting for Vcs-* control fields. (Closes: #448543)
* Bump debhelper compat to 5.
@@ -27,7 +29,7 @@
* debian/rules:
- Add binary-arch target for the vim-dbg package.
- -- James Vega <jamessan at debian.org> Wed, 07 Nov 2007 19:37:53 -0500
+ -- James Vega <jamessan at debian.org> Sat, 10 Nov 2007 00:48:17 -0500
vim (1:7.1-138+1) unstable; urgency=medium
Added: trunk/packages/vim/patches/gnuada.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/gnuada.diff?rev=1080&op=file
==============================================================================
--- trunk/packages/vim/patches/gnuada.diff (added)
+++ trunk/packages/vim/patches/gnuada.diff Sat Nov 10 07:29:58 2007
@@ -1,0 +1,556 @@
+Index: vim/runtime/autoload/ada.vim
+===================================================================
+--- vim/runtime/autoload/ada.vim.orig
++++ vim/runtime/autoload/ada.vim
+@@ -1,14 +1,16 @@
+ "------------------------------------------------------------------------------
+ " Description: Perform Ada specific completion & tagging.
+ " Language: Ada (2005)
+-" $Id: ada.vim,v 1.1 2007/05/05 18:02:22 vimboss Exp $
+-" Maintainer: Martin Krischik
++" $Id: ada.vim 774 2007-09-17 09:11:59Z krischik $
++" Maintainer: Martin Krischik <krischik at users.sourceforge.net>
++" Taylor Venable <taylor at metasyntax.net>
+ " Neil Bird <neil at fnxweb.com>
+-" $Author: vimboss $
+-" $Date: 2007/05/05 18:02:22 $
+-" Version: 4.2
+-" $Revision: 1.1 $
+-" $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
++" Ned Okie <nokie at radford.edu>
++" $Author: krischik $
++" $Date: 2007-09-17 05:11:59 -0400 (Mon, 17 Sep 2007) $
++" Version: 4.5
++" $Revision: 774 $
++" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/tags/vim-ada-mode/4.3.9/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,7 +431,15 @@
+ execute '!ctags --excmd=number ' . l:Filename
+ endfunction ada#Create_Tags
+
+-function ada#Switch_Session (New_Session) "{{{1
++" 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
++ "
++ set sessionoptions=buffers,curdir,folds,globals,resize,slash,tabpages,tabpages,unix,winpos,winsize
++
+ if a:New_Session != v:this_session
+ "
+ " We actualy got a new session - otherwise there
+@@ -437,18 +451,23 @@
+
+ let v:this_session = a:New_Session
+
+- if filereadable (v:this_session)
+- execute 'source ' . v:this_session
+- endif
++ "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
+
+ return
+-endfunction ada#Switch_Session "}}}1
++endfunction ada#Switch_Session
+
+ " Section: GNAT Pretty Printer folding {{{1
+ "
+@@ -546,18 +565,23 @@
+ \ 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 +590,15 @@
+ " 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)
+Index: vim/runtime/autoload/adacomplete.vim
+===================================================================
+--- vim/runtime/autoload/adacomplete.vim.orig
++++ vim/runtime/autoload/adacomplete.vim
+@@ -1,13 +1,13 @@
+ "------------------------------------------------------------------------------
+ " Description: Vim Ada omnicompletion file
+ " Language: Ada (2005)
+-" $Id: adacomplete.vim,v 1.1 2007/05/05 17:34:16 vimboss Exp $
+-" Maintainer: Martin Krischik
+-" $Author: vimboss $
+-" $Date: 2007/05/05 17:34:16 $
+-" Version: 4.2
+-" $Revision: 1.1 $
+-" $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/adacomplete.vim $
++" $Id: adacomplete.vim 774 2007-09-17 09:11:59Z krischik $
++" Maintainer: Martin Krischik <krischik at users.sourceforge.net>
++" $Author: krischik $
++" $Date: 2007-09-17 05:11:59 -0400 (Mon, 17 Sep 2007) $
++" Version: 4.5
++" $Revision: 774 $
++" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/tags/vim-ada-mode/4.3.9/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
+Index: vim/runtime/autoload/decada.vim
+===================================================================
+--- vim/runtime/autoload/decada.vim.orig
++++ vim/runtime/autoload/decada.vim
+@@ -1,14 +1,14 @@
+ "------------------------------------------------------------------------------
+ " Description: Vim Ada/Dec Ada compiler file
+ " Language: Ada (Dec Ada)
+-" $Id: decada.vim,v 1.1 2007/05/05 17:25:32 vimboss Exp $
++" $Id: decada.vim 774 2007-09-17 09:11:59Z krischik $
+ " Copyright: Copyright (C) 2006 Martin Krischik
+-" Maintainer: Martin Krischik
+-" $Author: vimboss $
+-" $Date: 2007/05/05 17:25:32 $
+-" Version: 4.2
+-" $Revision: 1.1 $
+-" $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/decada.vim $
++" Maintainer: Martin Krischik <krischik at users.sourceforge.net>
++" $Author: krischik $
++" $Date: 2007-09-17 05:11:59 -0400 (Mon, 17 Sep 2007) $
++" Version: 4.5
++" $Revision: 774 $
++" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/tags/vim-ada-mode/4.3.9/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 @@
+ 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
+Index: vim/runtime/autoload/gnat.vim
+===================================================================
+--- vim/runtime/autoload/gnat.vim.orig
++++ vim/runtime/autoload/gnat.vim
+@@ -1,14 +1,15 @@
+ "------------------------------------------------------------------------------
+ " Description: Vim Ada/GNAT compiler file
+ " Language: Ada (GNAT)
+-" $Id: gnat.vim,v 1.1 2007/05/05 18:18:20 vimboss Exp $
++" $Id: gnat.vim 774 2007-09-17 09:11:59Z krischik $
+ " Copyright: Copyright (C) 2006 Martin Krischik
+-" Maintainer: Martin Krischik
+-" $Author: vimboss $
+-" $Date: 2007/05/05 18:18:20 $
+-" Version: 4.2
+-" $Revision: 1.1 $
+-" $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/gnat.vim $
++" Maintainer: Martin Krischi <krischik at users.sourceforge.net>k
++" Ned Okie <nokie at radford.edu>
++" $Author: krischik $
++" $Date: 2007-09-17 05:11:59 -0400 (Mon, 17 Sep 2007) $
++" Version: 4.5
++" $Revision: 774 $
++" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/tags/vim-ada-mode/4.3.9/vim/autoload/gnat.vim $
+ " History: 24.05.2006 MK Unified Headers
+ " 16.07.2006 MK Ada-Mode as vim-ball
+ " 05.08.2006 MK Add session support
+@@ -16,6 +17,7 @@
+ " 05.11.2006 MK Bram suggested not to use include protection for
+ " autoload
+ " 05.11.2006 MK Bram suggested to save on spaces
++" 19.09.2007 NO use project file only when there is a project
+ " Help Page: compiler-gnat
+ "------------------------------------------------------------------------------
+
+@@ -71,13 +73,19 @@
+ execute 'mksession! ' . v:this_session
+ endif
+
+- if strlen (self.Project_File) > 0
+- call ada#Switch_Session (
+- \ expand('~') . "/vimfiles/session/" .
+- \ fnamemodify (self.Project_File, ":t:r") . ".vim")
+- else
+- call ada#Switch_Session ('')
+- endif
++ "if strlen (self.Project_File) > 0
++ "if has("vms")
++ "call ada#Switch_Session (
++ "\ expand('~')[0:-2] . ".vimfiles.session]gnat_" .
++ "\ fnamemodify (self.Project_File, ":t:r") . ".vim")
++ "else
++ "call ada#Switch_Session (
++ "\ expand('~') . "/vimfiles/session/gnat_" .
++ "\ fnamemodify (self.Project_File, ":t:r") . ".vim")
++ "endif
++ "else
++ "call ada#Switch_Session ('')
++ "endif
+
+ return
+ endfunction gnat#Set_Project_File " }}}1
+Index: vim/runtime/compiler/decada.vim
+===================================================================
+--- vim/runtime/compiler/decada.vim.orig
++++ vim/runtime/compiler/decada.vim
+@@ -1,16 +1,17 @@
+ "------------------------------------------------------------------------------
+ " Description: Vim Ada/Dec Ada compiler file
+ " Language: Ada (Dec Ada)
+-" $Id: decada.vim,v 1.1 2007/05/05 18:09:54 vimboss Exp $
++" $Id: decada.vim 774 2007-09-17 09:11:59Z krischik $
+ " Copyright: Copyright (C) 2006 Martin Krischik
+-" Maintainer: Martin Krischik
+-" $Author: vimboss $
+-" $Date: 2007/05/05 18:09:54 $
+-" Version: 4.2
+-" $Revision: 1.1 $
+-" $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/compiler/decada.vim $
++" Maintainer: Martin Krischik <krischik at users.sourceforge.net>
++" $Author: krischik $
++" $Date: 2007-09-17 05:11:59 -0400 (Mon, 17 Sep 2007) $
++" Version: 4.5
++" $Revision: 774 $
++" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/tags/vim-ada-mode/4.3.9/vim/compiler/decada.vim $
+ " History: 21.07.2006 MK New Dec Ada
+ " 15.10.2006 MK Bram's suggestion for runtime integration
++" 08.09.2006 MK Correct double load protection.
+ " Help Page: compiler-decada
+ "------------------------------------------------------------------------------
+
+@@ -24,6 +25,13 @@
+
+ if !exists("g:decada")
+ let g:decada = decada#New ()
++
++ call ada#Map_Menu (
++ \'Dec Ada.Build',
++ \'<F7>',
++ \'call decada.Make ()')
++
++ call g:decada.Set_Session ()
+ endif
+
+ if exists(":CompilerSet") != 2
+@@ -33,16 +41,9 @@
+ command -nargs=* CompilerSet setlocal <args>
+ endif
+
+-call g:decada.Set_Session ()
+-
+ execute "CompilerSet makeprg=" . escape (g:decada.Make_Command, ' ')
+ execute "CompilerSet errorformat=" . escape (g:decada.Error_Format, ' ')
+
+-call ada#Map_Menu (
+- \'Dec Ada.Build',
+- \'<F7>',
+- \'call decada.Make ()')
+-
+ finish " 1}}}
+
+ "------------------------------------------------------------------------------
+Index: vim/runtime/compiler/gnat.vim
+===================================================================
+--- vim/runtime/compiler/gnat.vim.orig
++++ vim/runtime/compiler/gnat.vim
+@@ -1,17 +1,19 @@
+ "------------------------------------------------------------------------------
+ " Description: Vim Ada/GNAT compiler file
+ " Language: Ada (GNAT)
+-" $Id: gnat.vim,v 1.1 2007/05/05 18:04:19 vimboss Exp $
++" $Id: gnat.vim 774 2007-09-17 09:11:59Z krischik $
+ " Copyright: Copyright (C) 2006 Martin Krischik
+-" Maintainer: Martin Krischik
+-" $Author: vimboss $
+-" $Date: 2007/05/05 18:04:19 $
+-" Version: 4.2
+-" $Revision: 1.1 $
+-" $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/compiler/gnat.vim $
++" Maintainer: Martin Krischi <krischik at users.sourceforge.net>k
++" Ned Okie <nokie at radford.edu>
++" $Author: krischik $
++" $Date: 2007-09-17 05:11:59 -0400 (Mon, 17 Sep 2007) $
++" Version: 4.5
++" $Revision: 774 $
++" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/tags/vim-ada-mode/4.3.9/vim/compiler/gnat.vim $
+ " History: 24.05.2006 MK Unified Headers
+ " 16.07.2006 MK Ada-Mode as vim-ball
+ " 15.10.2006 MK Bram's suggestion for runtime integration
++" 19.09.2007 NO use project file only when there is a project
+ " Help Page: compiler-gnat
+ "------------------------------------------------------------------------------
+
+@@ -46,6 +48,8 @@
+ \ 'GNAT.Set Projectfile\.\.\.',
+ \ ':SetProject',
+ \ 'call gnat.Set_Project_File ()')
++
++ call g:gnat.Set_Session ()
+ endif
+
+ if exists(":CompilerSet") != 2
+@@ -55,8 +59,6 @@
+ command -nargs=* CompilerSet setlocal <args>
+ endif
+
+-call g:gnat.Set_Session ()
+-
+ execute "CompilerSet makeprg=" . escape (g:gnat.Get_Command('Make'), ' ')
+ execute "CompilerSet errorformat=" . escape (g:gnat.Error_Format, ' ')
+
+Index: vim/runtime/ftplugin/ada.vim
+===================================================================
+--- vim/runtime/ftplugin/ada.vim.orig
++++ vim/runtime/ftplugin/ada.vim
+@@ -1,14 +1,15 @@
+ "------------------------------------------------------------------------------
+ " Description: Perform Ada specific completion & tagging.
+ " Language: Ada (2005)
+-" $Id: ada.vim,v 1.3 2007/05/05 17:17:45 vimboss Exp $
+-" Maintainer: Martin Krischik
++" $Id: ada.vim 774 2007-09-17 09:11:59Z krischik $
++" Maintainer: Martin Krischik <krischik at users.sourceforge.net>
++" Taylor Venable <taylor at metasyntax.net>
+ " Neil Bird <neil at fnxweb.com>
+-" $Author: vimboss $
+-" $Date: 2007/05/05 17:17:45 $
+-" Version: 4.2
+-" $Revision: 1.3 $
+-" $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/ftplugin/ada.vim $
++" $Author: krischik $
++" $Date: 2007-09-17 05:11:59 -0400 (Mon, 17 Sep 2007) $
++" Version: 4.5
++" $Revision: 774 $
++" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/tags/vim-ada-mode/4.3.9/vim/ftplugin/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 +18,7 @@
+ " 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 default compiler problems.
+ " Help Page: ft-ada-plugin
+ "------------------------------------------------------------------------------
+ " Provides mapping overrides for tag jumping that figure out the current
+@@ -30,7 +32,7 @@
+ endif
+
+ " Don't load another plugin for this buffer
+-let b:did_ftplugin = 38
++let b:did_ftplugin = 45
+
+ "
+ " Temporarily set cpoptions to ensure the script loads OK
+@@ -104,8 +106,17 @@
+ \ s:notend . '\<record\>:\<end\>\s\+\<record\>'
+ endif
+
++
+ " Section: Compiler {{{1
+ "
++if ! exists("g:ada_default_compiler")
++ if has("vms")
++ let g:ada_default_compiler = 'decada'
++ else
++ let g:ada_default_compiler = 'gnat'
++ endif
++endif
++
+ if ! exists("current_compiler") ||
+ \ current_compiler != g:ada_default_compiler
+ execute "compiler " . g:ada_default_compiler
+Index: vim/runtime/indent/ada.vim
+===================================================================
+--- vim/runtime/indent/ada.vim.orig
++++ vim/runtime/indent/ada.vim
+@@ -1,19 +1,21 @@
+ "------------------------------------------------------------------------------
+ " Description: Vim Ada indent file
+ " Language: Ada (2005)
+-" $Id: ada.vim,v 1.4 2007/05/05 17:25:37 vimboss Exp $
++" $Id: ada.vim 774 2007-09-17 09:11:59Z krischik $
+ " Copyright: Copyright (C) 2006 Martin Krischik
+-" Maintainer: Martin Krischik
++" Maintainer: Martin Krischik <krischik at users.sourceforge.net>
+ " Neil Bird <neil at fnxweb.com>
+-" $Author: vimboss $
+-" $Date: 2007/05/05 17:25:37 $
+-" Version: 4.2
+-" $Revision: 1.4 $
+-" $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/indent/ada.vim $
++" Ned Okie <nokie at radford.edu>
++" $Author: krischik $
++" $Date: 2007-09-17 05:11:59 -0400 (Mon, 17 Sep 2007) $
++" Version: 4.5
++" $Revision: 774 $
++" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/tags/vim-ada-mode/4.3.9/vim/indent/ada.vim $
+ " History: 24.05.2006 MK Unified Headers
+ " 16.07.2006 MK Ada-Mode as vim-ball
+ " 15.10.2006 MK Bram's suggestion for runtime integration
+ " 05.11.2006 MK Bram suggested to save on spaces
++" 19.09.2007 NO g: missing before ada#Comment
+ " Help Page: ft-vim-indent
+ "------------------------------------------------------------------------------
+ " ToDo:
+@@ -27,7 +29,7 @@
+ finish
+ endif
+
+-let b:did_indent = 1
++let b:did_indent = 45
+
+ setlocal indentexpr=GetAdaIndent()
+ setlocal indentkeys-=0{,0}
+@@ -58,7 +60,7 @@
+ " Seems to work OK as it 'starts' with the indent of the /previous/ line.
+ function s:MainBlockIndent (prev_indent, prev_lnum, blockstart, stop_at)
+ let lnum = a:prev_lnum
+- let line = substitute( getline(lnum), ada#Comment, '', '' )
++ let line = substitute( getline(lnum), g:ada#Comment, '', '' )
+ while lnum > 1
+ if a:stop_at != '' && line =~ '^\s*' . a:stop_at && indent(lnum) < a:prev_indent
+ return a:prev_indent
+@@ -72,7 +74,7 @@
+ let lnum = prevnonblank(lnum - 1)
+ " Get previous non-blank/non-comment-only line
+ while 1
+- let line = substitute( getline(lnum), ada#Comment, '', '' )
++ let line = substitute( getline(lnum), g:ada#Comment, '', '' )
+ if line !~ '^\s*$' && line !~ '^\s*#'
+ break
+ endif
+@@ -116,7 +118,7 @@
+ " Get previous non-blank/non-comment-only line
+ while 1
+ let line = getline(lnum)
+- let line = substitute( line, ada#Comment, '', '' )
++ let line = substitute( line, g:ada#Comment, '', '' )
+ if line !~ '^\s*$'
+ break
+ endif
+@@ -143,7 +145,8 @@
+ let lnum = prevnonblank(lnum - 1)
+ " Get previous non-blank/non-comment-only line
+ while 1
+- let line = substitute( getline(lnum), ada#Comment, '', '' )
++ let line = substitute( getline(lnum), g:ada#Comment, '', '' )
++
+ if line !~ '^\s*$' && line !~ '^\s*#'
+ break
+ endif
+@@ -222,7 +225,7 @@
+ exe lnum
+ exe 'normal! $F)%'
+ if getline('.') =~ '^\s*('
+- " Dire layout - use previous indent (could check for ada#Comment here)
++ " Dire layout - use previous indent (could check for g:ada#Comment here)
+ let ind = indent( prevnonblank( line('.')-1 ) )
+ else
+ let ind = indent('.')
+Index: vim/runtime/syntax/ada.vim
+===================================================================
+--- vim/runtime/syntax/ada.vim.orig
++++ vim/runtime/syntax/ada.vim
+@@ -1,17 +1,17 @@
+ "----------------------------------------------------------------------------
+ " Description: Vim Ada syntax file
+ " Language: Ada (2005)
+-" $Id: ada.vim,v 1.2 2007/05/05 18:22:26 vimboss Exp $
++" $Id: ada.vim 774 2007-09-17 09:11:59Z krischik $
+ " Copyright: Copyright (C) 2006 Martin Krischik
+ " Maintainer: Martin Krischik
+ " David A. Wheeler <dwheeler at dwheeler.com>
+ " Simon Bradley <simon.bradley at pitechnology.com>
+ " Contributors: Preben Randhol.
+-" $Author: vimboss $
+-" $Date: 2007/05/05 18:22:26 $
+-" Version: 4.2
+-" $Revision: 1.2 $
+-" $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/syntax/ada.vim $
++" $Author: krischik $
++" $Date: 2007-09-17 05:11:59 -0400 (Mon, 17 Sep 2007) $
++" Version: 4.5
++" $Revision: 774 $
++" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/tags/vim-ada-mode/4.3.9/vim/syntax/ada.vim $
+ " http://www.dwheeler.com/vim
+ " History: 24.05.2006 MK Unified Headers
+ " 26.05.2006 MK ' should not be in iskeyword.
+@@ -98,7 +98,8 @@
+ "
+ if exists("g:ada_rainbow_color")
+ syntax match adaSpecial "[:;.,]"
+- runtime plugin/Rainbow_Parenthsis.vim
++ call rainbow_parenthsis#LoadSyntax ()
++ call rainbow_parenthsis#Activate ()
+ else
+ syntax match adaSpecial "[:;().,]"
+ endif
+@@ -159,7 +160,7 @@
+ " Section: end {{{1
+ " Unless special ("end loop", "end if", etc.), "end" marks the end of a
+ " begin, package, task etc. Assiging it to adaEnd.
+-syntax match adaEnd "\<end\>"
++syntax match adaEnd /\<end\>/
+
+ syntax keyword adaPreproc pragma
+
Added: trunk/packages/vim/upstream/patches/7.1.150
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.150?rev=1080&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.150 (added)
+++ trunk/packages/vim/upstream/patches/7.1.150 Sat Nov 10 07:29:58 2007
@@ -1,0 +1,59 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.150
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.150
+Problem: When 'clipboard' has "unnamed" using "p" in Visual mode doesn't
+ work correctly. (Jianrong Yu)
+Solution: When 'clipboard' has "unnamed" also obtain the selection when
+ getting the default register.
+Files: src/ops.c
+
+
+*** ../vim-7.1.149/src/ops.c Tue Sep 25 14:19:35 2007
+--- src/ops.c Sun Oct 28 13:58:35 2007
+***************
+*** 933,941 ****
+ #ifdef FEAT_CLIPBOARD
+ /* When Visual area changed, may have to update selection. Obtain the
+ * selection too. */
+! if (name == '*' && clip_star.available && clip_isautosel())
+ {
+! clip_update_selection();
+ may_get_selection(name);
+ }
+ #endif
+--- 933,942 ----
+ #ifdef FEAT_CLIPBOARD
+ /* When Visual area changed, may have to update selection. Obtain the
+ * selection too. */
+! if (name == '*' && clip_star.available)
+ {
+! if (clip_isautosel())
+! clip_update_selection();
+ may_get_selection(name);
+ }
+ #endif
+*** ../vim-7.1.149/src/version.c Tue Nov 6 22:26:39 2007
+--- src/version.c Thu Nov 8 10:34:18 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 150,
+ /**/
+
+--
+From "know your smileys":
+ 8<}} Glasses, big nose, beard
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.151
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.151?rev=1080&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.151 (added)
+++ trunk/packages/vim/upstream/patches/7.1.151 Sat Nov 10 07:29:58 2007
@@ -1,0 +1,70 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.151
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.151
+Problem: Using whole line completion with 'ignorecase' and 'infercase' set
+ and the line is empty get an lalloc(0) error.
+Solution: Don't try changing case for an empty match. (Matthew Wozniski)
+Files: src/edit.c
+
+
+*** ../vim-7.1.150/src/edit.c Tue Nov 6 22:26:39 2007
+--- src/edit.c Sun Nov 4 16:17:42 2007
+***************
+*** 2111,2117 ****
+ int has_lower = FALSE;
+ int was_letter = FALSE;
+
+! if (p_ic && curbuf->b_p_inf)
+ {
+ /* Infer case of completed part. */
+
+--- 2111,2117 ----
+ int has_lower = FALSE;
+ int was_letter = FALSE;
+
+! if (p_ic && curbuf->b_p_inf && len > 0)
+ {
+ /* Infer case of completed part. */
+
+***************
+*** 2225,2231 ****
+ wca[i] = MB_TOUPPER(wca[i]);
+ }
+
+! /*
+ * Generate encoding specific output from wide character array.
+ * Multi-byte characters can occupy up to five bytes more than
+ * ASCII characters, and we also need one byte for NUL, so stay
+--- 2225,2231 ----
+ wca[i] = MB_TOUPPER(wca[i]);
+ }
+
+! /*
+ * Generate encoding specific output from wide character array.
+ * Multi-byte characters can occupy up to five bytes more than
+ * ASCII characters, and we also need one byte for NUL, so stay
+*** ../vim-7.1.150/src/version.c Thu Nov 8 10:35:02 2007
+--- src/version.c Thu Nov 8 13:01:34 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 151,
+ /**/
+
+--
+From "know your smileys":
+ %-) After staring at screen for 15 hours
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.152
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.152?rev=1080&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.152 (added)
+++ trunk/packages/vim/upstream/patches/7.1.152 Sat Nov 10 07:29:58 2007
@@ -1,0 +1,118 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.152
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.152
+Problem: Display problem when 'hls' and 'cursorcolumn' are set and
+ searching for "$". (John Mullin) Also when scrolling
+ horizontally when 'wrap' is off.
+Solution: Keep track of the column where highlighting was set. Check the
+ column offset when skipping characters.
+Files: src/screen.c
+
+
+*** ../vim-7.1.151/src/screen.c Mon Sep 17 22:37:05 2007
+--- src/screen.c Fri Oct 19 15:18:49 2007
+***************
+*** 2599,2604 ****
+--- 2599,2605 ----
+ int syntax_attr = 0; /* attributes desired by syntax */
+ int has_syntax = FALSE; /* this buffer has syntax highl. */
+ int save_did_emsg;
++ int eol_hl_off = 0; /* 1 if highlighted char after EOL */
+ #endif
+ #ifdef FEAT_SPELL
+ int has_spell = FALSE; /* this buffer has spell checking */
+***************
+*** 4312,4317 ****
+--- 4313,4322 ----
+ {
+ #ifdef FEAT_SEARCH_EXTRA
+ long prevcol = (long)(ptr - line) - (c == NUL);
++
++ /* we're not really at that column when skipping some text */
++ if ((wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
++ ++prevcol;
+ #endif
+
+ /* invert at least one char, used for Visual and empty line or
+***************
+*** 4408,4418 ****
+--- 4413,4432 ----
+ ScreenAttrs[off] = char_attr;
+ #ifdef FEAT_RIGHTLEFT
+ if (wp->w_p_rl)
++ {
+ --col;
++ --off;
++ }
+ else
+ #endif
++ {
+ ++col;
++ ++off;
++ }
+ ++vcol;
++ #ifdef FEAT_SYN_HL
++ eol_hl_off = 1;
++ #endif
+ }
+ }
+
+***************
+*** 4422,4427 ****
+--- 4436,4449 ----
+ if (c == NUL)
+ {
+ #ifdef FEAT_SYN_HL
++ if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol)
++ {
++ /* highlight last char after line */
++ --col;
++ --off;
++ --vcol;
++ }
++
+ /* Highlight 'cursorcolumn' past end of the line. */
+ if (wp->w_p_wrap)
+ v = wp->w_skipcol;
+***************
+*** 4432,4438 ****
+
+ vcol = v + col - win_col_off(wp);
+ if (wp->w_p_cuc
+! && (int)wp->w_virtcol >= vcol
+ && (int)wp->w_virtcol < W_WIDTH(wp) * (row - startrow + 1)
+ + v
+ && lnum != wp->w_cursor.lnum
+--- 4454,4460 ----
+
+ vcol = v + col - win_col_off(wp);
+ if (wp->w_p_cuc
+! && (int)wp->w_virtcol >= vcol - eol_hl_off
+ && (int)wp->w_virtcol < W_WIDTH(wp) * (row - startrow + 1)
+ + v
+ && lnum != wp->w_cursor.lnum
+*** ../vim-7.1.151/src/version.c Thu Nov 8 13:03:33 2007
+--- src/version.c Thu Nov 8 14:48:59 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 152,
+ /**/
+
+--
+From "know your smileys":
+ 2B|^2B Message from Shakespeare
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.153
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.153?rev=1080&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.153 (added)
+++ trunk/packages/vim/upstream/patches/7.1.153 Sat Nov 10 07:29:58 2007
@@ -1,0 +1,143 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.153
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.153
+Problem: Compiler warnings on SGI. Undefined XpmAllocColor (Charles
+ Campbell)
+Solution: Add type casts. Init st_dev and st_ino separately. Don't use
+ type casts for vim_snprintf() when HAVE_STDARG_H is defined.
+ Define XpmAllocColor when needed.
+Files: src/eval.c, src/ex_cmds.c, src/fileio.c, src/misc2.c,
+ src/gui_xmebw.c
+
+
+*** ../vim-7.1.152/src/eval.c Tue Oct 2 22:07:58 2007
+--- src/eval.c Mon Oct 1 20:56:09 2007
+***************
+*** 8729,8735 ****
+ static int fnum = 0;
+ static int change_start = 0;
+ static int change_end = 0;
+! static hlf_T hlID = 0;
+ int filler_lines;
+ int col;
+
+--- 8729,8735 ----
+ static int fnum = 0;
+ static int change_start = 0;
+ static int change_end = 0;
+! static hlf_T hlID = (hlf_T)0;
+ int filler_lines;
+ int col;
+
+*** ../vim-7.1.152/src/ex_cmds.c Thu Sep 13 18:25:08 2007
+--- src/ex_cmds.c Thu Sep 13 16:19:40 2007
+***************
+*** 1774,1780 ****
+ * overwrite a user's viminfo file after a "su root", with a
+ * viminfo file that the user can't read.
+ */
+! st_old.st_dev = st_old.st_ino = 0;
+ st_old.st_mode = 0600;
+ if (mch_stat((char *)fname, &st_old) == 0
+ && getuid() != ROOT_UID
+--- 1774,1781 ----
+ * overwrite a user's viminfo file after a "su root", with a
+ * viminfo file that the user can't read.
+ */
+! st_old.st_dev = 0;
+! st_old.st_ino = 0;
+ st_old.st_mode = 0600;
+ if (mch_stat((char *)fname, &st_old) == 0
+ && getuid() != ROOT_UID
+*** ../vim-7.1.152/src/fileio.c Mon Oct 29 22:37:57 2007
+--- src/fileio.c Mon Oct 22 21:10:00 2007
+***************
+*** 3209,3215 ****
+ * Get information about original file (if there is one).
+ */
+ #if defined(UNIX) && !defined(ARCHIE)
+! st_old.st_dev = st_old.st_ino = 0;
+ perm = -1;
+ if (mch_stat((char *)fname, &st_old) < 0)
+ newfile = TRUE;
+--- 3209,3216 ----
+ * Get information about original file (if there is one).
+ */
+ #if defined(UNIX) && !defined(ARCHIE)
+! st_old.st_dev = 0;
+! st_old.st_ino = 0;
+ perm = -1;
+ if (mch_stat((char *)fname, &st_old) < 0)
+ newfile = TRUE;
+*** ../vim-7.1.152/src/misc2.c Sun Oct 7 15:44:28 2007
+--- src/misc2.c Sun Sep 30 18:00:09 2007
+***************
+*** 5924,5930 ****
+--- 5925,5935 ----
+ {
+ if (emsg_not_now())
+ return TRUE; /* no error messages at the moment */
++ #ifdef HAVE_STDARG_H
++ vim_snprintf((char *)IObuff, IOSIZE, (char *)s, a1, a2);
++ #else
+ vim_snprintf((char *)IObuff, IOSIZE, (char *)s, (long_u)a1, (long_u)a2);
++ #endif
+ return emsg(IObuff);
+ }
+
+*** ../vim-7.1.152/src/gui_xmebw.c Thu May 10 19:46:55 2007
+--- src/gui_xmebw.c Thu Sep 6 12:57:51 2007
+***************
+*** 395,405 ****
+
+ /* Create the "highlight" pixmap. */
+ color[4].pixel = eb->primitive.bottom_shadow_color;
+ attr.valuemask = XpmColorSymbols | XpmCloseness | XpmAllocColor;
+ attr.closeness = 65535; /* accuracy isn't crucial */
+ attr.colorsymbols = color;
+ attr.numsymbols = XtNumber(color);
+- attr.alloc_color = alloc_color;
+
+ status = XpmCreatePixmapFromData(dpy, root, data, &pix, NULL, &attr);
+ XpmFreeAttributes(&attr);
+--- 395,409 ----
+
+ /* Create the "highlight" pixmap. */
+ color[4].pixel = eb->primitive.bottom_shadow_color;
++ #ifdef XpmAllocColor /* SGI doesn't have it */
+ attr.valuemask = XpmColorSymbols | XpmCloseness | XpmAllocColor;
++ attr.alloc_color = alloc_color;
++ #else
++ attr.valuemask = XpmColorSymbols | XpmCloseness;
++ #endif
+ attr.closeness = 65535; /* accuracy isn't crucial */
+ attr.colorsymbols = color;
+ attr.numsymbols = XtNumber(color);
+
+ status = XpmCreatePixmapFromData(dpy, root, data, &pix, NULL, &attr);
+ XpmFreeAttributes(&attr);
+*** ../vim-7.1.152/src/version.c Thu Nov 8 14:50:58 2007
+--- src/version.c Thu Nov 8 20:45:56 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 153,
+ /**/
+
+--
+From "know your smileys":
+ @:-() Elvis Presley
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.154
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.154?rev=1080&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.154 (added)
+++ trunk/packages/vim/upstream/patches/7.1.154 Sat Nov 10 07:29:58 2007
@@ -1,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.154
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.154
+Problem: Compiler warning for signed/unsigned compare.
+Solution: Add type cast.
+Files: src/screen.c
+
+
+*** ../vim-7.1.153/src/screen.c Thu Nov 8 14:50:58 2007
+--- src/screen.c Thu Nov 8 21:18:46 2007
+***************
+*** 4315,4321 ****
+ long prevcol = (long)(ptr - line) - (c == NUL);
+
+ /* we're not really at that column when skipping some text */
+! if ((wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
+ ++prevcol;
+ #endif
+
+--- 4315,4321 ----
+ long prevcol = (long)(ptr - line) - (c == NUL);
+
+ /* we're not really at that column when skipping some text */
+! if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
+ ++prevcol;
+ #endif
+
+*** ../vim-7.1.153/src/version.c Thu Nov 8 20:47:34 2007
+--- src/version.c Thu Nov 8 21:19:59 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 154,
+ /**/
+
+--
+From "know your smileys":
+ :-F Bucktoothed vampire with one tooth missing
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
More information about the pkg-vim-maintainers
mailing list