packages: vim/7.2.321 (NEW), vim/7.2.322 (NEW), vim/7.2.323 (NEW), vim/7.2....

adamg adamg at pld-linux.org
Tue Jan 12 21:53:41 CET 2010


Author: adamg                        Date: Tue Jan 12 20:53:41 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new

---- Files affected:
packages/vim:
   7.2.321 (NONE -> 1.1)  (NEW), 7.2.322 (NONE -> 1.1)  (NEW), 7.2.323 (NONE -> 1.1)  (NEW), 7.2.324 (NONE -> 1.1)  (NEW), 7.2.325 (NONE -> 1.1)  (NEW), 7.2.326 (NONE -> 1.1)  (NEW), 7.2.327 (NONE -> 1.1)  (NEW), 7.2.328 (NONE -> 1.1)  (NEW), 7.2.329 (NONE -> 1.1)  (NEW), 7.2.330 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/vim/7.2.321
diff -u /dev/null packages/vim/7.2.321:1.1
--- /dev/null	Tue Jan 12 21:53:41 2010
+++ packages/vim/7.2.321	Tue Jan 12 21:53:36 2010
@@ -0,0 +1,59 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.321
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.321
+Problem:    histadd() and searching with "*" fails to add entry to history
+	    when it is empty.
+Solution:   Initialize the history. (Lech Lorens)
+Files:	    src/eval.c, src/normal.c
+
+
+*** ../vim-7.2.320/src/eval.c	2009-11-17 12:20:30.000000000 +0100
+--- src/eval.c	2009-12-24 14:37:50.000000000 +0100
+***************
+*** 12014,12019 ****
+--- 12014,12020 ----
+  	str = get_tv_string_buf(&argvars[1], buf);
+  	if (*str != NUL)
+  	{
++ 	    init_history();
+  	    add_to_history(histype, str, FALSE, NUL);
+  	    rettv->vval.v_number = TRUE;
+  	    return;
+*** ../vim-7.2.320/src/normal.c	2009-05-17 13:30:58.000000000 +0200
+--- src/normal.c	2009-12-24 14:38:28.000000000 +0100
+***************
+*** 5602,5607 ****
+--- 5602,5608 ----
+  	    STRCAT(buf, "\\>");
+  #ifdef FEAT_CMDHIST
+  	/* put pattern in search history */
++ 	init_history();
+  	add_to_history(HIST_SEARCH, buf, TRUE, NUL);
+  #endif
+  	normal_search(cap, cmdchar == '*' ? '/' : '?', buf, 0);
+*** ../vim-7.2.320/src/version.c	2009-12-16 19:02:05.000000000 +0100
+--- src/version.c	2009-12-24 14:39:46.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+  {   /* Add new patch number below this line */
++ /**/
++     321,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+43. You tell the kids they can't use the computer because "Daddy's got work to
+    do" and you don't even have a job.
+
+ /// 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    ///

================================================================
Index: packages/vim/7.2.322
diff -u /dev/null packages/vim/7.2.322:1.1
--- /dev/null	Tue Jan 12 21:53:41 2010
+++ packages/vim/7.2.322	Tue Jan 12 21:53:36 2010
@@ -0,0 +1,49 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.322
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.322
+Problem:    Wrong indenting in virtual replace mode with CTRL-Y below a short
+	    line.
+Solution:   Check for character to be NUL. (suggested by Lech Lorens)
+Files:	    src/edit.c
+
+
+*** ../vim-7.2.321/src/edit.c	2009-11-17 17:40:34.000000000 +0100
+--- src/edit.c	2009-12-24 15:18:23.000000000 +0100
+***************
+*** 7397,7402 ****
+--- 7397,7406 ----
+      int		icase;
+      int		i;
+  
++     if (keytyped == NUL)
++ 	/* Can happen with CTRL-Y and CTRL-E on a short line. */
++ 	return FALSE;
++ 
+  #ifdef FEAT_EVAL
+      if (*curbuf->b_p_inde != NUL)
+  	look = curbuf->b_p_indk;	/* 'indentexpr' set: use 'indentkeys' */
+*** ../vim-7.2.321/src/version.c	2009-12-24 15:00:31.000000000 +0100
+--- src/version.c	2009-12-24 15:44:46.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+  {   /* Add new patch number below this line */
++ /**/
++     322,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+45. You buy a Captain Kirk chair with a built-in keyboard and mouse.
+
+ /// 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    ///

================================================================
Index: packages/vim/7.2.323
diff -u /dev/null packages/vim/7.2.323:1.1
--- /dev/null	Tue Jan 12 21:53:41 2010
+++ packages/vim/7.2.323	Tue Jan 12 21:53:36 2010
@@ -0,0 +1,95 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.323 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.323 (extra)
+Problem:    Balloon evaluation crashes on Win64.
+Solution:   Change pointer types. (Sergey Khorev)
+Files:	    src/gui_w32.c
+
+
+*** ../vim-7.2.322/src/gui_w32.c	2009-01-28 21:22:20.000000000 +0100
+--- src/gui_w32.c	2009-12-24 16:06:41.000000000 +0100
+***************
+*** 212,223 ****
+      DWORD dwPlatformID;
+  } DLLVERSIONINFO;
+  
+  typedef struct tagTOOLINFOA_NEW
+  {
+  	UINT cbSize;
+  	UINT uFlags;
+  	HWND hwnd;
+! 	UINT uId;
+  	RECT rect;
+  	HINSTANCE hinst;
+  	LPSTR lpszText;
+--- 212,225 ----
+      DWORD dwPlatformID;
+  } DLLVERSIONINFO;
+  
++ #include <poppack.h>
++ 
+  typedef struct tagTOOLINFOA_NEW
+  {
+  	UINT cbSize;
+  	UINT uFlags;
+  	HWND hwnd;
+! 	UINT_PTR uId;
+  	RECT rect;
+  	HINSTANCE hinst;
+  	LPSTR lpszText;
+***************
+*** 227,241 ****
+  typedef struct tagNMTTDISPINFO_NEW
+  {
+      NMHDR      hdr;
+!     LPTSTR     lpszText;
+      char       szText[80];
+      HINSTANCE  hinst;
+      UINT       uFlags;
+      LPARAM     lParam;
+  } NMTTDISPINFO_NEW;
+  
+- #include <poppack.h>
+- 
+  typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
+  #ifndef TTM_SETMAXTIPWIDTH
+  # define TTM_SETMAXTIPWIDTH	(WM_USER+24)
+--- 229,241 ----
+  typedef struct tagNMTTDISPINFO_NEW
+  {
+      NMHDR      hdr;
+!     LPSTR      lpszText;
+      char       szText[80];
+      HINSTANCE  hinst;
+      UINT       uFlags;
+      LPARAM     lParam;
+  } NMTTDISPINFO_NEW;
+  
+  typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
+  #ifndef TTM_SETMAXTIPWIDTH
+  # define TTM_SETMAXTIPWIDTH	(WM_USER+24)
+*** ../vim-7.2.322/src/version.c	2009-12-24 15:45:53.000000000 +0100
+--- src/version.c	2009-12-24 16:08:33.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+  {   /* Add new patch number below this line */
++ /**/
++     323,
+  /**/
+
+-- 
+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    ///

================================================================
Index: packages/vim/7.2.324
diff -u /dev/null packages/vim/7.2.324:1.1
--- /dev/null	Tue Jan 12 21:53:41 2010
+++ packages/vim/7.2.324	Tue Jan 12 21:53:36 2010
@@ -0,0 +1,66 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.324
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.324
+Problem:    A negative column argument in setpos() may cause a crash.
+Solution:   Check for invalid column number. (James Vega)
+Files:	    src/eval.c, src/misc2.c
+
+
+*** ../vim-7.2.323/src/eval.c	2009-12-24 15:00:31.000000000 +0100
+--- src/eval.c	2009-12-31 13:09:19.000000000 +0100
+***************
+*** 15542,15548 ****
+      {
+  	if (list2fpos(&argvars[1], &pos, &fnum) == OK)
+  	{
+! 	    --pos.col;
+  	    if (name[0] == '.' && name[1] == NUL)
+  	    {
+  		/* set cursor */
+--- 15542,15549 ----
+      {
+  	if (list2fpos(&argvars[1], &pos, &fnum) == OK)
+  	{
+! 	    if (--pos.col < 0)
+! 		pos.col = 0;
+  	    if (name[0] == '.' && name[1] == NUL)
+  	    {
+  		/* set cursor */
+*** ../vim-7.2.323/src/misc2.c	2009-11-25 17:15:16.000000000 +0100
+--- src/misc2.c	2009-12-31 13:12:36.000000000 +0100
+***************
+*** 528,533 ****
+--- 528,535 ----
+  #endif
+  	}
+      }
++     else if (curwin->w_cursor.col < 0)
++ 	curwin->w_cursor.col = 0;
+  
+  #ifdef FEAT_VIRTUALEDIT
+      /* If virtual editing is on, we can leave the cursor on the old position,
+*** ../vim-7.2.323/src/version.c	2009-12-24 16:11:24.000000000 +0100
+--- src/version.c	2009-12-31 13:17:25.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+  {   /* Add new patch number below this line */
++ /**/
++     324,
+  /**/
+
+-- 
+"Thou shalt not follow the Null Pointer, for at its end Chaos and
+Madness lie."
+
+ /// 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    ///

================================================================
Index: packages/vim/7.2.325
diff -u /dev/null packages/vim/7.2.325:1.1
--- /dev/null	Tue Jan 12 21:53:41 2010
+++ packages/vim/7.2.325	Tue Jan 12 21:53:36 2010
@@ -0,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.325
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.325
+Problem:    A stray "w" in the startup vimrc file causes the edited file to be
+	    replaced with an empty file. (Stone Kang).
+Solution:   Do not write a buffer when it has never been loaded.
+Files:	    src/fileio.c
+
+
+*** ../vim-7.2.324/src/fileio.c	2009-12-02 13:32:10.000000000 +0100
+--- src/fileio.c	2009-12-31 14:08:31.000000000 +0100
+***************
+*** 2981,2986 ****
+--- 2981,2993 ----
+  
+      if (fname == NULL || *fname == NUL)	/* safety check */
+  	return FAIL;
++     if (buf->b_ml.ml_mfp == NULL)
++     {
++ 	/* This can happen during startup when there is a stray "w" in the
++ 	 * vimrc file. */
++ 	EMSG(_(e_emptybuf));
++ 	return FAIL;
++     }
+  
+      /*
+       * Disallow writing from .exrc and .vimrc in current directory for
+*** ../vim-7.2.324/src/version.c	2009-12-31 13:18:05.000000000 +0100
+--- src/version.c	2009-12-31 14:52:29.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+  {   /* Add new patch number below this line */
++ /**/
++     325,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+74. Your most erotic dreams are about cybersex
+
+ /// 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    ///

================================================================
Index: packages/vim/7.2.326
diff -u /dev/null packages/vim/7.2.326:1.1
--- /dev/null	Tue Jan 12 21:53:41 2010
+++ packages/vim/7.2.326	Tue Jan 12 21:53:36 2010
@@ -0,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.326
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.326
+Problem:    Win32: $HOME doesn't work when %HOMEPATH% is not defined.
+Solution:   Use "\" for %HOMEPATH% when it is not defined.
+Files:	    src/misc1.c
+
+
+*** ../vim-7.2.325/src/misc1.c	2009-12-02 17:47:46.000000000 +0100
+--- src/misc1.c	2010-01-05 19:53:23.000000000 +0100
+***************
+*** 3470,3476 ****
+  
+  	homedrive = mch_getenv((char_u *)"HOMEDRIVE");
+  	homepath = mch_getenv((char_u *)"HOMEPATH");
+! 	if (homedrive != NULL && homepath != NULL
+  			   && STRLEN(homedrive) + STRLEN(homepath) < MAXPATHL)
+  	{
+  	    sprintf((char *)NameBuff, "%s%s", homedrive, homepath);
+--- 3470,3478 ----
+  
+  	homedrive = mch_getenv((char_u *)"HOMEDRIVE");
+  	homepath = mch_getenv((char_u *)"HOMEPATH");
+! 	if (homepath == NULL || *homepath == NUL)
+! 	    homepath = "\\";
+! 	if (homedrive != NULL
+  			   && STRLEN(homedrive) + STRLEN(homepath) < MAXPATHL)
+  	{
+  	    sprintf((char *)NameBuff, "%s%s", homedrive, homepath);
+*** ../vim-7.2.325/src/version.c	2009-12-31 14:52:48.000000000 +0100
+--- src/version.c	2010-01-06 17:39:23.000000000 +0100
+***************
+*** 683,684 ****
+--- 683,686 ----
+  {   /* Add new patch number below this line */
++ /**/
++     326,
+  /**/
+
+-- 
+From "know your smileys":
+ :q	vi user saying, "How do I get out of this damn emacs editor?"
+
+ /// 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    ///

================================================================
Index: packages/vim/7.2.327
diff -u /dev/null packages/vim/7.2.327:1.1
--- /dev/null	Tue Jan 12 21:53:41 2010
+++ packages/vim/7.2.327	Tue Jan 12 21:53:36 2010
@@ -0,0 +1,323 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.327
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.327
+Problem:    Unused functions in Workshop.
+Solution:   Add "#if 0" and minor cleanup. (Dominique Pelle)
+Files:	    src/workshop.c, src/integration.c, src/ingegration.h
+
+
+*** ../vim-7.2.326/src/workshop.c	2009-05-21 23:25:38.000000000 +0200
+--- src/workshop.c	2010-01-06 18:10:10.000000000 +0100
+***************
+*** 56,67 ****
+  static void	 load_window(char *, int lnum);
+  static void	 warp_to_pc(int);
+  #ifdef FEAT_BEVAL
+! void		workshop_beval_cb(BalloonEval *, int);
+  #endif
+  static char	*fixAccelText(char *);
+  static void	 addMenu(char *, char *, char *);
+  static char	*lookupVerb(char *, int);
+- static int	 computeIndex(int, char_u *, int);
+  static void	 coloncmd(char *, Boolean);
+  
+  extern Widget	 vimShell;
+--- 56,67 ----
+  static void	 load_window(char *, int lnum);
+  static void	 warp_to_pc(int);
+  #ifdef FEAT_BEVAL
+! void		 workshop_beval_cb(BalloonEval *, int);
+! static int	 computeIndex(int, char_u *, int);
+  #endif
+  static char	*fixAccelText(char *);
+  static void	 addMenu(char *, char *, char *);
+  static char	*lookupVerb(char *, int);
+  static void	 coloncmd(char *, Boolean);
+  
+  extern Widget	 vimShell;
+***************
+*** 1624,1631 ****
+  	}
+      }
+  }
+- #endif
+- 
+  
+      static int
+  computeIndex(
+--- 1624,1629 ----
+***************
+*** 1649,1654 ****
+--- 1647,1653 ----
+  
+      return -1;
+  }
++ #endif
+  
+      static void
+  addMenu(
+*** ../vim-7.2.326/src/integration.c	2008-06-24 22:27:10.000000000 +0200
+--- src/integration.c	2010-01-06 18:18:11.000000000 +0100
+***************
+*** 78,84 ****
+  
+  /* Functions private to this file */
+  static void workshop_connection_closed(void);
+! static void messageFromEserve(XtPointer clientData, int *NOTUSED1, XtInputId *NOTUSED2);
+  static void workshop_disconnect(void);
+  static void workshop_sensitivity(int num, char *table);
+  static void adjust_sign_name(char *filename);
+--- 78,84 ----
+  
+  /* Functions private to this file */
+  static void workshop_connection_closed(void);
+! static void messageFromEserve(XtPointer clientData, int *dum1, XtInputId *dum2);
+  static void workshop_disconnect(void);
+  static void workshop_sensitivity(int num, char *table);
+  static void adjust_sign_name(char *filename);
+***************
+*** 157,165 ****
+  
+  }
+  
+- /*ARGSUSED*/
+  void
+! messageFromEserve(XtPointer clientData, int *NOTUSED1, XtInputId *NOTUSED2)
+  {
+  	char	*cmd;		/* the 1st word of the command */
+  
+--- 157,166 ----
+  
+  }
+  
+  void
+! messageFromEserve(XtPointer clientData UNUSED,
+! 		  int *dum1 UNUSED,
+! 		  XtInputId *dum2 UNUSED)
+  {
+  	char	*cmd;		/* the 1st word of the command */
+  
+***************
+*** 199,205 ****
+  			if (sign) {
+  				sign++;
+  			}
+! 			/* Change sign name to accomodate a different size? */
+  			adjust_sign_name(sign);
+  			workshop_add_mark_type(idx, color, sign);
+  		}
+--- 200,206 ----
+  			if (sign) {
+  				sign++;
+  			}
+! 			/* Change sign name to accommodate a different size? */
+  			adjust_sign_name(sign);
+  			workshop_add_mark_type(idx, color, sign);
+  		}
+***************
+*** 580,586 ****
+  #endif
+  
+  
+! /* Change sign name to accomodate a different size:
+   * Create the filename based on the height. The filename format
+   * of multisize icons are:
+   *    x.xpm   : largest icon
+--- 581,587 ----
+  #endif
+  
+  
+! /* Change sign name to accommodate a different size:
+   * Create the filename based on the height. The filename format
+   * of multisize icons are:
+   *    x.xpm   : largest icon
+***************
+*** 614,619 ****
+--- 615,621 ----
+  		strcpy(s, ".xpm");
+  }
+  
++ #if 0
+  /* Were we invoked by WorkShop? This function can be used early during startup
+     if you want to do things differently if the editor is started standalone
+     or in WorkShop mode. For example, in standalone mode you may not want to
+***************
+*** 627,632 ****
+--- 629,635 ----
+  	}
+  	return result;
+  }
++ #endif
+  
+  /* Connect back to eserve */
+  void	workshop_connect(XtAppContext context)
+***************
+*** 750,755 ****
+--- 753,759 ----
+   * Utility functions
+   */
+  
++ #if 0
+  /* Set icon for the window */
+  void
+  workshop_set_icon(Display *display, Widget shell, char **xpmdata,
+***************
+*** 793,798 ****
+--- 797,803 ----
+  	}
+  	XtFree((char *)xpmAttributes.colorsymbols);
+  }
++ #endif
+  
+  /* Minimize and maximize shells. From libutil's shell.cc. */
+  
<<Diff was trimmed, longer than 597 lines>>


More information about the pld-cvs-commit mailing list