r789 - in /trunk/packages/vim: debian/README debian/changelog patches/dosini.vim-hash_comment.diff patches/series upstream/patches/7.0.131 upstream/patches/7.0.132 upstream/patches/7.0.133

zack at users.alioth.debian.org zack at users.alioth.debian.org
Sat Oct 14 17:38:28 UTC 2006


Author: zack
Date: Sat Oct 14 17:38:27 2006
New Revision: 789

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=789
Log:
added patch which enables # comments in dosini files
upstream patches up to 133

Added:
    trunk/packages/vim/patches/dosini.vim-hash_comment.diff
    trunk/packages/vim/upstream/patches/7.0.131
    trunk/packages/vim/upstream/patches/7.0.132
    trunk/packages/vim/upstream/patches/7.0.133
Modified:
    trunk/packages/vim/debian/README
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/patches/series

Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=789&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sat Oct 14 17:38:27 2006
@@ -155,3 +155,6 @@
   2246  7.0.128  GUI: display not updated when cancelling exit dialog
   2884  7.0.129  GTK GUI: avoid GTK bug concerning directory for file dialog
   5509  7.0.130  (extra) MS-DOS, MS-Windows: may get stuck using a device name
+  2632  7.0.131  Win32: "vim -r" does not find swap files starting with a dot
+  2163  7.0.132  (after 7.0.130) crash when reading from stdin
+  3189  7.0.133  too many messages in history when searching included files

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=789&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Oct 14 17:38:27 2006
@@ -1,13 +1,17 @@
-vim (1:7.0-130+1) UNRELEASED; urgency=low
+vim (1:7.0-133+1) unstable; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream patches (123 - 130), see README.gz for details.
+  * New upstream patches (123 - 133), see README.gz for details.
 
   [ James Vega ]
   * Bump vim-common's priority to important to match the override.
   * Remove patch gui_gtk.c-abc_path.diff, merged upstream.
 
- -- James Vega <jamessan at debian.org>  Tue, 10 Oct 2006 13:23:53 -0400
+  [ Stefano Zacchiroli ]
+  * Added patch dosini.vim-hash_comment.diff which add support for # comments
+    in dosini syntax highlighting, thanks to Adeodato Simó. (closes: #378952)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sat, 14 Oct 2006 19:35:45 +0200
 
 vim (1:7.0-122+1) unstable; urgency=medium
 

Added: trunk/packages/vim/patches/dosini.vim-hash_comment.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/dosini.vim-hash_comment.diff?rev=789&op=file
==============================================================================
--- trunk/packages/vim/patches/dosini.vim-hash_comment.diff (added)
+++ trunk/packages/vim/patches/dosini.vim-hash_comment.diff Sat Oct 14 17:38:27 2006
@@ -1,0 +1,13 @@
+Index: vim/runtime/syntax/dosini.vim
+===================================================================
+--- vim/runtime/syntax/dosini.vim.orig
++++ vim/runtime/syntax/dosini.vim
+@@ -17,7 +17,7 @@
+ 
+ syn match  dosiniLabel		"^.\{-}="
+ syn region dosiniHeader		start="\[" end="\]"
+-syn match  dosiniComment	"^;.*$"
++syn match  dosiniComment	"^[;#].*$"
+ 
+ " Define the default highlighting.
+ " For version 5.7 and earlier: only when not done already

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=789&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Sat Oct 14 17:38:27 2006
@@ -14,3 +14,4 @@
 python.vim-ftplugin_pydoc.diff -p0
 zsh.vim-nested_quotes.diff -p0
 mp.vim-cmd_check.diff -p0
+dosini.vim-hash_comment.diff -p0

Added: trunk/packages/vim/upstream/patches/7.0.131
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.131?rev=789&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.131 (added)
+++ trunk/packages/vim/upstream/patches/7.0.131 Sat Oct 14 17:38:27 2006
@@ -1,0 +1,77 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.131
+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.0.131
+Problem:    Win32: "vim -r" does not list all the swap files.
+Solution:   Also check for swap files starting with a dot.
+Files:	    src/memline.c
+
+
+*** ../vim-7.0.130/src/memline.c	Tue Oct 10 16:20:51 2006
+--- src/memline.c	Tue Oct 10 21:54:21 2006
+***************
+*** 1400,1407 ****
+  		names[0] = vim_strsave((char_u *)"*.sw?");
+  # endif
+  #endif
+! #ifdef UNIX
+! 		/* for Unix names starting with a dot are special */
+  		names[1] = vim_strsave((char_u *)".*.sw?");
+  		names[2] = vim_strsave((char_u *)".sw?");
+  		num_names = 3;
+--- 1400,1408 ----
+  		names[0] = vim_strsave((char_u *)"*.sw?");
+  # endif
+  #endif
+! #if defined(UNIX) || defined(WIN3264)
+! 		/* For Unix names starting with a dot are special.  MS-Windows
+! 		 * supports this too, on some file systems. */
+  		names[1] = vim_strsave((char_u *)".*.sw?");
+  		names[2] = vim_strsave((char_u *)".sw?");
+  		num_names = 3;
+***************
+*** 1430,1437 ****
+  		names[0] = concat_fnames(dir_name, (char_u *)"*.sw?", TRUE);
+  # endif
+  #endif
+! #ifdef UNIX
+! 		/* for Unix names starting with a dot are special */
+  		names[1] = concat_fnames(dir_name, (char_u *)".*.sw?", TRUE);
+  		names[2] = concat_fnames(dir_name, (char_u *)".sw?", TRUE);
+  		num_names = 3;
+--- 1431,1439 ----
+  		names[0] = concat_fnames(dir_name, (char_u *)"*.sw?", TRUE);
+  # endif
+  #endif
+! #if defined(UNIX) || defined(WIN3264)
+! 		/* For Unix names starting with a dot are special.  MS-Windows
+! 		 * supports this too, on some file systems. */
+  		names[1] = concat_fnames(dir_name, (char_u *)".*.sw?", TRUE);
+  		names[2] = concat_fnames(dir_name, (char_u *)".sw?", TRUE);
+  		num_names = 3;
+*** ../vim-7.0.130/src/version.c	Tue Oct 10 18:43:50 2006
+--- src/version.c	Tue Oct 10 21:55:02 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     131,
+  /**/
+
+-- 
+Apparently, 1 in 5 people in the world are Chinese.  And there are 5
+people in my family, so it must be one of them.  It's either my mum
+or my dad.  Or my older brother Colin.  Or my younger brother
+Ho-Cha-Chu.  But I think it's Colin.
+
+ /// 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.0.132
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.132?rev=789&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.132 (added)
+++ trunk/packages/vim/upstream/patches/7.0.132 Sat Oct 14 17:38:27 2006
@@ -1,0 +1,78 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.132
+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.0.132 (after 7.0.130)
+Problem:    Win32: Crash when Vim reads from stdin.
+Solution:   Only use mch_nodetype() when there is a file name.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.0.131/src/fileio.c	Tue Oct 10 18:43:50 2006
+--- src/fileio.c	Thu Oct 12 20:50:35 2006
+***************
+*** 416,435 ****
+  	    msg_scroll = msg_save;
+  	    return FAIL;
+  	}
+-     }
+- #endif
+  
+! #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
+!     /*
+!      * MS-Windows allows opening a device, but we will probably get stuck
+!      * trying to read it.
+!      */
+!     if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE)
+!     {
+! 	filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option"), 0);
+! 	msg_end();
+! 	msg_scroll = msg_save;
+! 	return FAIL;
+      }
+  #endif
+  
+--- 416,435 ----
+  	    msg_scroll = msg_save;
+  	    return FAIL;
+  	}
+  
+! # if defined(MSDOS) || defined(MSWIN) || defined(OS2)
+! 	/*
+! 	 * MS-Windows allows opening a device, but we will probably get stuck
+! 	 * trying to read it.
+! 	 */
+! 	if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE)
+! 	{
+! 	    filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option"), 0);
+! 	    msg_end();
+! 	    msg_scroll = msg_save;
+! 	    return FAIL;
+! 	}
+! # endif
+      }
+  #endif
+  
+*** ../vim-7.0.131/src/version.c	Tue Oct 10 21:56:37 2006
+--- src/version.c	Thu Oct 12 21:13:34 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     132,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+31. You code your homework in HTML and give your instructor the URL.
+
+ /// 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.0.133
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.133?rev=789&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.133 (added)
+++ trunk/packages/vim/upstream/patches/7.0.133 Sat Oct 14 17:38:27 2006
@@ -1,0 +1,93 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.133
+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.0.133
+Problem:    When searching included files messages are added to the history.
+Solution:   Set msg_hist_off for messages about scanning included files.
+            Set msg_silent to avoid message about wrapping around.
+Files:	    src/edit.c, src/globals.h, src/message.c, src/search.c
+
+
+*** ../vim-7.0.132/src/edit.c	Tue Oct 10 15:49:41 2006
+--- src/edit.c	Sat Oct 14 14:22:09 2006
+***************
+*** 3909,3914 ****
+--- 3909,3916 ----
+  	    {
+  		int	flags = 0;
+  
++ 		++msg_silent;  /* Don't want messages for wrapscan. */
++ 
+  		/* ctrl_x_mode == CTRL_X_WHOLE_LINE || word-wise search that
+  		 * has added a word that was at the beginning of the line */
+  		if (	ctrl_x_mode == CTRL_X_WHOLE_LINE
+***************
+*** 3920,3925 ****
+--- 3922,3928 ----
+  							      compl_direction,
+  				 compl_pattern, 1L, SEARCH_KEEP + SEARCH_NFMSG,
+  							RE_LAST, (linenr_T)0);
++ 		--msg_silent;
+  		if (!compl_started)
+  		{
+  		    /* set "compl_started" even on fail */
+*** ../vim-7.0.132/src/globals.h	Tue Sep  5 12:57:14 2006
+--- src/globals.h	Sat Oct 14 14:05:02 2006
+***************
+*** 166,171 ****
+--- 166,172 ----
+  EXTERN int	emsg_off INIT(= 0);	    /* don't display errors for now,
+  					       unless 'debug' is set. */
+  EXTERN int	info_message INIT(= FALSE); /* printing informative message */
++ EXTERN int      msg_hist_off INIT(= FALSE); /* don't add messages to history */
+  #ifdef FEAT_EVAL
+  EXTERN int	emsg_skip INIT(= 0);	    /* don't display errors for
+  					       expression that is skipped */
+*** ../vim-7.0.132/src/message.c	Tue Oct  3 17:21:04 2006
+--- src/message.c	Sat Oct 14 14:03:58 2006
+***************
+*** 53,59 ****
+  static struct msg_hist *first_msg_hist = NULL;
+  static struct msg_hist *last_msg_hist = NULL;
+  static int msg_hist_len = 0;
+- static int msg_hist_off = FALSE;	/* don't add messages to history */
+  
+  /*
+   * When writing messages to the screen, there are many different situations.
+--- 53,58 ----
+*** ../vim-7.0.132/src/search.c	Tue Aug 29 18:01:39 2006
+--- src/search.c	Sat Oct 14 14:15:26 2006
+***************
+*** 4688,4693 ****
+--- 4688,4694 ----
+  #ifdef FEAT_INS_EXPAND
+  		    if (action == ACTION_EXPAND)
+  		    {
++ 			msg_hist_off = TRUE;	/* reset in msg_trunc_attr() */
+  			vim_snprintf((char*)IObuff, IOSIZE,
+  				_("Scanning included file: %s"),
+  				(char *)new_fname);
+*** ../vim-7.0.132/src/version.c	Thu Oct 12 21:15:04 2006
+--- src/version.c	Sat Oct 14 14:32:31 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     133,
+  /**/
+
+-- 
+You have the right to remain silent. Anything you say will be
+misquoted, then used against you.
+
+ /// 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