r793 - in /trunk/packages/vim: debian/ upstream/patches/

zack at users.alioth.debian.org zack at users.alioth.debian.org
Sun Oct 22 09:38:20 UTC 2006


Author: zack
Date: Sun Oct 22 09:38:19 2006
New Revision: 793

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=793
Log:
rush of upstream patches up to 146

Added:
    trunk/packages/vim/upstream/patches/7.0.136
    trunk/packages/vim/upstream/patches/7.0.137
    trunk/packages/vim/upstream/patches/7.0.138
    trunk/packages/vim/upstream/patches/7.0.139
    trunk/packages/vim/upstream/patches/7.0.140
    trunk/packages/vim/upstream/patches/7.0.141
    trunk/packages/vim/upstream/patches/7.0.142
    trunk/packages/vim/upstream/patches/7.0.143
    trunk/packages/vim/upstream/patches/7.0.144
    trunk/packages/vim/upstream/patches/7.0.145
    trunk/packages/vim/upstream/patches/7.0.146
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=793&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sun Oct 22 09:38:19 2006
@@ -21,6 +21,11 @@
 patches for binaries.
 
 Checksums for the patch files can be found in the file MD5.
+
+Collection of patches for Vim 7.0:
+  SIZE  NAME                  INCLUDES
+ 98331  7.0.001-100.gz	      patches 7.0.001 to 7.0.100, gzip'ed
+
 
 Individual patches for Vim 7.0:
 
@@ -160,3 +165,14 @@
   3189  7.0.133  too many messages in history when searching included files
   2290  7.0.134  crash when trying to compare recusively looped List or Dict
  10022  7.0.135  crash in garbage collector with recusively looped List/Dict
+  1703  7.0.136  CursorMoved not triggered when inserting a line
+  2746  7.0.137  configure check for big features is wrong
+ 12174  7.0.138  (extra) Mac: modifiers keys don't work with function keys
+  2044  7.0.139  undo info missing when using CTRL-PageUp in Insert mode
+  2235  7.0.140  (after 7.0.134) comparing list/dict with itself is inefficient
+  6513  7.0.141  extra CR when pasting with the mouse on the command line
+  2075  7.0.142  middle mouse button didn't work right in Select mode
+  1531  7.0.143  setting 'scroll' to its default value didn't work correctly
+  5584  7.0.144  pattern matching may do wrong pointer computations
+  1463  7.0.145  (after 7.0.142) compiler warning
+  4308  7.0.146  opening file for quickfix may ignore windows already open

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=793&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sun Oct 22 09:38:19 2006
@@ -1,7 +1,7 @@
-vim (1:7.0-135+1) unstable; urgency=low
+vim (1:7.0-146+1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream patches (123 - 135), see README.gz for details.
+  * New upstream patches (123 - 146), see README.gz for details.
 
   [ James Vega ]
   * Bump vim-common's priority to important to match the override.
@@ -16,7 +16,7 @@
   * Added patch dosini.vim-hash_comment.diff which add support for # comments
     in dosini syntax highlighting, thanks to Adeodato Simó. (closes: #378952)
 
- -- James Vega <jamessan at debian.org>  Mon, 16 Oct 2006 09:23:25 -0400
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 22 Oct 2006 11:37:30 +0200
 
 vim (1:7.0-122+1) unstable; urgency=medium
 

Added: trunk/packages/vim/upstream/patches/7.0.136
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.136?rev=793&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.136 (added)
+++ trunk/packages/vim/upstream/patches/7.0.136 Sun Oct 22 09:38:19 2006
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.136
+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.136
+Problem:    Using "O" while matching parens are highlighted may not remove the
+	    highlighting. (Ilya Bobir)
+Solution:   Also trigger CursorMoved when a line is inserted under the cursor.
+Files:	    src/misc1.c
+
+
+*** ../vim-7.0.135/src/misc1.c	Fri Sep 15 20:17:49 2006
+--- src/misc1.c	Tue Oct 17 11:11:42 2006
+***************
+*** 2842,2848 ****
+  
+  #ifdef FEAT_AUTOCMD
+      /* when the cursor line is changed always trigger CursorMoved */
+!     if (lnum <= curwin->w_cursor.lnum && lnume > curwin->w_cursor.lnum)
+  	last_cursormoved.lnum = 0;
+  #endif
+  }
+--- 2842,2849 ----
+  
+  #ifdef FEAT_AUTOCMD
+      /* when the cursor line is changed always trigger CursorMoved */
+!     if (lnum <= curwin->w_cursor.lnum
+! 		 && lnume + (xtra < 0 ? -xtra : xtra) > curwin->w_cursor.lnum)
+  	last_cursormoved.lnum = 0;
+  #endif
+  }
+*** ../vim-7.0.135/src/version.c	Sun Oct 15 22:38:41 2006
+--- src/version.c	Tue Oct 17 11:10:21 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     136,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+46. Your wife makes a new rule: "The computer cannot come to bed."
+
+ /// 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.137
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.137?rev=793&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.137 (added)
+++ trunk/packages/vim/upstream/patches/7.0.137 Sun Oct 22 09:38:19 2006
@@ -1,0 +1,70 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.137
+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.137
+Problem:    Configure check for big features is wrong.
+Solution:   Change "==" to "=". (Martti Kuparinen)
+Files:	    src/auto/configure, src/configure.in
+
+
+*** ../vim-7.0.136/src/auto/configure	Tue Oct 10 11:40:53 2006
+--- src/auto/configure	Tue Oct 17 11:41:59 2006
+***************
+*** 15302,15308 ****
+  	&& test "x$GUITYPE" != "xCARBONGUI"; then
+    echo "$as_me:$LINENO: checking whether we need -framework Carbon" >&5
+  echo $ECHO_N "checking whether we need -framework Carbon... $ECHO_C" >&6
+!     if test "x$enable_multibyte" = "xyes" || test "x$features" == "xbig" \
+  	|| test "x$features" = "xhuge"; then
+      LIBS="$LIBS -framework Carbon"
+      echo "$as_me:$LINENO: result: yes" >&5
+--- 15302,15308 ----
+  	&& test "x$GUITYPE" != "xCARBONGUI"; then
+    echo "$as_me:$LINENO: checking whether we need -framework Carbon" >&5
+  echo $ECHO_N "checking whether we need -framework Carbon... $ECHO_C" >&6
+!     if test "x$enable_multibyte" = "xyes" || test "x$features" = "xbig" \
+  	|| test "x$features" = "xhuge"; then
+      LIBS="$LIBS -framework Carbon"
+      echo "$as_me:$LINENO: result: yes" >&5
+*** ../vim-7.0.136/src/configure.in	Tue Oct 10 11:40:53 2006
+--- src/configure.in	Tue Oct 17 11:40:59 2006
+***************
+*** 2838,2844 ****
+  	&& test "x$GUITYPE" != "xCARBONGUI"; then
+    AC_MSG_CHECKING(whether we need -framework Carbon)
+    dnl check for MACOSX without Carbon GUI, but with FEAT_MBYTE
+!   if test "x$enable_multibyte" = "xyes" || test "x$features" == "xbig" \
+  	|| test "x$features" = "xhuge"; then
+      LIBS="$LIBS -framework Carbon"
+      AC_MSG_RESULT(yes)
+--- 2838,2844 ----
+  	&& test "x$GUITYPE" != "xCARBONGUI"; then
+    AC_MSG_CHECKING(whether we need -framework Carbon)
+    dnl check for MACOSX without Carbon GUI, but with FEAT_MBYTE
+!   if test "x$enable_multibyte" = "xyes" || test "x$features" = "xbig" \
+  	|| test "x$features" = "xhuge"; then
+      LIBS="$LIBS -framework Carbon"
+      AC_MSG_RESULT(yes)
+*** ../vim-7.0.136/src/version.c	Tue Oct 17 11:12:28 2006
+--- src/version.c	Tue Oct 17 11:49:14 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     137,
+  /**/
+
+-- 
+CVS sux, men don't like commitment
+
+ /// 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.138
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.138?rev=793&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.138 (added)
+++ trunk/packages/vim/upstream/patches/7.0.138 Sun Oct 22 09:38:19 2006
@@ -1,0 +1,419 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.138 (extra)
+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.138 (extra)
+Problem:    Mac: modifiers don't work with function keys.
+Solution:   Use GetEventParameter() to obtain modifiers. (Nicolas Weber)
+Files:	    src/gui_mac.c
+
+
+*** ../vim-7.0.137/src/gui_mac.c	Tue Aug 22 21:39:18 2006
+--- src/gui_mac.c	Sun Oct 15 14:53:38 2006
+***************
+*** 2014,2020 ****
+  	void *data)
+  {
+      /* Multibyte-friendly key event handler */
+!     OSStatus	e = -1;
+      UInt32	actualSize;
+      UniChar	*text;
+      char_u	result[INLINE_KEY_BUFFER_SIZE];
+--- 2014,2020 ----
+  	void *data)
+  {
+      /* Multibyte-friendly key event handler */
+!     OSStatus	err = -1;
+      UInt32	actualSize;
+      UniChar	*text;
+      char_u	result[INLINE_KEY_BUFFER_SIZE];
+***************
+*** 2022,2195 ****
+      UInt32	key_sym;
+      char	charcode;
+      int		key_char;
+!     UInt32	modifiers;
+      size_t	encLen;
+      char_u	*to = NULL;
+      Boolean	isSpecial = FALSE;
+      int		i;
+  
+      /* Mask the mouse (as per user setting) */
+      if (p_mh)
+  	ObscureCursor();
+  
+!     do
+!     {
+! 	/* Don't use the keys when the dialog wants them. */
+! 	if (dialog_busy)
+! 	    break;
+  
+! 	if (noErr != GetEventParameter(theEvent, kEventParamTextInputSendText,
+! 		    typeUnicodeText, NULL, 0, &actualSize, NULL))
+! 	    break;
+  
+! 	text = (UniChar *)alloc(actualSize);
+  
+! 	if (text)
+! 	{
+! 	    do
+! 	    {
+! 		if (noErr != GetEventParameter(theEvent,
+! 			    kEventParamTextInputSendText,
+! 			    typeUnicodeText, NULL, actualSize, NULL, text))
+! 		    break;
+! 		EventRef keyEvent;
+! 		if (noErr != GetEventParameter(theEvent,
+! 			    kEventParamTextInputSendKeyboardEvent,
+! 			    typeEventRef, NULL, sizeof(EventRef), NULL, &keyEvent))
+! 		    break;
+! 		if (noErr != GetEventParameter(keyEvent,
+! 			    kEventParamKeyModifiers,
+! 			    typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers))
+! 		    break;
+! 		if (noErr != GetEventParameter(keyEvent,
+! 			    kEventParamKeyCode,
+! 			    typeUInt32, NULL, sizeof(UInt32), NULL, &key_sym))
+! 		    break;
+! 		if (noErr != GetEventParameter(keyEvent,
+! 			    kEventParamKeyMacCharCodes,
+! 			    typeChar, NULL, sizeof(char), NULL, &charcode))
+! 		    break;
+  
+! 		key_char = charcode;
+  
+! 		if (modifiers & controlKey)
+! 		{
+! 		    if ((modifiers & ~(controlKey|shiftKey)) == 0
+! 			    && (key_char == '2' || key_char == '6'))
+! 		    {
+! 			/* CTRL-^ and CTRL-@ don't work in the normal way. */
+! 			if (key_char == '2')
+! 			    key_char = Ctrl_AT;
+! 			else
+! 			    key_char = Ctrl_HAT;
+  
+! 			text[0] = (UniChar)key_char;
+! 			modifiers = 0;
+! 		    }
+! 		}
+  
+! 		if (modifiers & cmdKey)
+! #ifndef USE_CMD_KEY
+! 		    break;  /* Let system handle Cmd+... */
+! #else
+! 		{
+! 		    /* Intercept CMD-. */
+! 		    if (key_char == '.')
+! 			got_int = TRUE;
+! 
+! 		    /* Convert the modifiers */
+! 		    modifiers = EventModifiers2VimModifiers(modifiers);
+! 
+! 		    /* Following code to simplify and consolidate modifiers
+! 		     * taken liberally from gui_w48.c */
+! 
+! 		    key_char = simplify_key(key_char, (int *)&modifiers);
+! 
+! 		    /* remove SHIFT for keys that are already shifted, e.g.,
+! 		     * '(' and '*' */
+! 		    if (key_char < 0x100 &&
+! 			    !isalpha(key_char) && isprint(key_char))
+! 			modifiers &= ~MOD_MASK_SHIFT;
+! 
+! 		    /* Interpret META, include SHIFT, etc. */
+! 		    key_char = extract_modifiers(key_char, (int *)&modifiers);
+! 		    if (key_char == CSI)
+! 			key_char = K_CSI;
+  
+! 		    if (modifiers)
+! 		    {
+! 			result[len++] = CSI;
+! 			result[len++] = KS_MODIFIER;
+! 			result[len++] = modifiers;
+! 		    }
+  
+! 		    isSpecial = TRUE;
+! 		}
+! #endif
+! 		else
+! 		{
+! 		    /* Find the special key (eg., for cursor keys) */
+! 		    if (!(actualSize > sizeof(UniChar)) &&
+! 			    ((text[0] < 0x20) || (text[0] == 0x7f)))
+! 		    {
+! 			for (i = 0; special_keys[i].key_sym != (KeySym)0; ++i)
+! 			    if (special_keys[i].key_sym == key_sym)
+! 			    {
+! 				key_char = TO_SPECIAL(special_keys[i].vim_code0,
+! 					special_keys[i].vim_code1);
+! 				key_char = simplify_key(key_char,
+! 					(int *)&modifiers);
+! 				isSpecial = TRUE;
+! 				break;
+! 			    }
+! 		    }
+! 		}
+  
+! 		if (isSpecial && IS_SPECIAL(key_char))
+! 		{
+! 		    result[len++] = CSI;
+! 		    result[len++] = K_SECOND(key_char);
+! 		    result[len++] = K_THIRD(key_char);
+! 		}
+! 		else
+! 		{
+! 		    encLen = actualSize;
+! 		    to = mac_utf16_to_enc(text, actualSize, &encLen);
+! 		}
+  
+! 		if (to)
+! 		{
+! 		    /* This is basically add_to_input_buf_csi() */
+! 		    for (i = 0; i < encLen && len < (INLINE_KEY_BUFFER_SIZE-1); ++i)
+! 		    {
+! 			result[len++] = to[i];
+! 			if (to[i] == CSI)
+! 			{
+! 			    result[len++] = KS_EXTRA;
+! 			    result[len++] = (int)KE_CSI;
+! 			}
+! 		    }
+! 		    vim_free(to);
+! 		}
+  
+! 		add_to_input_buf(result, len);
+! 		e = noErr;
+! 	    }
+! 	    while (0);
+  
+! 	    vim_free(text);
+! 	    if (e == noErr)
+! 	    {
+! 		/* Fake event to wake up WNE (required to get
+! 		 * key repeat working */
+! 		PostEvent(keyUp, 0);
+! 		return noErr;
+! 	    }
+! 	}
+      }
+-     while (0);
+  
+!     return CallNextEventHandler(nextHandler, theEvent);
+  }
+  #else
+      void
+--- 2022,2174 ----
+      UInt32	key_sym;
+      char	charcode;
+      int		key_char;
+!     UInt32	modifiers, vimModifiers;
+      size_t	encLen;
+      char_u	*to = NULL;
+      Boolean	isSpecial = FALSE;
+      int		i;
++     EventRef keyEvent;
+  
+      /* Mask the mouse (as per user setting) */
+      if (p_mh)
+  	ObscureCursor();
+  
+!     /* Don't use the keys when the dialog wants them. */
+!     if (dialog_busy)
+!         return eventNotHandledErr;
+! 
+!     if (noErr != GetEventParameter(theEvent, kEventParamTextInputSendText,
+!                 typeUnicodeText, NULL, 0, &actualSize, NULL))
+!         return eventNotHandledErr;
+! 
+!     text = (UniChar *)alloc(actualSize);
+!     if (!text)
+!         return eventNotHandledErr;
+! 
+!     err = GetEventParameter(theEvent, kEventParamTextInputSendText,
+!             typeUnicodeText, NULL, actualSize, NULL, text);
+!     require_noerr(err, done);
+! 
+!     err = GetEventParameter(theEvent, kEventParamTextInputSendKeyboardEvent,
+!             typeEventRef, NULL, sizeof(EventRef), NULL, &keyEvent);
+!     require_noerr(err, done);
+! 
+!     err = GetEventParameter(keyEvent, kEventParamKeyModifiers,
+!             typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
+!     require_noerr(err, done);
+! 
+!     err = GetEventParameter(keyEvent, kEventParamKeyCode,
+!             typeUInt32, NULL, sizeof(UInt32), NULL, &key_sym);
+!     require_noerr(err, done);
+! 
+!     err = GetEventParameter(keyEvent, kEventParamKeyMacCharCodes,
+!             typeChar, NULL, sizeof(char), NULL, &charcode);
+!     require_noerr(err, done);
+  
+! #ifndef USE_CMD_KEY
+!     if (modifiers & cmdKey)
+!         goto done;  /* Let system handle Cmd+... */
+! #endif
+  
+!     key_char = charcode;
+!     vimModifiers = EventModifiers2VimModifiers(modifiers);
+  
+!     /* Find the special key (eg., for cursor keys) */
+!     if (actualSize <= sizeof(UniChar) &&
+!             ((text[0] < 0x20) || (text[0] == 0x7f)))
+!     {
+!         for (i = 0; special_keys[i].key_sym != (KeySym)0; ++i)
+!             if (special_keys[i].key_sym == key_sym)
+!             {
+!                 key_char = TO_SPECIAL(special_keys[i].vim_code0,
+!                         special_keys[i].vim_code1);
+!                 key_char = simplify_key(key_char,
+!                         (int *)&vimModifiers);
+!                 isSpecial = TRUE;
+!                 break;
+!             }
+!     }
+  
+!     /* Intercept CMD-. and CTRL-c */
+!     if (((modifiers & controlKey) && key_char == 'c') ||
+!             ((modifiers & cmdKey) && key_char == '.'))
+!         got_int = TRUE;
+  
+!     if (!isSpecial)
+!     {
+!         /* remove SHIFT for keys that are already shifted, e.g.,
+!          * '(' and '*' */
+!         if (key_char < 0x100 && !isalpha(key_char) && isprint(key_char))
+!             vimModifiers &= ~MOD_MASK_SHIFT;
+  
+!         /* remove CTRL from keys that already have it */
+!         if (key_char < 0x20)
+!             vimModifiers &= ~MOD_MASK_CTRL;
+  
+!         /* don't process unicode characters here */
+!         if (!IS_SPECIAL(key_char))
+!         {
+!             /* Following code to simplify and consolidate vimModifiers
+!              * taken liberally from gui_w48.c */
+!             key_char = simplify_key(key_char, (int *)&vimModifiers);
+  
+!             /* Interpret META, include SHIFT, etc. */
+!             key_char = extract_modifiers(key_char, (int *)&vimModifiers);
+!             if (key_char == CSI)
+!                 key_char = K_CSI;
+  
+!             if (IS_SPECIAL(key_char))
+!                 isSpecial = TRUE;
+!         }
+!     }
+  
+!     if (vimModifiers)
+!     {
+!         result[len++] = CSI;
+!         result[len++] = KS_MODIFIER;
+!         result[len++] = vimModifiers;
+!     }
+  
+!     if (isSpecial && IS_SPECIAL(key_char))
+!     {
+!         result[len++] = CSI;
+!         result[len++] = K_SECOND(key_char);
+!         result[len++] = K_THIRD(key_char);
+!     }
+!     else
+!     {
+!         encLen = actualSize;
+!         to = mac_utf16_to_enc(text, actualSize, &encLen);
+!         if (to)
+!         {
+!             /* This is basically add_to_input_buf_csi() */
+!             for (i = 0; i < encLen && len < (INLINE_KEY_BUFFER_SIZE-1); ++i)
+!             {
+!                 result[len++] = to[i];
+!                 if (to[i] == CSI)
+!                 {
+!                     result[len++] = KS_EXTRA;
+!                     result[len++] = (int)KE_CSI;
+!                 }
+!             }
+!             vim_free(to);
+!         }
+!     }
+  
+!     add_to_input_buf(result, len);
+!     err = noErr;
+  
+! done:
+!     vim_free(text);
+!     if (err == noErr)
+!     {
+!         /* Fake event to wake up WNE (required to get
+!          * key repeat working */
+!         PostEvent(keyUp, 0);
+!         return noErr;
+      }
+  
+!     return eventNotHandledErr;
+  }
+  #else
+      void
+***************
+*** 5748,5754 ****
+      /* TODO: Get the text selection from Vim */
+  
+      /* Call to Handle Popup */
+!     status = ContextualMenuSelect(CntxMenu, where, false, kCMHelpItemNoHelp, HelpName, NULL, &CntxType, &CntxMenuID, &CntxMenuItem);
+  
+      if (status == noErr)
+      {
+--- 5727,5734 ----
+      /* TODO: Get the text selection from Vim */
+  
+      /* Call to Handle Popup */
+!     status = ContextualMenuSelect(CntxMenu, where, false, kCMHelpItemNoHelp,
+! 		       HelpName, NULL, &CntxType, &CntxMenuID, &CntxMenuItem);
+  
+      if (status == noErr)
+      {
+***************
+*** 5756,5762 ****
+  	{
+  	    /* Handle the menu CntxMenuID, CntxMenuItem */
+  	    /* The submenu can be handle directly by gui_mac_handle_menu */
+! 	    /* But what about the current menu, is the menu changed by ContextualMenuSelect */
+  	    gui_mac_handle_menu((CntxMenuID << 16) + CntxMenuItem);
+  	}
+  	else if (CntxMenuID == kCMShowHelpSelected)
+--- 5736,5743 ----
+  	{
+  	    /* Handle the menu CntxMenuID, CntxMenuItem */
+  	    /* The submenu can be handle directly by gui_mac_handle_menu */
+! 	    /* But what about the current menu, is the menu changed by
+! 	     * ContextualMenuSelect */
+  	    gui_mac_handle_menu((CntxMenuID << 16) + CntxMenuItem);
+  	}
+  	else if (CntxMenuID == kCMShowHelpSelected)
+*** ../vim-7.0.137/src/version.c	Tue Oct 17 11:50:45 2006
+--- src/version.c	Tue Oct 17 12:51:21 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     138,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+52. You ask a plumber how much it would cost to replace the chair in front of
+    your computer with a toilet.
+
+ /// 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.139
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.139?rev=793&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.139 (added)
+++ trunk/packages/vim/upstream/patches/7.0.139 Sun Oct 22 09:38:19 2006
@@ -1,0 +1,79 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.139
+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.139
+Problem:    Using CTRL-PageUp or CTRL-PageDown in Insert mode to go to another
+	    tab page does not prepare for undo properly. (Stefano Zacchiroli)
+Solution:   Call start_arrow() before switching tab page.
+Files:	    src/edit.c
+
+
+*** ../vim-7.0.138/src/edit.c	Sat Oct 14 14:33:21 2006
+--- src/edit.c	Mon Oct 16 21:28:05 2006
+***************
+*** 8822,8828 ****
+      if (mod_mask & MOD_MASK_CTRL)
+      {
+  	/* <C-PageUp>: tab page back */
+! 	goto_tabpage(-1);
+  	return;
+      }
+  #endif
+--- 8822,8832 ----
+      if (mod_mask & MOD_MASK_CTRL)
+      {
+  	/* <C-PageUp>: tab page back */
+! 	if (first_tabpage->tp_next != NULL)
+! 	{
+! 	    start_arrow(&curwin->w_cursor);
+! 	    goto_tabpage(-1);
+! 	}
+  	return;
+      }
+  #endif
+***************
+*** 8881,8887 ****
+      if (mod_mask & MOD_MASK_CTRL)
+      {
+  	/* <C-PageDown>: tab page forward */
+! 	goto_tabpage(0);
+  	return;
+      }
+  #endif
+--- 8885,8895 ----
+      if (mod_mask & MOD_MASK_CTRL)
+      {
+  	/* <C-PageDown>: tab page forward */
+! 	if (first_tabpage->tp_next != NULL)
+! 	{
+! 	    start_arrow(&curwin->w_cursor);
+! 	    goto_tabpage(0);
+! 	}
+  	return;
+      }
+  #endif
+*** ../vim-7.0.138/src/version.c	Tue Oct 17 12:53:31 2006
+--- src/version.c	Tue Oct 17 13:38:27 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     139,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+53. To find out what time it is, you send yourself an e-mail and check the
+    "Date:" field.
+
+ /// 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.140
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.140?rev=793&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.140 (added)
+++ trunk/packages/vim/upstream/patches/7.0.140 Sun Oct 22 09:38:19 2006
@@ -1,0 +1,82 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.140
+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.140 (after 7.0.134)
+Problem:    Comparing recursively looped List or Dictionary doesn't work well.
+Solution:   Detect comparing a List or Dictionary with itself.
+Files:	    src/eval.c
+
+
+*** ../vim-7.0.139/src/eval.c	Sun Oct 15 22:38:41 2006
+--- src/eval.c	Sun Oct 15 22:30:09 2006
+***************
+*** 5451,5456 ****
+--- 5451,5458 ----
+  {
+      listitem_T	*item1, *item2;
+  
++     if (l1 == l2)
++ 	return TRUE;
+      if (list_len(l1) != list_len(l2))
+  	return FALSE;
+  
+***************
+*** 5487,5492 ****
+--- 5489,5496 ----
+      dictitem_T	*item2;
+      int		todo;
+  
++     if (d1 == d2)
++ 	return TRUE;
+      if (dict_len(d1) != dict_len(d2))
+  	return FALSE;
+  
+***************
+*** 5522,5531 ****
+      static int  recursive = 0;	    /* cach recursive loops */
+      int		r;
+  
+!     /* Catch lists and dicts that have an endless loop by limiting
+!      * recursiveness to 1000. */
+!     if (tv1->v_type != tv2->v_type || recursive >= 1000)
+  	return FALSE;
+  
+      switch (tv1->v_type)
+      {
+--- 5526,5537 ----
+      static int  recursive = 0;	    /* cach recursive loops */
+      int		r;
+  
+!     if (tv1->v_type != tv2->v_type)
+  	return FALSE;
++     /* Catch lists and dicts that have an endless loop by limiting
++      * recursiveness to 1000.  We guess they are equal then. */
++     if (recursive >= 1000)
++ 	return TRUE;
+  
+      switch (tv1->v_type)
+      {
+*** ../vim-7.0.139/src/version.c	Tue Oct 17 13:39:36 2006
+--- src/version.c	Tue Oct 17 15:15:04 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     140,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+54. You start tilting your head sideways to smile. :-)
+
+ /// 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.141
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.141?rev=793&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.141 (added)
+++ trunk/packages/vim/upstream/patches/7.0.141 Sun Oct 22 09:38:19 2006
@@ -1,0 +1,210 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.141
+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.141
+Problem:    When pasting a while line on the command line an extra CR is added
+	    literally.
+Solution:   Don't add the trailing CR when pasting with the mouse.
+Files:	    src/ex_getln.c, src/proto/ops.pro, src/ops.c
+
+
+*** ../vim-7.0.140/src/ex_getln.c	Thu Sep 14 11:27:12 2006
+--- src/ex_getln.c	Sun Oct 15 16:17:20 2006
+***************
+*** 86,92 ****
+  static void	draw_cmdline __ARGS((int start, int len));
+  static void	save_cmdline __ARGS((struct cmdline_info *ccp));
+  static void	restore_cmdline __ARGS((struct cmdline_info *ccp));
+! static int	cmdline_paste __ARGS((int regname, int literally));
+  #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
+  static void	redrawcmd_preedit __ARGS((void));
+  #endif
+--- 86,92 ----
+  static void	draw_cmdline __ARGS((int start, int len));
+  static void	save_cmdline __ARGS((struct cmdline_info *ccp));
+  static void	restore_cmdline __ARGS((struct cmdline_info *ccp));
+! static int	cmdline_paste __ARGS((int regname, int literally, int remcr));
+  #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
+  static void	redrawcmd_preedit __ARGS((void));
+  #endif
+***************
+*** 1116,1122 ****
+  #endif
+  		if (c != ESC)	    /* use ESC to cancel inserting register */
+  		{
+! 		    cmdline_paste(c, i == Ctrl_R);
+  
+  #ifdef FEAT_EVAL
+  		    /* When there was a serious error abort getting the
+--- 1116,1122 ----
+  #endif
+  		if (c != ESC)	    /* use ESC to cancel inserting register */
+  		{
+! 		    cmdline_paste(c, i == Ctrl_R, FALSE);
+  
+  #ifdef FEAT_EVAL
+  		    /* When there was a serious error abort getting the
+***************
+*** 1231,1246 ****
+  			goto cmdline_not_changed;   /* Ignore mouse */
+  # ifdef FEAT_CLIPBOARD
+  		if (clip_star.available)
+! 		    cmdline_paste('*', TRUE);
+  		else
+  # endif
+! 		    cmdline_paste(0, TRUE);
+  		redrawcmd();
+  		goto cmdline_changed;
+  
+  # ifdef FEAT_DND
+  	case K_DROP:
+! 		cmdline_paste('~', TRUE);
+  		redrawcmd();
+  		goto cmdline_changed;
+  # endif
+--- 1231,1246 ----
+  			goto cmdline_not_changed;   /* Ignore mouse */
+  # ifdef FEAT_CLIPBOARD
+  		if (clip_star.available)
+! 		    cmdline_paste('*', TRUE, TRUE);
+  		else
+  # endif
+! 		    cmdline_paste(0, TRUE, TRUE);
+  		redrawcmd();
+  		goto cmdline_changed;
+  
+  # ifdef FEAT_DND
+  	case K_DROP:
+! 		cmdline_paste('~', TRUE, FALSE);
+  		redrawcmd();
+  		goto cmdline_changed;
+  # endif
+***************
+*** 2890,2898 ****
+   * return FAIL for failure, OK otherwise
+   */
+      static int
+! cmdline_paste(regname, literally)
+      int regname;
+      int literally;	/* Insert text literally instead of "as typed" */
+  {
+      long		i;
+      char_u		*arg;
+--- 2890,2899 ----
+   * return FAIL for failure, OK otherwise
+   */
+      static int
+! cmdline_paste(regname, literally, remcr)
+      int regname;
+      int literally;	/* Insert text literally instead of "as typed" */
++     int remcr;		/* remove trailing CR */
+  {
+      long		i;
+      char_u		*arg;
+***************
+*** 2968,2974 ****
+  	return OK;
+      }
+  
+!     return cmdline_paste_reg(regname, literally);
+  }
+  
+  /*
+--- 2969,2975 ----
+  	return OK;
+      }
+  
+!     return cmdline_paste_reg(regname, literally, remcr);
+  }
+  
+  /*
+*** ../vim-7.0.140/src/proto/ops.pro	Sun Apr 30 20:25:07 2006
+--- src/proto/ops.pro	Tue Oct 17 16:24:08 2006
+***************
+*** 20,26 ****
+  extern int do_execreg __ARGS((int regname, int colon, int addcr));
+  extern int insert_reg __ARGS((int regname, int literally));
+  extern int get_spec_reg __ARGS((int regname, char_u **argp, int *allocated, int errmsg));
+! extern int cmdline_paste_reg __ARGS((int regname, int literally));
+  extern void adjust_clip_reg __ARGS((int *rp));
+  extern int op_delete __ARGS((oparg_T *oap));
+  extern int op_replace __ARGS((oparg_T *oap, int c));
+--- 20,26 ----
+  extern int do_execreg __ARGS((int regname, int colon, int addcr));
+  extern int insert_reg __ARGS((int regname, int literally));
+  extern int get_spec_reg __ARGS((int regname, char_u **argp, int *allocated, int errmsg));
+! extern int cmdline_paste_reg __ARGS((int regname, int literally, int remcr));
+  extern void adjust_clip_reg __ARGS((int *rp));
+  extern int op_delete __ARGS((oparg_T *oap));
+  extern int op_replace __ARGS((oparg_T *oap, int c));
+*** ../vim-7.0.140/src/ops.c	Fri Oct  6 23:33:22 2006
+--- src/ops.c	Sun Oct 15 16:43:54 2006
+***************
+*** 1480,1488 ****
+   * return FAIL for failure, OK otherwise
+   */
+      int
+! cmdline_paste_reg(regname, literally)
+      int regname;
+      int literally;	/* Insert text literally instead of "as typed" */
+  {
+      long	i;
+  
+--- 1481,1490 ----
+   * return FAIL for failure, OK otherwise
+   */
+      int
+! cmdline_paste_reg(regname, literally, remcr)
+      int regname;
+      int literally;	/* Insert text literally instead of "as typed" */
++     int remcr;		/* don't add trailing CR */
+  {
+      long	i;
+  
+***************
+*** 1494,1501 ****
+      {
+  	cmdline_paste_str(y_current->y_array[i], literally);
+  
+! 	/* insert ^M between lines and after last line if type is MLINE */
+! 	if (y_current->y_type == MLINE || i < y_current->y_size - 1)
+  	    cmdline_paste_str((char_u *)"\r", literally);
+  
+  	/* Check for CTRL-C, in case someone tries to paste a few thousand
+--- 1496,1508 ----
+      {
+  	cmdline_paste_str(y_current->y_array[i], literally);
+  
+! 	/* Insert ^M between lines and after last line if type is MLINE.
+! 	 * Don't do this when "remcr" is TRUE and the next line is empty. */
+! 	if (y_current->y_type == MLINE
+! 		|| (i < y_current->y_size - 1
+! 		    && !(remcr
+! 			&& i == y_current->y_size - 2
+! 			&& *y_current->y_array[i + 1] == NUL)))
+  	    cmdline_paste_str((char_u *)"\r", literally);
+  
+  	/* Check for CTRL-C, in case someone tries to paste a few thousand
+*** ../vim-7.0.140/src/version.c	Tue Oct 17 15:17:41 2006
+--- src/version.c	Tue Oct 17 16:22:55 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     141,
+  /**/
+
+-- 
+ERROR 047: Keyboard not found.  Press RETURN to continue.
+
+ /// 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.142
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.142?rev=793&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.142 (added)
+++ trunk/packages/vim/upstream/patches/7.0.142 Sun Oct 22 09:38:19 2006
@@ -1,0 +1,70 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.142
+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.142
+Problem:    Using the middle mouse button in Select mode to paste text results 
+            in an extra "y". (Kriton Kyrimis)
+Solution:   Let the middle mouse button replace the selected text with the
+            contents of the clipboard.
+Files:      src/normal.c
+
+
+*** ../vim-7.0.141/src/normal.c	Tue Oct 10 13:27:30 2006
+--- src/normal.c	Tue Oct 17 16:54:57 2006
+***************
+*** 2380,2390 ****
+  	    /*
+  	     * If visual was active, yank the highlighted text and put it
+  	     * before the mouse pointer position.
+  	     */
+  	    if (VIsual_active)
+  	    {
+! 		stuffcharReadbuff('y');
+! 		stuffcharReadbuff(K_MIDDLEMOUSE);
+  		do_always = TRUE;	/* ignore 'mouse' setting next time */
+  		return FALSE;
+  	    }
+--- 2380,2399 ----
+  	    /*
+  	     * If visual was active, yank the highlighted text and put it
+  	     * before the mouse pointer position.
++ 	     * In Select mode replace the highlighted text with the clipboard.
+  	     */
+  	    if (VIsual_active)
+  	    {
+! 		if (VIsual_select)
+! 		{
+! 		    stuffcharReadbuff(Ctrl_G);
+! 		    stuffReadbuff("\"+p");
+! 		}
+! 		else
+! 		{
+! 		    stuffcharReadbuff('y');
+! 		    stuffcharReadbuff(K_MIDDLEMOUSE);
+! 		}
+  		do_always = TRUE;	/* ignore 'mouse' setting next time */
+  		return FALSE;
+  	    }
+*** ../vim-7.0.141/src/version.c	Tue Oct 17 16:26:52 2006
+--- src/version.c	Tue Oct 17 16:51:23 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     142,
+  /**/
+
+-- 
+Keyboard not found.  Think ENTER to continue.
+
+ /// 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.143
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.143?rev=793&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.143 (added)
+++ trunk/packages/vim/upstream/patches/7.0.143 Sun Oct 22 09:38:19 2006
@@ -1,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.143
+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.143
+Problem:    Setting 'scroll' to its default value was not handled correctly.
+Solution:   Compare the right field to PV_SCROLL.
+Files:	    src/option.c
+
+
+*** ../vim-7.0.142/src/option.c	Tue Oct 10 18:43:50 2006
+--- src/option.c	Tue Oct 17 17:29:09 2006
+***************
+*** 3405,3411 ****
+  	}
+  	else if (flags & P_NUM)
+  	{
+! 	    if (varp == (char_u *)PV_SCROLL)
+  		win_comp_scroll(curwin);
+  	    else
+  	    {
+--- 3405,3411 ----
+  	}
+  	else if (flags & P_NUM)
+  	{
+! 	    if (options[opt_idx].indir == PV_SCROLL)
+  		win_comp_scroll(curwin);
+  	    else
+  	    {
+*** ../vim-7.0.142/src/version.c	Tue Oct 17 16:55:47 2006
+--- src/version.c	Tue Oct 17 18:34:53 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     143,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+56. You leave the modem speaker on after connecting because you think it
+    sounds like the ocean wind...the perfect soundtrack for "surfing the net".
+
+ /// 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.144
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.144?rev=793&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.144 (added)
+++ trunk/packages/vim/upstream/patches/7.0.144 Sun Oct 22 09:38:19 2006
@@ -1,0 +1,219 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.144
+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.144
+Problem:    May compare two unrelated pointers when matching a pattern against
+	    a string.  (Dominique Pelle)
+Solution:   Avoid calling reg_getline() when REG_MULTI is false.
+Files:	    src/regexp.c
+
+
+*** ../vim-7.0.143/src/regexp.c	Tue Aug 29 17:28:56 2006
+--- src/regexp.c	Tue Oct 17 18:30:18 2006
+***************
+*** 3777,3784 ****
+  
+  	op = OP(scan);
+  	/* Check for character class with NL added. */
+! 	if (!reg_line_lbr && WITH_NL(op) && *reginput == NUL
+! 						    && reglnum <= reg_maxline)
+  	{
+  	    reg_nextline();
+  	}
+--- 3777,3784 ----
+  
+  	op = OP(scan);
+  	/* Check for character class with NL added. */
+! 	if (!reg_line_lbr && WITH_NL(op) && REG_MULTI
+! 				&& *reginput == NUL && reglnum <= reg_maxline)
+  	{
+  	    reg_nextline();
+  	}
+***************
+*** 4855,4862 ****
+  	    break;
+  
+  	  case NEWL:
+! 	    if ((c != NUL || reglnum > reg_maxline || reg_line_lbr)
+! 					      && (c != '\n' || !reg_line_lbr))
+  		status = RA_NOMATCH;
+  	    else if (reg_line_lbr)
+  		ADVANCE_REGINPUT();
+--- 4855,4862 ----
+  	    break;
+  
+  	  case NEWL:
+! 	    if ((c != NUL || !REG_MULTI || reglnum > reg_maxline
+! 			     || reg_line_lbr) && (c != '\n' || !reg_line_lbr))
+  		status = RA_NOMATCH;
+  	    else if (reg_line_lbr)
+  		ADVANCE_REGINPUT();
+***************
+*** 5316,5323 ****
+  		++count;
+  		mb_ptr_adv(scan);
+  	    }
+! 	    if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr
+! 							 || count == maxcount)
+  		break;
+  	    ++count;		/* count the line-break */
+  	    reg_nextline();
+--- 5316,5323 ----
+  		++count;
+  		mb_ptr_adv(scan);
+  	    }
+! 	    if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
+! 					 || reg_line_lbr || count == maxcount)
+  		break;
+  	    ++count;		/* count the line-break */
+  	    reg_nextline();
+***************
+*** 5341,5347 ****
+  	    }
+  	    else if (*scan == NUL)
+  	    {
+! 		if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+--- 5341,5348 ----
+  	    }
+  	    else if (*scan == NUL)
+  	    {
+! 		if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
+! 							      || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+***************
+*** 5370,5376 ****
+  	    }
+  	    else if (*scan == NUL)
+  	    {
+! 		if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+--- 5371,5378 ----
+  	    }
+  	    else if (*scan == NUL)
+  	    {
+! 		if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
+! 							      || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+***************
+*** 5399,5405 ****
+  	    }
+  	    else if (*scan == NUL)
+  	    {
+! 		if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+--- 5401,5408 ----
+  	    }
+  	    else if (*scan == NUL)
+  	    {
+! 		if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
+! 							      || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+***************
+*** 5424,5430 ****
+  	{
+  	    if (*scan == NUL)
+  	    {
+! 		if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+--- 5427,5434 ----
+  	{
+  	    if (*scan == NUL)
+  	    {
+! 		if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
+! 							      || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+***************
+*** 5454,5460 ****
+  #endif
+  	    if (*scan == NUL)
+  	    {
+! 		if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+--- 5458,5465 ----
+  #endif
+  	    if (*scan == NUL)
+  	    {
+! 		if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
+! 							      || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+***************
+*** 5617,5623 ****
+  #endif
+  	    if (*scan == NUL)
+  	    {
+! 		if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+--- 5622,5629 ----
+  #endif
+  	    if (*scan == NUL)
+  	    {
+! 		if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline
+! 							      || reg_line_lbr)
+  		    break;
+  		reg_nextline();
+  		scan = reginput;
+***************
+*** 5646,5653 ****
+  
+        case NEWL:
+  	while (count < maxcount
+! 		&& ((*scan == NUL && reglnum <= reg_maxline && !reg_line_lbr)
+! 		    || (*scan == '\n' && reg_line_lbr)))
+  	{
+  	    count++;
+  	    if (reg_line_lbr)
+--- 5652,5659 ----
+  
+        case NEWL:
+  	while (count < maxcount
+! 		&& ((*scan == NUL && reglnum <= reg_maxline && !reg_line_lbr
+! 			    && REG_MULTI) || (*scan == '\n' && reg_line_lbr)))
+  	{
+  	    count++;
+  	    if (reg_line_lbr)
+*** ../vim-7.0.143/src/version.c	Tue Oct 17 18:36:03 2006
+--- src/version.c	Tue Oct 17 18:48:51 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     144,
+  /**/
+
+-- 
+Be thankful to be in a traffic jam, because it means you own a car.
+
+ /// 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.145
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.145?rev=793&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.145 (added)
+++ trunk/packages/vim/upstream/patches/7.0.145 Sun Oct 22 09:38:19 2006
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.145
+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.145 (after 7.0.142)
+Problem:    Compiler warning.
+Solution:   Add type cast.
+Files:	    src/normal.c
+
+
+*** ../vim-7.0.144/src/normal.c	Tue Oct 17 16:55:47 2006
+--- src/normal.c	Tue Oct 17 22:37:42 2006
+***************
+*** 2387,2393 ****
+  		if (VIsual_select)
+  		{
+  		    stuffcharReadbuff(Ctrl_G);
+! 		    stuffReadbuff("\"+p");
+  		}
+  		else
+  		{
+--- 2387,2393 ----
+  		if (VIsual_select)
+  		{
+  		    stuffcharReadbuff(Ctrl_G);
+! 		    stuffReadbuff((char_u *)"\"+p");
+  		}
+  		else
+  		{
+*** ../vim-7.0.144/src/version.c	Tue Oct 17 18:50:15 2006
+--- src/version.c	Tue Oct 17 22:38:21 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     145,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+59. Your wife says communication is important in a marriage...so you buy
+    another computer and install a second phone line so the two of you can
+    chat.
+
+ /// 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.146
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.146?rev=793&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.146 (added)
+++ trunk/packages/vim/upstream/patches/7.0.146 Sun Oct 22 09:38:19 2006
@@ -1,0 +1,137 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.146
+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.146
+Problem:    When 'switchbuf' is set to "usetab" and the current tab has only a
+	    quickfix window, jumping to an error always opens a new window.
+	    Also, when the buffer is open in another tab page it's not found.
+Solution:   Check for the "split" value of 'switchbuf' properly.  Search in
+	    other tab pages for the desired buffer. (Yegappan Lakshmanan)
+Files:	    src/buffer.c, src/quickfix.c
+
+
+*** ../vim-7.0.145/src/buffer.c	Sat Sep  9 14:51:43 2006
+--- src/buffer.c	Fri Oct 20 20:08:49 2006
+***************
+*** 1208,1218 ****
+      {
+  # ifdef FEAT_WINDOWS
+  	/* jump to first window containing buf if one exists ("useopen") */
+! 	if (vim_strchr(p_swb, 'o') && buf_jump_open_win(buf))
+  	    return OK;
+  	/* jump to first window in any tab page containing buf if one exists
+  	 * ("usetab") */
+! 	if (vim_strchr(p_swb, 'a') && buf_jump_open_tab(buf))
+  	    return OK;
+  	if (win_split(0, 0) == FAIL)
+  # endif
+--- 1208,1218 ----
+      {
+  # ifdef FEAT_WINDOWS
+  	/* jump to first window containing buf if one exists ("useopen") */
+! 	if (vim_strchr(p_swb, 'o') != NULL && buf_jump_open_win(buf))
+  	    return OK;
+  	/* jump to first window in any tab page containing buf if one exists
+  	 * ("usetab") */
+! 	if (vim_strchr(p_swb, 'a') != NULL && buf_jump_open_tab(buf))
+  	    return OK;
+  	if (win_split(0, 0) == FAIL)
+  # endif
+***************
+*** 1842,1854 ****
+      if (options & GETF_SWITCH)
+      {
+  	/* use existing open window for buffer if wanted */
+! 	if (vim_strchr(p_swb, 'o'))     /* useopen */
+  	    wp = buf_jump_open_win(buf);
+  	/* use existing open window in any tab page for buffer if wanted */
+! 	if (vim_strchr(p_swb, 'a'))     /* usetab */
+  	    wp = buf_jump_open_tab(buf);
+  	/* split window if wanted ("split") */
+! 	if (wp == NULL && vim_strchr(p_swb, 't') && !bufempty())
+  	{
+  	    if (win_split(0, 0) == FAIL)
+  		return FAIL;
+--- 1842,1854 ----
+      if (options & GETF_SWITCH)
+      {
+  	/* use existing open window for buffer if wanted */
+! 	if (vim_strchr(p_swb, 'o') != NULL)	/* useopen */
+  	    wp = buf_jump_open_win(buf);
+  	/* use existing open window in any tab page for buffer if wanted */
+! 	if (vim_strchr(p_swb, 'a') != NULL)	/* usetab */
+  	    wp = buf_jump_open_tab(buf);
+  	/* split window if wanted ("split") */
+! 	if (wp == NULL && vim_strchr(p_swb, 'l') != NULL && !bufempty())
+  	{
+  	    if (win_split(0, 0) == FAIL)
+  		return FAIL;
+*** ../vim-7.0.145/src/quickfix.c	Tue Sep  5 15:36:30 2006
+--- src/quickfix.c	Fri Oct 20 20:05:00 2006
+***************
+*** 1586,1595 ****
+  	    }
+  
+  	/*
+! 	 * If there is only one window, create a new one above the quickfix
+! 	 * window.
+  	 */
+! 	if (firstwin == lastwin || !usable_win)
+  	{
+  	    ll_ref = curwin->w_llist_ref;
+  
+--- 1586,1615 ----
+  	    }
+  
+  	/*
+! 	 * If no usable window is found and 'switchbuf' is set to 'usetab'
+! 	 * then search in other tabs.
+  	 */
+! 	if (!usable_win && vim_strchr(p_swb, 'a') != NULL)
+! 	{
+! 	    tabpage_T	*tp;
+! 	    win_T	*wp;
+! 
+! 	    FOR_ALL_TAB_WINDOWS(tp, wp)
+! 	    {
+! 		if (wp->w_buffer->b_fnum == qf_ptr->qf_fnum)
+! 		{
+! 		    goto_tabpage_win(tp, wp);
+! 		    usable_win = 1;
+! 		    break;
+! 		}
+! 	    }
+! 	}
+! 
+! 	/*
+! 	 * If there is only one window and is the quickfix window, create a new
+! 	 * one above the quickfix window.
+! 	 */
+! 	if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win)
+  	{
+  	    ll_ref = curwin->w_llist_ref;
+  
+*** ../vim-7.0.145/src/version.c	Tue Oct 17 22:40:14 2006
+--- src/version.c	Fri Oct 20 20:11:58 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     146,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+80. At parties, you introduce your spouse as your "service provider."
+
+ /// 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