r315 - in trunk/vim: debian upstream/patches

Pierre Habouzit madcoder-guest at costa.debian.org
Sun Sep 25 16:17:15 UTC 2005


Author: madcoder-guest
Date: 2005-09-25 16:17:14 +0000 (Sun, 25 Sep 2005)
New Revision: 315

Added:
   trunk/vim/upstream/patches/6.3.087
   trunk/vim/upstream/patches/6.3.088
Modified:
   trunk/vim/debian/README
   trunk/vim/debian/changelog
Log:
upstream patches 87 and 88

Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2005-09-24 09:06:32 UTC (rev 314)
+++ trunk/vim/debian/README	2005-09-25 16:17:14 UTC (rev 315)
@@ -111,3 +111,5 @@
   6773  6.3.084  (extra) Cygwin: update src makefile and add src/po makefile
   3408  6.3.085  crash in syntax highlighting
  10618  6.3.086  (extra) Russian translation has a few mistakes
+  1471  6.3.087  Win32: crash when expanding file name when there isn't one
+  2269  6.3.088  editing ".in" causes error E218

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-09-24 09:06:32 UTC (rev 314)
+++ trunk/vim/debian/changelog	2005-09-25 16:17:14 UTC (rev 315)
@@ -1,5 +1,7 @@
-vim (1:6.3-086+2) UNRELEASED; urgency=low
+vim (1:6.3-088+1) UNRELEASED; urgency=low
 
+  * New upstream patches (087 to 088), see README.gz for details.
+
   * Norbert Tretkowski <nobse at debian.org>:
     + Updated Standards-Version to 3.6.2 (no changes needed).
     + Exec vim with -f parameter in .desktop file. (closes: #329292)
@@ -22,7 +24,7 @@
     + Added patch 203_zh_TW.UTF8.po.diff, which fixes a translation
       error in locale zh_TW.UTF-8. (closes: #319420)
 
- -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Wed, 21 Sep 2005 10:31:34 +0200
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Sun, 25 Sep 2005 18:15:39 +0200
 
 vim (1:6.3-086+1) unstable; urgency=low
 

Added: trunk/vim/upstream/patches/6.3.087
===================================================================
--- trunk/vim/upstream/patches/6.3.087	2005-09-24 09:06:32 UTC (rev 314)
+++ trunk/vim/upstream/patches/6.3.087	2005-09-25 16:17:14 UTC (rev 315)
@@ -0,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.087
+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 6.3.087
+Problem:    MS-DOS: Crash. (Jason Hood)
+Solution:   Don't call fname_case() with a NULL pointer.
+Files:	    src/ex_cmds.c
+
+
+*** ../vim-6.3.086/src/ex_cmds.c	Thu Jan 13 17:38:30 2005
+--- src/ex_cmds.c	Thu Jul 21 22:23:54 2005
+***************
+*** 2613,2619 ****
+  # ifdef USE_LONG_FNAME
+  	if (USE_LONG_FNAME)
+  # endif
+! 	    fname_case(sfname, 0);   /* set correct case for short file name */
+  #endif
+  
+  #ifdef FEAT_LISTCMDS
+--- 2613,2620 ----
+  # ifdef USE_LONG_FNAME
+  	if (USE_LONG_FNAME)
+  # endif
+! 	    if (sfname != NULL)
+! 		fname_case(sfname, 0);   /* set correct case for sfname */
+  #endif
+  
+  #ifdef FEAT_LISTCMDS
+*** ../vim-6.3.086/src/version.c	Fri Jul 29 09:59:24 2005
+--- src/version.c	Sun Sep 25 13:12:44 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     87,
+  /**/
+
+-- 
+MESKIMEN'S LAW
+    There's never time to do it right, but always time to do it over.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

Added: trunk/vim/upstream/patches/6.3.088
===================================================================
--- trunk/vim/upstream/patches/6.3.088	2005-09-24 09:06:32 UTC (rev 314)
+++ trunk/vim/upstream/patches/6.3.088	2005-09-25 16:17:14 UTC (rev 315)
@@ -0,0 +1,71 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.088
+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 6.3.088
+Problem:    Editing ".in" causes error E218. (Stefan Karlsson)
+Solution:   Require some characters before ".in".  Same for ".orig" and others.
+Files:	    runtime/filetype.vim
+
+
+*** ../vim-6.3.087/runtime/filetype.vim	Sun Sep 25 15:07:27 2005
+--- runtime/filetype.vim	Sun Sep 25 15:06:27 2005
+***************
+*** 16,22 ****
+  augroup filetypedetect
+  
+  " Ignored extensions
+! au BufNewFile,BufRead *.orig,*.bak,*.old,*.new,*.rpmsave,*.rpmnew
+  	\ exe "doau filetypedetect BufRead " . expand("<afile>:r")
+  au BufNewFile,BufRead *~
+  	\ let s:name = expand("<afile>") |
+--- 16,22 ----
+  augroup filetypedetect
+  
+  " Ignored extensions
+! au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.rpmsave,?\+.rpmnew
+  	\ exe "doau filetypedetect BufRead " . expand("<afile>:r")
+  au BufNewFile,BufRead *~
+  	\ let s:name = expand("<afile>") |
+***************
+*** 26,32 ****
+  	\ endif |
+  	\ unlet s:name |
+  	\ unlet s:short
+! au BufNewFile,BufRead *.in
+  	\ if expand("<afile>:t") != "configure.in" |
+  	\   exe "doau filetypedetect BufRead " . expand("<afile>:r") |
+  	\ endif
+--- 26,32 ----
+  	\ endif |
+  	\ unlet s:name |
+  	\ unlet s:short
+! au BufNewFile,BufRead ?\+.in
+  	\ if expand("<afile>:t") != "configure.in" |
+  	\   exe "doau filetypedetect BufRead " . expand("<afile>:r") |
+  	\ endif
+*** ../vim-6.3.087/src/version.c	Sun Sep 25 15:07:52 2005
+--- src/version.c	Sun Sep 25 13:17:51 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     88,
+  /**/
+
+-- 
+CRONE:  Who sent you?
+ARTHUR: The Knights Who Say Ni!
+CRONE:  Aaaagh!  (she looks around in rear) No!  We have no shrubberies here.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///




More information about the pkg-vim-maintainers mailing list