r782 - in /trunk/packages/vim: debian/changelog patches/gui_gtk.c-abs_path.diff patches/mp.vim-cmd_check.diff patches/series

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Mon Oct  9 02:29:25 2006
New Revision: 782

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=782
Log:
Add mp.vim-cmd_check.diff and gui_gtk.c-abs_path.diff patches.  Bump urgency to medium since we're closing RC bugs.

This package should be good to upload as the final version before the freeze.

Added:
    trunk/packages/vim/patches/gui_gtk.c-abs_path.diff
    trunk/packages/vim/patches/mp.vim-cmd_check.diff
Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/patches/series

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=782&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Oct  9 02:29:25 2006
@@ -1,7 +1,8 @@
-vim (1:7.0-121+1) unstable; urgency=low
+vim (1:7.0-121+1) unstable; urgency=medium
 
   [ Debian Vim Maintainers ]
   * New upstream patches (095 - 121), see README.gz for details.
+  * Urgency medium for RC bug fixes.
 
   [ James Vega ]
   * Since vim-gui-common no longer depends on vim-common (to allow for
@@ -16,6 +17,10 @@
   * Add a gnome-icon-theme Suggests for the packages which use a GTK/Gnome
     GUI.
   * Build vim-tiny with multibyte support. (closes: #361378)
+  * Add patch gui_gtk.c-abs_path.diff, which ensures the GTK file selection
+    dialog remembers the previously used directory. (closes: #368668)
+  * Add mp.vim-cmd_check.diff, which fixes an incorrect boolean check.
+    (closes: #384154)
 
   [ Stefano Zacchiroli ]
   * Added patches perl.vim-ftplugin_perldoc.diff,
@@ -23,7 +28,7 @@
     usage of perldoc/pydoc/ri for keyword lookup on perl/python/ruby files.
     (closes: #389332)
 
- -- James Vega <jamessan at debian.org>  Sun,  8 Oct 2006 13:44:18 -0400
+ -- James Vega <jamessan at debian.org>  Sun,  8 Oct 2006 19:32:57 -0400
 
 vim (1:7.0-094+1) unstable; urgency=medium
 

Added: trunk/packages/vim/patches/gui_gtk.c-abs_path.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/gui_gtk.c-abs_path.diff?rev=782&op=file
==============================================================================
--- trunk/packages/vim/patches/gui_gtk.c-abs_path.diff (added)
+++ trunk/packages/vim/patches/gui_gtk.c-abs_path.diff Mon Oct  9 02:29:25 2006
@@ -1,0 +1,23 @@
+Index: vim/src/gui_gtk.c
+===================================================================
+--- vim/src/gui_gtk.c.orig
++++ vim/src/gui_gtk.c
+@@ -1275,15 +1275,14 @@
+     title = CONVERT_TO_UTF8(title);
+ # endif
+ 
+-    /* Concatenate "initdir" and "dflt". */
++    /* GTK appears to insist on an absolute path. */
+     if (initdir == NULL || *initdir == NUL)
+ 	mch_dirname(dirbuf, MAXPATHL);
+-    else if (STRLEN(initdir) + 2 < MAXPATHL)
+-	STRCPY(dirbuf, initdir);
+-    else
++    else if (vim_FullName(initdir, dirbuf, MAXPATHL - 2, FALSE) == FAIL)
+ 	dirbuf[0] = NUL;
+     /* Always need a trailing slash for a directory. */
+     add_pathsep(dirbuf);
++    /* Concatenate "initdir" and "dflt". */
+     if (dflt != NULL && *dflt != NUL
+ 			      && STRLEN(dirbuf) + 2 + STRLEN(dflt) < MAXPATHL)
+ 	STRCAT(dirbuf, dflt);

Added: trunk/packages/vim/patches/mp.vim-cmd_check.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/mp.vim-cmd_check.diff?rev=782&op=file
==============================================================================
--- trunk/packages/vim/patches/mp.vim-cmd_check.diff (added)
+++ trunk/packages/vim/patches/mp.vim-cmd_check.diff Mon Oct  9 02:29:25 2006
@@ -1,0 +1,22 @@
+Index: vim/runtime/ftplugin/mp.vim
+===================================================================
+--- vim/runtime/ftplugin/mp.vim.orig
++++ vim/runtime/ftplugin/mp.vim
+@@ -1,7 +1,7 @@
+ " Vim filetype plugin file
+ " Language:         MetaPost
+ " Maintainer:       Nikolai Weibull <now at bitwi.se>
+-" Latest Revision:  2006-04-19
++" Latest Revision:  2006-07-04
+ 
+ if exists("b:did_ftplugin")
+   finish
+@@ -12,7 +12,7 @@
+ 
+ setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=croql
+ 
+-if !exists(":FixBeginfigs") != 2
++if exists(":FixBeginfigs") != 2
+   command -nargs=0 FixBeginfigs call s:fix_beginfigs()
+ 
+   function! s:fix_beginfigs()

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=782&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Mon Oct  9 02:29:25 2006
@@ -13,3 +13,5 @@
 ruby.vim-ftplugin_ri.diff -p0
 python.vim-ftplugin_pydoc.diff -p0
 zsh.vim-nested_quotes.diff -p0
+gui_gtk.c-abs_path.diff -p0
+mp.vim-cmd_check.diff -p0