rpms/vim/FC-3 6.3.055, NONE, 1.1 6.3.056, NONE, 1.1 6.3.057, NONE, 1.1 6.3.058, NONE, 1.1 6.3.059, NONE, 1.1 6.3.060, NONE, 1.1 6.3.061, NONE, 1.1 6.3.062, NONE, 1.1 6.3.063, NONE, 1.1 6.3.064, NONE, 1.1 6.3.065, NONE, 1.1 6.3.066, NONE, 1.1 6.3.067, NONE, 1.1 6.3.068, NONE, 1.1 6.3.069, NONE, 1.1 6.3.070, NONE, 1.1 6.3.071, NONE, 1.1 6.3.072, NONE, 1.1 6.3.073, NONE, 1.1 6.3.074, NONE, 1.1 6.3.075, NONE, 1.1 6.3.076, NONE, 1.1 6.3.077, NONE, 1.1 6.3.078, NONE, 1.1 6.3.079, NONE, 1.1 6.3.080, NONE, 1.1 6.3.081, NONE, 1.1 6.3.082, NONE, 1.1 6.3.083, NONE, 1.1 6.3.084, NONE, 1.1 6.3.085, NONE, 1.1 6.3.086, NONE, 1.1 README.patches, 1.21, 1.22 spec.vim, 1.1, 1.2 vim-6.3-tmpfile.patch, 1.1, 1.2 vim-selinux.patch, 1.2, 1.3 vim.spec, 1.45, 1.46 vimrc, 1.11, 1.12

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Aug 10 14:14:24 UTC 2005


Author: karsten

Update of /cvs/dist/rpms/vim/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv30707

Modified Files:
	README.patches spec.vim vim-6.3-tmpfile.patch 
	vim-selinux.patch vim.spec vimrc 
Added Files:
	6.3.055 6.3.056 6.3.057 6.3.058 6.3.059 6.3.060 6.3.061 
	6.3.062 6.3.063 6.3.064 6.3.065 6.3.066 6.3.067 6.3.068 
	6.3.069 6.3.070 6.3.071 6.3.072 6.3.073 6.3.074 6.3.075 
	6.3.076 6.3.077 6.3.078 6.3.079 6.3.080 6.3.081 6.3.082 
	6.3.083 6.3.084 6.3.085 6.3.086 
Log Message:
update FC-3 vim package to patchlevel 86


--- NEW FILE 6.3.055 ---
To: vim-dev at vim.org
Subject: Patch 6.3.055
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.055 (after 6.3.013)
Problem:    Can't use getcmdline(), getcmdpos() or setcmdpos() with <C-R>=
	    when editing a command line.  Using <C-\>e may crash Vim. (Peter
	    Winters)
Solution:   When moving ccline out of the way for recursive use, make it
	    available to the functions that need it.  Also save and restore
	    ccline when calling get_expr_line().  Make ccline.cmdbuf NULL at
	    the end of getcmdline().
Files:	    src/ex_getln.c


*** ../vim-6.3.054/src/ex_getln.c	Fri Oct 22 11:45:17 2004
--- src/ex_getln.c	Thu Jan 13 14:06:56 2005
***************
*** 80,85 ****
--- 80,87 ----
  static void	alloc_cmdbuff __ARGS((int len));
  static int	realloc_cmdbuff __ARGS((int len));
  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));
***************
*** 589,596 ****
  #ifdef FEAT_EVAL
  	    else if (c == 'e')
  	    {
! 		struct cmdline_info	    save_ccline;
! 		char_u		    *p;
  
  		/*
  		 * Replace the command line with the result of an expression.
--- 591,598 ----
  #ifdef FEAT_EVAL
  	    else if (c == 'e')
  	    {
! 		struct cmdline_info save_ccline;
! 		char_u		    *p = NULL;
  
  		/*
  		 * Replace the command line with the result of an expression.
***************
*** 601,614 ****
  		    new_cmdpos = 99999;	/* keep it at the end */
  		else
  		    new_cmdpos = ccline.cmdpos;
! 		save_ccline = ccline;
! 		ccline.cmdbuff = NULL;
! 		ccline.cmdprompt = NULL;
  		c = get_expr_register();
! 		ccline = save_ccline;
  		if (c == '=')
  		{
  		    p = get_expr_line();
  		    if (p != NULL
  			     && realloc_cmdbuff((int)STRLEN(p) + 1) == OK)
  		    {
--- 603,618 ----
  		    new_cmdpos = 99999;	/* keep it at the end */
  		else
  		    new_cmdpos = ccline.cmdpos;
! 
! 		save_cmdline(&save_ccline);
  		c = get_expr_register();
! 		restore_cmdline(&save_ccline);
  		if (c == '=')
  		{
+ 		    save_cmdline(&save_ccline);
  		    p = get_expr_line();
+ 		    restore_cmdline(&save_ccline);
+ 
  		    if (p != NULL
  			     && realloc_cmdbuff((int)STRLEN(p) + 1) == OK)
  		    {
***************
*** 1027,1037 ****
  		    }
  		    else
  		    {
! 			save_ccline = ccline;
! 			ccline.cmdbuff = NULL;
! 			ccline.cmdprompt = NULL;
  			c = get_expr_register();
! 			ccline = save_ccline;
  		    }
  		}
  #endif
--- 1031,1039 ----
  		    }
  		    else
  		    {
! 			save_cmdline(&save_ccline);
  			c = get_expr_register();
! 			restore_cmdline(&save_ccline);
  		    }
  		}
  #endif
***************
*** 1723,1729 ****
      ui_cursor_shape();		/* may show different cursor shape */
  #endif
  
!     return ccline.cmdbuff;
  }
  
  #if (defined(FEAT_CRYPT) || defined(FEAT_EVAL)) || defined(PROTO)
--- 1725,1737 ----
      ui_cursor_shape();		/* may show different cursor shape */
  #endif
  
!     {
! 	char_u *p = ccline.cmdbuff;
! 
! 	/* Make ccline empty, getcmdline() may try to use it. */
! 	ccline.cmdbuff = NULL;
! 	return p;
!     }
  }
  
  #if (defined(FEAT_CRYPT) || defined(FEAT_EVAL)) || defined(PROTO)
***************
*** 1743,1754 ****
      struct cmdline_info	save_ccline;
      int			msg_col_save = msg_col;
  
!     save_ccline = ccline;
!     ccline.cmdbuff = NULL;
      ccline.cmdprompt = prompt;
      ccline.cmdattr = attr;
      s = getcmdline(firstc, 1L, 0);
!     ccline = save_ccline;
      /* Restore msg_col, the prompt from input() may have changed it. */
      msg_col = msg_col_save;
  
--- 1751,1761 ----
      struct cmdline_info	save_ccline;
      int			msg_col_save = msg_col;
  
!     save_cmdline(&save_ccline);
      ccline.cmdprompt = prompt;
      ccline.cmdattr = attr;
      s = getcmdline(firstc, 1L, 0);
!     restore_cmdline(&save_ccline);
      /* Restore msg_col, the prompt from input() may have changed it. */
      msg_col = msg_col_save;
  
***************
*** 2537,2542 ****
--- 2544,2583 ----
      return retval;
  }
  
+ static struct cmdline_info  prev_ccline;
+ static int		    prev_ccline_used = FALSE;
+ 
+ /*
+  * Save ccline, because obtaining the "=" register may execute "normal :cmd"
+  * and overwrite it.  But get_cmdline_str() may need it, thus make it
+  * available globally in prev_ccline.
+  */
+     static void
+ save_cmdline(ccp)
+     struct cmdline_info *ccp;
+ {
+     if (!prev_ccline_used)
+     {
+ 	vim_memset(&prev_ccline, 0, sizeof(struct cmdline_info));
+ 	prev_ccline_used = TRUE;
+     }
+     *ccp = prev_ccline;
+     prev_ccline = ccline;
+     ccline.cmdbuff = NULL;
+     ccline.cmdprompt = NULL;
+ }
+ 
+ /*
+  * Resture ccline after it has been saved with save_cmdline().
+  */
+     static void
+ restore_cmdline(ccp)
+     struct cmdline_info *ccp;
+ {
+     ccline = prev_ccline;
+     prev_ccline = *ccp;
+ }
+ 
  /*
   * paste a yank register into the command line.
   * used by CTRL-R command in command-line mode
***************
*** 2571,2583 ****
      regname = may_get_selection(regname);
  #endif
  
!     /* Need to save and restore ccline, because obtaining the "=" register may
!      * execute "normal :cmd" and overwrite it. */
!     save_ccline = ccline;
!     ccline.cmdbuff = NULL;
!     ccline.cmdprompt = NULL;
      i = get_spec_reg(regname, &arg, &allocated, TRUE);
!     ccline = save_ccline;
  
      if (i)
      {
--- 2612,2621 ----
      regname = may_get_selection(regname);
  #endif
  
!     /* Need to save and restore ccline. */
!     save_cmdline(&save_ccline);
      i = get_spec_reg(regname, &arg, &allocated, TRUE);
!     restore_cmdline(&save_ccline);
  
      if (i)
      {
***************
*** 4541,4546 ****
--- 4579,4602 ----
      return history[histype][hisidx[histype]].hisnum;
  }
  
+ static struct cmdline_info *get_ccline_ptr __ARGS((void));
+ 
+ /*
+  * Get pointer to the command line info to use. cmdline_paste() may clear
+  * ccline and put the previous value in prev_ccline.
+  */
+     static struct cmdline_info *
+ get_ccline_ptr()
+ {
+     if ((State & CMDLINE) == 0)
+ 	return NULL;
+     if (ccline.cmdbuff != NULL)
+ 	return &ccline;
+     if (prev_ccline_used && prev_ccline.cmdbuff != NULL)
+ 	return &prev_ccline;
+     return NULL;
+ }
+ 
  /*
   * Get the current command line in allocated memory.
   * Only works when the command line is being edited.
***************
*** 4549,4557 ****
      char_u *
  get_cmdline_str()
  {
!     if (ccline.cmdbuff == NULL || (State & CMDLINE) == 0)
  	return NULL;
!     return vim_strnsave(ccline.cmdbuff, ccline.cmdlen);
  }
  
  /*
--- 4605,4615 ----
      char_u *
  get_cmdline_str()
  {
!     struct cmdline_info *p = get_ccline_ptr();
! 
!     if (p == NULL)
  	return NULL;
!     return vim_strnsave(p->cmdbuff, p->cmdlen);
  }
  
  /*
***************
*** 4563,4571 ****
      int
  get_cmdline_pos()
  {
!     if (ccline.cmdbuff == NULL || (State & CMDLINE) == 0)
  	return -1;
!     return ccline.cmdpos;
  }
  
  /*
--- 4621,4631 ----
      int
  get_cmdline_pos()
  {
!     struct cmdline_info *p = get_ccline_ptr();
! 
!     if (p == NULL)
  	return -1;
!     return p->cmdpos;
  }
  
  /*
***************
*** 4577,4583 ****
  set_cmdline_pos(pos)
      int		pos;
  {
!     if (ccline.cmdbuff == NULL || (State & CMDLINE) == 0)
  	return 1;
  
      /* The position is not set directly but after CTRL-\ e or CTRL-R = has
--- 4637,4645 ----
  set_cmdline_pos(pos)
      int		pos;
  {
!     struct cmdline_info *p = get_ccline_ptr();
! 
!     if (p == NULL)
  	return 1;
  
      /* The position is not set directly but after CTRL-\ e or CTRL-R = has
*** ../vim-6.3.054/src/version.c	Wed Jan  5 11:17:36 2005
--- src/version.c	Thu Jan 13 14:08:12 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     55,
  /**/

-- 
ARTHUR:  Well, I AM king...
DENNIS:  Oh king, eh, very nice.  An' how'd you get that, eh?  By exploitin'
         the workers -- by 'angin' on to outdated imperialist dogma which
         perpetuates the economic an' social differences in our society!  If
         there's ever going to be any progress--
                                  The Quest for the Holy Grail (Monty Python)

 /// 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   ///


--- NEW FILE 6.3.056 ---
To: vim-dev at vim.org
Subject: Patch 6.3.056
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.056
Problem:    The last characters of a multi-byte file name may not be displayed
	    in the window title.
Solution:   Avoid to remove a multi-byte character where the last byte looks
	    like a path separator character. (Yasuhiro Matsumoto)
Files:	    src/buffer.c, src/ex_getln.c


*** ../vim-6.3.055/src/buffer.c	Sun Dec  5 16:18:46 2004
--- src/buffer.c	Thu Dec 16 13:59:48 2004
***************
*** 2953,2959 ****
  		}
  		else
  		{
! 		    while (p > buf + off + 1 && vim_ispathsep(p[-1]))
  			--p;
  #ifdef VMS
  		    /* path separator is part of the path */
--- 2953,2964 ----
  		}
  		else
  		{
! 		    while (p > buf + off + 1 && vim_ispathsep(p[-1])
! #ifdef FEAT_MBYTE
! 			    && (!has_mbyte
! 				     || (*mb_head_off)(buf + off, p - 1) == 0)
! #endif
! 			    )
  			--p;
  #ifdef VMS
  		    /* path separator is part of the path */
*** ../vim-6.3.055/src/ex_getln.c	Thu Jan 13 14:17:23 2005
--- src/ex_getln.c	Thu Jan 13 14:22:02 2005
***************
*** 496,501 ****
--- 496,505 ----
  		i = (int)(xpc.xp_pattern - ccline.cmdbuff);
  		while (--j > i)
  		{
+ #ifdef FEAT_MBYTE
+ 		    if (has_mbyte)
+ 			j -= (*mb_head_off)(ccline.cmdbuff, ccline.cmdbuff + j);
+ #endif
  		    if (vim_ispathsep(ccline.cmdbuff[j]))
  		    {
  			found = TRUE;
*** ../vim-6.3.055/src/version.c	Thu Jan 13 14:17:23 2005
--- src/version.c	Thu Jan 13 16:21:13 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     56,
  /**/

-- 
Vim is like Emacs without all the typing.  (John "Johann" Spetz)

 /// 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   ///


--- NEW FILE 6.3.057 ---
To: vim-dev at vim.org
Subject: Patch 6.3.057
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.057
Problem:    When filtering lines folds are not updated. (Carl Osterwisch)
Solution:   Update folds for filtered lines.
Files:	    src/ex_cmds.c


*** ../vim-6.3.056/src/ex_cmds.c	Tue Jul  6 14:57:26 2004
--- src/ex_cmds.c	Thu Jan 13 17:38:23 2005
***************
*** 905,910 ****
--- 905,913 ----
  	    curbuf->b_op_end.lnum -= linecount;		/* adjust '] */
  	    write_lnum_adjust(-linecount);		/* adjust last line
  							   for next write */
+ #ifdef FEAT_FOLDING
+ 	    foldUpdate(curwin, curbuf->b_op_start.lnum, curbuf->b_op_end.lnum);
+ #endif
  	}
  	else
  	{
*** ../vim-6.3.056/src/version.c	Thu Jan 13 16:25:02 2005
--- src/version.c	Thu Jan 13 17:36:11 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     57,
  /**/

-- 
WOMAN:   I didn't know we had a king. I thought we were an autonomous
         collective.
DENNIS:  You're fooling yourself.  We're living in a dictatorship.  A
         self-perpetuating autocracy in which the working classes--
WOMAN:   Oh there you go, bringing class into it again.
DENNIS:  That's what it's all about if only people would--
                                  The Quest for the Holy Grail (Monty Python)

 /// 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   ///


--- NEW FILE 6.3.058 ---
To: vim-dev at vim.org
Subject: Patch 6.3.058
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.058
Problem:    When 'foldcolumn' is equal to the window width and 'wrap' is on
	    Vim may crash.  Disabling the vertical split feature breaks
	    compiling.  (Peter Winters)
Solution:   Check for zero room for wrapped text.  Make compiling without
	    vertical splits possible.
Files:	    src/move.c, src/quickfix.c, src/screen.c, src/netbeans.c


*** ../vim-6.3.057/src/move.c	Mon Dec  6 11:51:12 2004
--- src/move.c	Thu Jan 13 19:16:32 2005
***************
*** 871,880 ****
  
  	/* long line wrapping, adjust curwin->w_wrow */
  	if (curwin->w_p_wrap && col >= (colnr_T)W_WIDTH(curwin)
! #ifdef FEAT_VERTSPLIT
! 		&& curwin->w_width != 0
! #endif
! 		)
  	{
  	    col -= W_WIDTH(curwin);
  	    col = col % (W_WIDTH(curwin) - off + curwin_col_off2());
--- 871,877 ----
  
  	/* long line wrapping, adjust curwin->w_wrow */
  	if (curwin->w_p_wrap && col >= (colnr_T)W_WIDTH(curwin)
! 		&& W_WIDTH(curwin) - off + curwin_col_off2() > 0)
  	{
  	    col -= W_WIDTH(curwin);
  	    col = col % (W_WIDTH(curwin) - off + curwin_col_off2());
*** ../vim-6.3.057/src/quickfix.c	Wed Jun  9 14:56:26 2004
--- src/quickfix.c	Thu Jan 13 19:19:21 2005
***************
*** 1680,1687 ****
--- 1680,1689 ----
  	else if (buf != curbuf)
  	    set_curbuf(buf, DOBUF_GOTO);
  
+ #ifdef FEAT_VERTSPLIT
  	/* Only set the height when there is no window to the side. */
  	if (curwin->w_width == Columns)
+ #endif
  	    win_setheight(height);
  	curwin->w_p_wfh = TRUE;	    /* set 'winfixheight' */
  	if (win_valid(win))
*** ../vim-6.3.057/src/screen.c	Thu Dec 16 12:48:12 2004
--- src/screen.c	Thu Jan 13 19:21:40 2005
***************
*** 1906,1913 ****
  	if (n > 0)
  	{
  	    /* draw the fold column at the right */
! 	    if (n > wp->w_width)
! 		n = wp->w_width;
  	    screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
  		    W_ENDCOL(wp) - n, (int)W_ENDCOL(wp),
  		    ' ', ' ', hl_attr(HLF_FC));
--- 1906,1913 ----
  	if (n > 0)
  	{
  	    /* draw the fold column at the right */
! 	    if (n > W_WIDTH(wp))
! 		n = W_WIDTH(wp);
  	    screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
  		    W_ENDCOL(wp) - n, (int)W_ENDCOL(wp),
  		    ' ', ' ', hl_attr(HLF_FC));
***************
*** 1919,1926 ****
  	    int nn = n + 2;
  
  	    /* draw the sign column left of the fold column */
! 	    if (nn > wp->w_width)
! 		nn = wp->w_width;
  	    screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
  		    W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n,
  		    ' ', ' ', hl_attr(HLF_SC));
--- 1919,1926 ----
  	    int nn = n + 2;
  
  	    /* draw the sign column left of the fold column */
! 	    if (nn > W_WIDTH(wp))
! 		nn = W_WIDTH(wp);
  	    screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
  		    W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n,
  		    ' ', ' ', hl_attr(HLF_SC));
*** ../vim-6.3.057/src/netbeans.c	Wed Jun  9 14:56:26 2004
--- src/netbeans.c	Thu Jan 13 19:22:30 2005
***************
*** 2693,2699 ****
  
      if (bufno >= 0 && curwin != NULL && curwin->w_buffer == curbuf)
      {
! 	int col = mouse_col - curwin->w_wincol - (curwin->w_p_nu ? 9 : 1);
  	long off = pos2off(curbuf, &curwin->w_cursor);
  
  	/* sync the cursor position */
--- 2693,2699 ----
  
      if (bufno >= 0 && curwin != NULL && curwin->w_buffer == curbuf)
      {
! 	int col = mouse_col - W_WINCOL(curwin) - (curwin->w_p_nu ? 9 : 1);
  	long off = pos2off(curbuf, &curwin->w_cursor);
  
  	/* sync the cursor position */
*** ../vim-6.3.057/src/version.c	Thu Jan 13 17:38:30 2005
--- src/version.c	Tue Jan 18 10:49:55 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     58,
  /**/

-- 
TALL KNIGHT:   Firstly.  You must get us another shrubbery!
OTHER KNIGHTS: More shrubberies!  More shrubberies for the ex-Knights of Ni!
ARTHUR:        Not another shrubbery -
                 "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   ///


--- NEW FILE 6.3.059 ---
To: vim-dev at vim.org
Subject: Patch 6.3.059
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.059
Problem:    Crash when expanding an ":edit" command containing several spaces
	    with the shell. (Brian Hirt)
Solution:   Allocate enough space for the quotes.
Files:	    src/os_unix.c


*** ../vim-6.3.058/src/os_unix.c	Sat Sep 18 20:28:07 2004
--- src/os_unix.c	Sat Jan 29 15:07:53 2005
***************
*** 4735,4742 ****
  
      /* "unset nonomatch; print -N >" plus two is 29 */
      len = STRLEN(tempname) + 29;
!     for (i = 0; i < num_pat; ++i)	/* count the length of the patterns */
  	len += STRLEN(pat[i]) + 3;	/* add space and two quotes */
      command = alloc(len);
      if (command == NULL)
      {
--- 4735,4766 ----
  
      /* "unset nonomatch; print -N >" plus two is 29 */
      len = STRLEN(tempname) + 29;
!     for (i = 0; i < num_pat; ++i)
!     {
! 	/* Count the length of the patterns in the same way as they are put in
! 	 * "command" below. */
! #ifdef USE_SYSTEM
  	len += STRLEN(pat[i]) + 3;	/* add space and two quotes */
+ #else
+ 	++len;				/* add space */
+ 	for (j = 0; pat[i][j] != NUL; )
+ 	    if (vim_strchr((char_u *)" '", pat[i][j]) != NULL)
+ 	    {
+ 		len += 2;		/* add two quotes */
+ 		while (pat[i][j] != NUL
+ 			&& vim_strchr((char_u *)" '", pat[i][j]) != NULL)
+ 		{
+ 		    ++len;
+ 		    ++j;
+ 		}
+ 	    }
+ 	    else
+ 	    {
+ 		++len;
+ 		++j;
+ 	    }
+ #endif
+     }
      command = alloc(len);
      if (command == NULL)
      {
*** ../vim-6.3.058/src/version.c	Tue Jan 18 10:53:53 2005
--- src/version.c	Sat Jan 29 16:11:00 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     59,
  /**/

-- 
The budget process was invented by an alien race of sadistic beings who
resemble large cats.
				(Scott Adams - The Dilbert principle)

 /// 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   ///


--- NEW FILE 6.3.060 ---
To: vim-dev at vim.org
Subject: Patch 6.3.060
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.060
Problem:    Using CTRL-R CTRL-O in Insert mode with an invalid register name
	    still causes something to be inserted.
Solution:   Check the register name for being valid.
Files:	    src/edit.c


*** ../vim-6.3.059/src/edit.c	Wed Jan  5 11:17:36 2005
--- src/edit.c	Thu Jan 27 10:33:51 2005
***************
*** 5933,5940 ****
  	    im_set_active(TRUE);
  #endif
      }
!     if (regname == NUL)
  	need_redraw = TRUE;	/* remove the '"' */
      else
      {
  #endif
--- 5933,5943 ----
  	    im_set_active(TRUE);
  #endif
      }
!     if (regname == NUL || !valid_yank_reg(regname, FALSE))
!     {
! 	vim_beep();
  	need_redraw = TRUE;	/* remove the '"' */
+     }
      else
      {
  #endif
*** ../vim-6.3.059/src/version.c	Sat Jan 29 16:14:42 2005
--- src/version.c	Sat Jan 29 16:18:08 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     60,
  /**/

-- 
Engineers will go without food and hygiene for days to solve a problem.
(Other times just because they forgot.)
				(Scott Adams - The Dilbert principle)

 /// 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   ///


--- NEW FILE 6.3.061 ---
To: vim-dev at vim.org
Subject: Patch 6.3.061
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.061
Problem:    When editing a utf-8 file in an utf-8 xterm and there is a
	    multi-byte character in the last column, displaying is messed up.
	    (Joël Rio)
Solution:   Check for a multi-byte character, not a multi-column character.
Files:	    src/screen.c


*** ../vim-6.3.060/src/screen.c	Tue Jan 18 10:53:53 2005
--- src/screen.c	Wed Jan 19 11:03:00 2005
***************
*** 4169,4176 ****
  #ifdef FEAT_MBYTE
  		    /* When there is a multi-byte character, just output a
  		     * space to keep it simple. */
! 		    if (has_mbyte && mb_off2cells(LineOffset[screen_row - 1]
! 						+ (unsigned)Columns - 1) != 1)
  			out_char(' ');
  		    else
  #endif
--- 4169,4176 ----
  #ifdef FEAT_MBYTE
  		    /* When there is a multi-byte character, just output a
  		     * space to keep it simple. */
! 		    if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[
! 					screen_row - 1] + (Columns - 1)]) > 1)
  			out_char(' ');
  		    else
  #endif
*** ../vim-6.3.060/src/version.c	Sat Jan 29 16:19:09 2005
--- src/version.c	Sat Jan 29 16:25:13 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     61,
  /**/

-- 
Article in the first Free Software Magazine: "Bram Moolenaar studied electrical
engineering at the Technical University of Delft and graduated in 1985 on a
multi-processor Unix architecture."
Response by "dimator": Could the school not afford a proper stage for the
ceremony?

 /// 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   ///


--- NEW FILE 6.3.062 ---
To: vim-dev at vim.org
Subject: Patch 6.3.062
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.062
Problem:    ":normal! gQ" hangs.
Solution:   Quit getcmdline() and do_exmode() when out of typeahead.
Files:	    src/ex_getln.c, src/ex_docmd.c


*** ../vim-6.3.049/src/ex_getln.c	Thu Jan 13 16:25:02 2005
--- src/ex_getln.c	Sun Feb 13 20:35:24 2005
***************
*** 997,1004 ****
  
  	case ESC:	/* get here if p_wc != ESC or when ESC typed twice */
  	case Ctrl_C:
! 		/* In exmode it doesn't make sense to return. */
! 		if (exmode_active)
  		    goto cmdline_not_changed;
  
  		gotesc = TRUE;		/* will free ccline.cmdbuff after
--- 997,1009 ----
  
  	case ESC:	/* get here if p_wc != ESC or when ESC typed twice */
  	case Ctrl_C:
! 		/* In exmode it doesn't make sense to return. Except when
! 		 * ":normal" runs out of characters. */
! 		if (exmode_active
! #ifdef FEAT_EX_EXTRA
! 			&& (ex_normal_busy == 0 || typebuf.tb_len > 0)
! #endif
! 		   )
  		    goto cmdline_not_changed;
  
  		gotesc = TRUE;		/* will free ccline.cmdbuff after
*** ../vim-6.3.049/src/ex_docmd.c	Sun Dec  5 16:18:46 2004
--- src/ex_docmd.c	Sun Feb 13 20:39:37 2005
***************
*** 525,530 ****
--- 525,538 ----
      MSG(_("Entering Ex mode.  Type \"visual\" to go to Normal mode."));
      while (exmode_active)
      {
+ #ifdef FEAT_EX_EXTRA
+ 	/* Check for a ":normal" command and no more characters left. */
+ 	if (ex_normal_busy > 0 && typebuf.tb_len == 0)
+ 	{
+ 	    exmode_active = FALSE;
+ 	    break;
+ 	}
+ #endif
  	msg_scroll = TRUE;
  	need_wait_return = FALSE;
  	ex_pressedreturn = FALSE;
*** ../vim-6.3.049/src/version.c	Sat Jan 29 16:25:36 2005
--- src/version.c	Sun Feb 13 20:45:33 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     62,
  /**/

-- 
I AM THANKFUL...
...for the taxes that I pay because it means that I am employed.

 /// 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   ///


--- NEW FILE 6.3.063 ---
To: vim-dev at vim.org
Subject: Patch 6.3.063
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.063
Problem:    When a CursorHold autocommand changes to another window
	    (temporarily) 'mousefocus' stops working.
Solution:   Call gui_mouse_correct() after triggering CursorHold.
Files:	    src/gui.c


*** ../vim-6.3.050/src/gui.c	Sun Sep  5 20:48:38 2004
--- src/gui.c	Fri Mar 11 19:11:00 2005
***************
*** 2626,2631 ****
--- 2626,2635 ----
  	    update_screen(VALID);
  	    showruler(FALSE);
  	    setcursor();
+ 	    /* In case the commands moved the focus to another window
+ 	     * (temporarily). */
+ 	    if (need_mouse_correct)
+ 		gui_mouse_correct();
  
  	    once_already = 1;
  	    retval = 0;
*** ../vim-6.3.050/src/version.c	Sun Feb 13 20:46:05 2005
--- src/version.c	Fri Mar 11 19:12:29 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     63,
  /**/

-- 
Trees moving back and forth is what makes the wind blow.

 /// 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   ///


--- NEW FILE 6.3.064 ---
To: vim-dev at vim.org
Subject: Patch 6.3.064
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.064
Problem:    line2byte(line("$") + 1) sometimes returns the wrong number.
	    (Charles Campbell)
Solution:   Flush the cached line before counting the bytes.
Files:	    src/memline.c


*** ../vim-6.3.041/src/memline.c	Wed Jun  9 14:56:26 2004
--- src/memline.c	Thu Feb 17 11:02:53 2005
***************
*** 4247,4252 ****
--- 4247,4255 ----
      int		ffdos = (get_fileformat(buf) == EOL_DOS);
      int		extra = 0;
  
+     /* take care of cached line first */
+     ml_flush_line(curbuf);
+ 
      if (buf->b_ml.ml_usedchunks == -1
  	    || buf->b_ml.ml_chunksize == NULL
  	    || line < 0)
*** ../vim-6.3.041/src/version.c	Fri Mar 11 19:14:17 2005
--- src/version.c	Fri Mar 11 19:15:46 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     64,
  /**/

-- 
FATHER:    You killed eight wedding guests in all!
LAUNCELOT: Er, Well ... the thing is ... I thought your son was a lady.
FATHER:    I can understand that.
                 "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   ///


--- NEW FILE 6.3.065 ---
To: vim-dev at vim.org
Subject: Patch 6.3.065
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.065 
Problem:    The euro digraph doesn't always work.
Solution:   Add an "e=" digraph for Unicode euro character and adjust the
            help files.
Files:      src/digraph.c, runtime/doc/digraph.txt


*** ../vim-6.3.034/src/digraph.c	Wed Jun  9 14:56:25 2004
--- src/digraph.c	Fri Mar 18 10:50:52 2005
***************
*** 1428,1433 ****
--- 1428,1434 ----
  	{'L', 'i', 0x20a4},
  	{'P', 't', 0x20a7},
  	{'W', '=', 0x20a9},
+ 	{'=', 'e', 0x20ac}, /* euro */
  	{'o', 'C', 0x2103},
  	{'c', 'o', 0x2105},
  	{'o', 'F', 0x2109},
*** ../vim-6.3.034/runtime/doc/digraph.txt	Wed Jun  9 14:56:28 2004
--- runtime/doc/digraph.txt	Fri Mar 18 10:52:35 2005
***************
*** 1,4 ****
! *digraph.txt*   For Vim version 6.3.  Last change: 2001 Sep 03
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *digraph.txt*   For Vim version 6.3.  Last change: 2005 Mar 18
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 28,34 ****
  							*E104* *E39*
  :dig[raphs] {char1}{char2} {number} ...
  			Add digraph {char1}{char2} to the list.  {number} is
! 			the decimal representation of the character.
  			Example: >
  	:digr e: 235 a: 228
  <			Avoid defining a digraph with '_' (underscore) as the
--- 28,35 ----
  							*E104* *E39*
  :dig[raphs] {char1}{char2} {number} ...
  			Add digraph {char1}{char2} to the list.  {number} is
! 			the decimal representation of the character.  Normally
! 			it is the Unicode character, see |digraph-encoding|.
  			Example: >
  	:digr e: 235 a: 228
  <			Avoid defining a digraph with '_' (underscore) as the
***************
*** 48,54 ****
  if you look at it on a system that does not support digraphs or if you print
  this file.
  
! The decimal number is the number of the character.
  
  ==============================================================================
  2. Using digraphs					*digraphs-use*
--- 49,72 ----
  if you look at it on a system that does not support digraphs or if you print
  this file.
  
! 							*digraph-encoding*
! The decimal number normally is the Unicode number of the character.  Note that
! the meaning doesn't change when 'encoding' changes.  The character will be
! converted from Unicode to 'encoding' when needed.  This does require the
! conversion to be available, it might fail.
! 
! When Vim was compiled without the +multi_byte feature, you need to specify the
! character in the encoding given with 'encoding'.  You might want to use
! something like this: >
! 
! 	if has("multi_byte")
! 		digraph oe 339
! 	elseif &encoding == "iso-8859-15"
! 		digraph oe 189
! 	endif
! 
! This defines the "oe" digraph for a character that is number 339 in Unicode
! and 189 in latin9 (iso-8859-15).
  
  ==============================================================================
  2. Using digraphs					*digraphs-use*
***************
*** 142,147 ****
--- 160,173 ----
  These are the RFC1345 digraphs for the one-byte characters.  See the output of
  ":digraphs" for the others.  The characters above 255 are only available when
  Vim was compiled with the |+multi_byte| feature.
+ 
+ EURO
+ 
+ Exception: RFC1345 doesn't specify the euro sign.  In Vim the digraph =e was
+ added for this.  Note the difference between latin1, where the digraph Cu is
+ used for the currency sign, and latin9 (iso-8859-15), where the digraph =e is
+ used for the euro sign, while both of them are the character 164, 0xa4.
+ 
  							*digraph-table*
  char  digraph	hex	dec	official name ~
  ^@	NU	0x00	  0	NULL (NUL)
*** ../vim-6.3.034/src/version.c	Fri Mar 11 19:16:20 2005
--- src/version.c	Fri Mar 18 10:54:13 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     65,
  /**/

-- 
Lawmakers made it obligatory for everybody to take at least one bath
each week -- on Saturday night.
		[real standing law in Vermont, United States of America]

 /// 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   ///


--- NEW FILE 6.3.066 ---
To: vim-dev at vim.org
Subject: Patch 6.3.066
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.066
Problem:    Backup file may get wrong permissions.
Solution:   Use permissions of original file for backup file in more places.
Files:	    src/fileio.c


*** ../vim-6.3.029/src/fileio.c	Sat Sep 18 21:13:25 2004
--- src/fileio.c	Fri Mar 18 12:56:41 2005
***************
*** 3314,3320 ****
  		    /* Open with O_EXCL to avoid the file being created while
  		     * we were sleeping (symlink hacker attack?) */
  		    bfd = mch_open((char *)backup,
! 				       O_WRONLY|O_CREAT|O_EXTRA|O_EXCL, 0666);
  		    if (bfd < 0)
  		    {
  			vim_free(backup);
--- 3314,3320 ----
  		    /* Open with O_EXCL to avoid the file being created while
  		     * we were sleeping (symlink hacker attack?) */
  		    bfd = mch_open((char *)backup,
! 				O_WRONLY|O_CREAT|O_EXTRA|O_EXCL, perm & 0777);
  		    if (bfd < 0)
  		    {
  			vim_free(backup);
***************
*** 3698,3704 ****
      while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
  			? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
  			: (O_CREAT | O_TRUNC))
! 			, 0666)) < 0)
      {
  	/*
  	 * A forced write will try to create a new file if the old one is
--- 3698,3704 ----
      while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
  			? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
  			: (O_CREAT | O_TRUNC))
! 			, perm & 0777)) < 0)
      {
  	/*
  	 * A forced write will try to create a new file if the old one is
***************
*** 4104,4110 ****
  		if ((fd = mch_open((char *)backup, O_RDONLY | O_EXTRA, 0)) >= 0)
  		{
  		    if ((write_info.bw_fd = mch_open((char *)fname,
! 			  O_WRONLY | O_CREAT | O_TRUNC | O_EXTRA, 0666)) >= 0)
  		    {
  			/* copy the file. */
  			write_info.bw_buf = smallbuf;
--- 4104,4111 ----
  		if ((fd = mch_open((char *)backup, O_RDONLY | O_EXTRA, 0)) >= 0)
  		{
  		    if ((write_info.bw_fd = mch_open((char *)fname,
! 				    O_WRONLY | O_CREAT | O_TRUNC | O_EXTRA,
! 							   perm & 0777)) >= 0)
  		    {
  			/* copy the file. */
  			write_info.bw_buf = smallbuf;
***************
*** 4261,4267 ****
  
  	    if (org == NULL
  		    || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
! 								   0666)) < 0)
  	      EMSG(_("E206: patchmode: can't touch empty original file"));
  	    else
  	      close(empty_fd);
--- 4262,4268 ----
  
  	    if (org == NULL
  		    || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
! 							    perm & 0777)) < 0)
  	      EMSG(_("E206: patchmode: can't touch empty original file"));
  	    else
  	      close(empty_fd);
***************
*** 5693,5698 ****
--- 5694,5703 ----
      BPTR	flock;
  #endif
      struct stat	st;
+     long	perm;
+ #ifdef HAVE_ACL
+     vim_acl_T	acl;		/* ACL from original file */
+ #endif
  
      /*
       * When the names are identical, there is nothing to do.
***************
*** 5743,5752 ****
      /*
       * Rename() failed, try copying the file.
       */
      fd_in = mch_open((char *)from, O_RDONLY|O_EXTRA, 0);
      if (fd_in == -1)
  	return -1;
!     fd_out = mch_open((char *)to, O_CREAT|O_EXCL|O_WRONLY|O_EXTRA, 0666);
      if (fd_out == -1)
      {
  	close(fd_in);
--- 5748,5764 ----
      /*
       * Rename() failed, try copying the file.
       */
+     perm = mch_getperm(from);
+ #ifdef HAVE_ACL
+     /* For systems that support ACL: get the ACL from the original file. */
+     acl = mch_get_acl(from);
+ #endif
      fd_in = mch_open((char *)from, O_RDONLY|O_EXTRA, 0);
      if (fd_in == -1)
  	return -1;
! 
!     /* Create the new file with same permissions as the original. */
!     fd_out = mch_open((char *)to, O_CREAT|O_EXCL|O_WRONLY|O_EXTRA, (int)perm);
      if (fd_out == -1)
      {
  	close(fd_in);
***************
*** 5777,5782 ****
--- 5789,5798 ----
  	errmsg = _("E210: Error reading \"%s\"");
  	to = from;
      }
+     mch_setperm(to, perm);
+ #ifdef HAVE_ACL
+     mch_set_acl(to, acl);
+ #endif
      if (errmsg != NULL)
      {
  	EMSG2(errmsg, to);
*** ../vim-6.3.029/src/version.c	Fri Mar 18 10:56:48 2005
--- src/version.c	Fri Mar 18 13:36:18 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     66,
  /**/

-- 
Why is "abbreviation" such a long word?

 /// 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   ///


--- NEW FILE 6.3.067 ---
To: vim-dev at vim.org
Subject: Patch 6.3.067
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.067 (after 6.3.066)
Problem:    Newly created file gets execute permission.
Solution:   Check for "perm" to be negative before using it.
Files:	    src/fileio.c


*** ../vim-6.3.030/src/fileio.c	Fri Mar 18 13:37:34 2005
--- src/fileio.c	Fri Mar 18 19:16:29 2005
***************
*** 3698,3704 ****
      while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
  			? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
  			: (O_CREAT | O_TRUNC))
! 			, perm & 0777)) < 0)
      {
  	/*
  	 * A forced write will try to create a new file if the old one is
--- 3698,3704 ----
      while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
  			? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
  			: (O_CREAT | O_TRUNC))
! 			, perm < 0 ? 0666 : (perm & 0777))) < 0)
      {
  	/*
  	 * A forced write will try to create a new file if the old one is
***************
*** 4262,4268 ****
  
  	    if (org == NULL
  		    || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
! 							    perm & 0777)) < 0)
  	      EMSG(_("E206: patchmode: can't touch empty original file"));
  	    else
  	      close(empty_fd);
--- 4262,4268 ----
  
  	    if (org == NULL
  		    || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
! 					perm < 0 ? 0666 : (perm & 0777))) < 0)
  	      EMSG(_("E206: patchmode: can't touch empty original file"));
  	    else
  	      close(empty_fd);
*** ../vim-6.3.030/src/version.c	Fri Mar 18 13:37:34 2005
--- src/version.c	Fri Mar 18 19:17:45 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     67,
  /**/

-- 
If corn oil comes from corn, where does baby oil come from?

 /// 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   ///


--- NEW FILE 6.3.068 ---
To: vim-dev at vim.org
Subject: Patch 6.3.068
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.068
Problem:    When editing a compressed file xxx.gz which is a symbolic link to
            the actual file a ":write" renames the link.
Solution:   Resolve the link, so that the actual file is renamed and
            compressed.
Files:      runtime/plugin/gzip.vim
    

*** ../vim-6.3.025/runtime/plugin/gzip.vim	Wed Jun  9 14:56:33 2004
--- runtime/plugin/gzip.vim	Thu Mar 24 10:56:30 2005
***************
*** 1,6 ****
  " Vim plugin for editing compressed files.
  " Maintainer: Bram Moolenaar <Bram at vim.org>
! " Last Change: 2004 Jan 12
  
  " Exit quickly when:
  " - this plugin was already loaded
--- 1,6 ----
  " Vim plugin for editing compressed files.
  " Maintainer: Bram Moolenaar <Bram at vim.org>
! " Last Change: 2005 Mar 24
  
  " Exit quickly when:
  " - this plugin was already loaded
***************
*** 113,119 ****
    " don't do anything if the cmd is not supported
    if s:check(a:cmd)
      " Rename the file before compressing it.
!     let nm = expand("<afile>")
      let nmt = s:tempname(nm)
      if rename(nm, nmt) == 0
        call system(a:cmd . " " . nmt)
--- 113,119 ----
    " don't do anything if the cmd is not supported
    if s:check(a:cmd)
      " Rename the file before compressing it.
!     let nm = resolve(expand("<afile>"))
      let nmt = s:tempname(nm)
      if rename(nm, nmt) == 0
        call system(a:cmd . " " . nmt)
*** ../vim-6.3.025/src/version.c	Fri Mar 18 19:21:29 2005
--- src/version.c	Thu Mar 24 10:59:13 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     68,
  /**/

-- 
Are leaders born or made?  And if they're made, can we return them under
warranty?
				(Scott Adams - The Dilbert principle)

 /// 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   ///


--- NEW FILE 6.3.069 ---
To: vim-dev at vim.org
Subject: Patch 6.3.069
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.069
Problem:    When converting text with illegal characters Vim may crash.
Solution:   Avoid that too much is subtracted from the length. (Da Woon Jung)
Files:	    src/mbyte.c


*** ../vim-6.3.022/src/mbyte.c	Thu Oct  7 20:07:59 2004
--- src/mbyte.c	Sat Mar 19 18:53:19 2005
***************
*** 3039,3045 ****
  	    *to++ = '?';
  	    if ((*mb_ptr2cells)((char_u *)from) > 1)
  		*to++ = '?';
! 	    l = (*mb_ptr2len_check)((char_u *)from);
  	    from += l;
  	    fromlen -= l;
  	}
--- 3039,3052 ----
  	    *to++ = '?';
  	    if ((*mb_ptr2cells)((char_u *)from) > 1)
  		*to++ = '?';
! 	    if (enc_utf8)
! 		l = utfc_ptr2len_check_len((char_u *)from, fromlen);
! 	    else
! 	    {
! 		l = (*mb_ptr2len_check)((char_u *)from);
! 		if (l > fromlen)
! 		    l = fromlen;
! 	    }
  	    from += l;
  	    fromlen -= l;
  	}
*** ../vim-6.3.022/src/version.c	Thu Mar 24 11:03:11 2005
--- src/version.c	Mon Apr 11 11:37:19 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     69,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
99. The hum of a cooling fan and the click of keys is comforting to you.

 /// 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   ///


--- NEW FILE 6.3.070 ---
To: vim-dev at vim.org
Subject: Patch 6.3.070
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.070
Problem:    After ":set number linebreak wrap" and a vertical split, moving
	    the vertical separator far left will crash Vim. (Georg Dahn)
Solution:   Avoid dividing by zero.
Files:	    src/charset.c


*** ../vim-6.3.019/src/charset.c	Wed Jun  9 14:56:26 2004
--- src/charset.c	Sun Apr 10 17:35:14 2005
***************
*** 1005,1010 ****
--- 1005,1011 ----
      int		numberextra;
      char_u	*ps;
      int		tab_corr = (*s == TAB);
+     int		n;
  
      /*
       * No 'linebreak' and 'showbreak': return quickly.
***************
*** 1048,1056 ****
  	col2 = col;
  	colmax = W_WIDTH(wp) - numberextra;
  	if (col >= colmax)
! 	    colmax += (((col - colmax)
! 			/ (colmax + win_col_off2(wp))) + 1)
! 			* (colmax + win_col_off2(wp));
  	for (;;)
  	{
  	    ps = s;
--- 1049,1060 ----
  	col2 = col;
  	colmax = W_WIDTH(wp) - numberextra;
  	if (col >= colmax)
! 	{
! 	    n = colmax + win_col_off2(wp);
! 	    if (n > 0)
! 		colmax += (((col - colmax) / n) + 1) * n;
! 	}
! 
  	for (;;)
  	{
  	    ps = s;
*** ../vim-6.3.019/src/version.c	Mon Apr 11 11:38:29 2005
--- src/version.c	Mon Apr 11 11:40:47 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     70,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
100. The most exciting sporting events you noticed during summer 1996
    was Netscape vs. Microsoft.

 /// 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   ///


--- NEW FILE 6.3.071 ---
To: vim-dev at vim.org
Subject: Patch 6.3.071
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.071
Problem:    The message for CTRL-X mode is still displayed after an error for
	    'thesaurus' or 'dictionary' being empty.
Solution:   Clear "edit_submode".
Files:	    src/edit.c


*** ../vim-6.3.020/src/edit.c	Sat Jan 29 16:19:09 2005
--- src/edit.c	Fri Apr  8 11:16:31 2005
***************
*** 959,964 ****
--- 959,965 ----
  		if (*curbuf->b_p_tsr == NUL && *p_tsr == NUL)
  		{
  		    ctrl_x_mode = 0;
+ 		    edit_submode = NULL;
  		    msg_attr((char_u *)_("'thesaurus' option is empty"),
  			     hl_attr(HLF_E));
  		    if (emsg_silent == 0)
***************
*** 1163,1168 ****
--- 1164,1170 ----
  		if (*curbuf->b_p_dict == NUL && *p_dict == NUL)
  		{
  		    ctrl_x_mode = 0;
+ 		    edit_submode = NULL;
  		    msg_attr((char_u *)_("'dictionary' option is empty"),
  			     hl_attr(HLF_E));
  		    if (emsg_silent == 0)
*** ../vim-6.3.020/src/version.c	Mon Apr 11 11:49:54 2005
--- src/version.c	Mon Apr 11 11:51:26 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     71,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
101. U can read htis w/o ny porblm and cant figur eout Y its evn listd.

 /// 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   ///


--- NEW FILE 6.3.072 ---
To: vim-dev at vim.org
Subject: Patch 6.3.072
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.072
Problem:    Crash in giving substitute message when language is Chinese and
	    encoding is utf-8. (Yongwei)
Solution:   Make the msg_buf size larger when using multi-byte.
Files:	    src/vim.h


*** ../vim-6.3.017/src/vim.h	Sun Dec  5 16:18:46 2004
--- src/vim.h	Sun May 15 17:16:06 2005
***************
*** 1155,1161 ****
  #define LSIZE	    512		/* max. size of a line in the tags file */
  
  #define IOSIZE	   (1024+1)	/* file i/o and sprintf buffer size */
! #define MSG_BUF_LEN 80		/* length of buffer for small messages */
  
  #if defined(AMIGA) || defined(__linux__) || defined(__QNX__) || defined(__CYGWIN32__) || defined(_AIX)
  # define TBUFSZ 2048		/* buffer size for termcap entry */
--- 1155,1166 ----
  #define LSIZE	    512		/* max. size of a line in the tags file */
  
  #define IOSIZE	   (1024+1)	/* file i/o and sprintf buffer size */
! 
! #ifdef FEAT_MBYTE
! # define MSG_BUF_LEN 240	/* length of buffer for small messages */
! #else
! # define MSG_BUF_LEN 80		/* length of buffer for small messages */
! #endif
  
  #if defined(AMIGA) || defined(__linux__) || defined(__QNX__) || defined(__CYGWIN32__) || defined(_AIX)
  # define TBUFSZ 2048		/* buffer size for termcap entry */
*** ../vim-6.3.017/src/version.c	Mon Apr 11 11:52:17 2005
--- src/version.c	Fri May 20 13:18:16 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     72,
  /**/

-- 
Females are strictly forbidden to appear unshaven in public.
		[real standing law in New Mexico, United States of America]

 /// 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   ///


--- NEW FILE 6.3.073 ---
To: vim-dev at vim.org
Subject: Patch 6.3.073
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.073
Problem:    Win32 GUI: When the Vim window is partly above or below the
	    screen, scrolling causes display errors when the taskbar is not on
	    that side.
Solution:   Use the SW_INVALIDATE flag when the Vim window is partly below or
	    above the screen.
Files:	    src/gui_w48.c


*** ../vim-6.3.016/src/gui_w48.c	Thu Dec 16 14:26:44 2004
--- src/gui_w48.c	Sun May 22 12:06:07 2005
***************
*** 2504,2509 ****
--- 2504,2517 ----
      RECT	rcVim, rcOther, rcDest;
  
      GetWindowRect(s_hwnd, &rcVim);
+ 
+     /* Check if the window is partly above or below the screen.  We don't care
+      * about partly left or right of the screen, it is not relevant when
+      * scrolling up or down. */
+     if (rcVim.top < 0 || rcVim.bottom > GetSystemMetrics(SM_CYFULLSCREEN))
+ 	return SW_INVALIDATE;
+ 
+     /* Check if there is an window (partly) on top of us. */
      for (hwnd = s_hwnd; (hwnd = GetWindow(hwnd, GW_HWNDPREV)) != (HWND)0; )
  	if (IsWindowVisible(hwnd))
  	{
*** ../vim-6.3.016/src/version.c	Fri May 20 13:18:31 2005
--- src/version.c	Sun May 22 12:08:44 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     73,
  /**/

-- 
TERRY GILLIAM PLAYED: PATSY (ARTHUR'S TRUSTY STEED), THE GREEN KNIGHT
                      SOOTHSAYER, BRIDGEKEEPER, SIR GAWAIN (THE FIRST TO BE
                      KILLED BY THE RABBIT)
                 "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   ///


--- NEW FILE 6.3.074 ---
To: vim-dev at vim.org
Subject: Patch 6.3.074
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.074
Problem:    When mswin.vim is used and 'insertmode' is set, typing text in
	    Select mode and then using CTRL-V results in <SNR>99_Pastegi.
	    (Georg Dahn)
Solution:   When restart_edit is set use "d" instead of "c" to remove the
	    selected text to avoid calling edit() twice.
Files:	    src/normal.c


*** ../vim-6.3.073/src/normal.c	Thu Nov 18 10:47:49 2004
--- src/normal.c	Fri May 20 13:14:14 2005
***************
*** 643,654 ****
  	buf[0] = c;
  	buf[1] = NUL;
  # endif
! 	/* Fake a "c"hange command.
  	 * Insert the typed character in the typeahead buffer, so that it will
  	 * be mapped in Insert mode.  Required for ":lmap" to work.  May cause
  	 * mapping a character from ":vnoremap"... */
  	(void)ins_typebuf(buf, REMAP_YES, 0, !KeyTyped, FALSE);
! 	c = 'c';
      }
  #endif
  
--- 643,659 ----
  	buf[0] = c;
  	buf[1] = NUL;
  # endif
! 	/* Fake a "c"hange command.  When "restart_edit" is set (e.g., because
! 	 * 'insertmode' is set) fake a "d"elete command, Insert mode will
! 	 * restart automatically.
  	 * Insert the typed character in the typeahead buffer, so that it will
  	 * be mapped in Insert mode.  Required for ":lmap" to work.  May cause
  	 * mapping a character from ":vnoremap"... */
  	(void)ins_typebuf(buf, REMAP_YES, 0, !KeyTyped, FALSE);
! 	if (restart_edit != 0)
! 	    c = 'd';
! 	else
! 	    c = 'c';
      }
  #endif
  
*** ../vim-6.3.073/src/version.c	Sun May 22 12:11:10 2005
--- src/version.c	Sun May 22 12:16:16 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     74,
  /**/

-- 
NEIL INNES PLAYED: THE FIRST SELF-DESTRUCTIVE MONK, ROBIN'S LEAST FAVORITE
                   MINSTREL, THE PAGE CRUSHED BY A RABBIT, THE OWNER OF A DUCK
                 "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   ///


--- NEW FILE 6.3.075 ---
To: vim-dev at vim.org
Subject: Patch 6.3.075
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.075
Problem:    After unloading another buffer, syntax highlighting in the current
	    buffer may be wrong when it uses "containedin". (Eric Arnold)
Solution:   Use "buf" intead of "curbuf" in syntax_clear().
Files:	    src/syntax.c


*** ../vim-6.3.074/src/syntax.c	Tue Oct  5 17:02:41 2004
--- src/syntax.c	Tue May 31 21:27:42 2005
***************
*** 3063,3070 ****
  {
      int i;
  
!     curbuf->b_syn_ic = FALSE;	    /* Use case, by default */
!     curbuf->b_syn_containedin = FALSE;
  
      /* free the keywords */
      free_keywtab(buf->b_keywtab);
--- 3063,3070 ----
  {
      int i;
  
!     buf->b_syn_ic = FALSE;	    /* Use case, by default */
!     buf->b_syn_containedin = FALSE;
  
      /* free the keywords */
      free_keywtab(buf->b_keywtab);
*** ../vim-6.3.074/src/version.c	Sun May 22 12:17:33 2005
--- src/version.c	Tue May 31 21:29:36 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     75,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
15. Your heart races faster and beats irregularly each time you see a new WWW
    site address in print or on TV, even though you've never had heart
    problems before.

 /// 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   ///


--- NEW FILE 6.3.076 ---
To: vim-dev at vim.org
Subject: Patch 6.3.076
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.076
Problem:    Crash when using cscope and there is a parse error (e.g., line too
            long). (Alexey I. Froloff)
Solution:   Pass the actual number of matches to cs_manage_matches() and
            correctly handle the error situation.
Files:      src/if_cscope.c


*** ../vim-6.3.075/src/if_cscope.c	Wed Jun  9 14:56:27 2004
--- src/if_cscope.c	Tue Jun  7 11:06:19 2005
***************
*** 1,7 ****
  /* vi:set ts=8 sts=4 sw=4:
   *
   * CSCOPE support for Vim added by Andy Kahn <kahn at zk3.dec.com>
!  * Ported to Win32 by Sergey Khorev <khorev at softlab.ru>
   *
   * The basic idea/structure of cscope for Vim was borrowed from Nvi.  There
   * might be a few lines of code that look similar to what Nvi has.
--- 1,7 ----
  /* vi:set ts=8 sts=4 sw=4:
   *
   * CSCOPE support for Vim added by Andy Kahn <kahn at zk3.dec.com>
!  * Ported to Win32 by Sergey Khorev <sergey.khorev at gmail.com>
   *
   * The basic idea/structure of cscope for Vim was borrowed from Nvi.  There
   * might be a few lines of code that look similar to what Nvi has.
***************
*** 1130,1136 ****
  	if (matches == NULL)
  	    return FALSE;
  
! 	(void)cs_manage_matches(matches, contexts, totmatches, Store);
  
  	return do_tag((char_u *)pat, DT_CSCOPE, 0, forceit, verbose);
      }
--- 1130,1136 ----
  	if (matches == NULL)
  	    return FALSE;
  
! 	(void)cs_manage_matches(matches, contexts, matched, Store);
  
  	return do_tag((char_u *)pat, DT_CSCOPE, 0, forceit, verbose);
      }
***************
*** 1726,1731 ****
--- 1726,1732 ----
   *
   * get parsed cscope output and calls cs_make_vim_style_matches to convert
   * into ctags format
+  * When there are no matches sets "*matches_p" to NULL.
   */
      static void
  cs_fill_results(tagstr, totmatches, nummatches_a, matches_p, cntxts_p, matched)
***************
*** 1790,1795 ****
--- 1791,1804 ----
      } /* for all cscope connections */
  
  parse_out:
+     if (totsofar == 0)
+     {
+ 	/* No matches, free the arrays and return NULL in "*matches_p". */
+ 	vim_free(matches);
+ 	matches = NULL;
+ 	vim_free(cntxts);
+ 	cntxts = NULL;
+     }
      *matched = totsofar;
      *matches_p = matches;
      *cntxts_p = cntxts;
***************
*** 2125,2131 ****
  {
      char	**dblist = NULL, **pplist = NULL, **fllist = NULL;
      int	i;
!     char buf[8]; /* for sprintf " (#%d)" */
  
      /* malloc our db and ppath list */
      dblist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
--- 2134,2140 ----
  {
      char	**dblist = NULL, **pplist = NULL, **fllist = NULL;
      int	i;
!     char buf[20]; /* for sprintf " (#%d)" */
  
      /* malloc our db and ppath list */
      dblist = (char **)alloc(CSCOPE_MAX_CONNECTIONS * sizeof(char *));
*** ../vim-6.3.075/src/version.c	Tue May 31 21:30:24 2005
--- src/version.c	Tue Jun  7 11:06:46 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     76,
  /**/

-- 
Despite the cost of living, have you noticed how it remains so popular?

 /// 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   ///


--- NEW FILE 6.3.077 ---
To: vim-dev at vim.org
Subject: Patch 6.3.077 (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 6.3.077 (extra)
Problem:    VMS: First character input after ESC was not recognized.
Solution:   Added TRM$M_TM_TIMED in vms_read().  (Zoltan Arpadffy)
Files:	    src/os_vms.c


*** ../vim-6.3.076/src/os_vms.c	Wed Jun  9 14:56:26 2004
--- src/os_vms.c	Tue Jun 14 09:49:40 2005
***************
*** 308,315 ****
  	tt_mode = get_tty();
  
      vul_item(&itmlst[0], 0, TRM$_MODIFIERS,
! 	    (char *)(TRM$M_TM_ESCAPE | TRM$M_TM_NOECHO | TRM$M_TM_NOEDIT |
! 	       TRM$M_TM_NOFILTR | TRM$M_TM_NORECALL | TRM$M_TM_TRMNOECHO), 0);
      vul_item(&itmlst[1], sizeof(trm_mask), TRM$_TERM, (char *)&trm_mask, 0);
  
      function = (IO$_READLBLK | IO$M_EXTEND);
--- 308,316 ----
  	tt_mode = get_tty();
  
      vul_item(&itmlst[0], 0, TRM$_MODIFIERS,
! 	     (char *)( TRM$M_TM_ESCAPE  | TRM$M_TM_TIMED    | TRM$M_TM_NOECHO |
!                        TRM$M_TM_NOEDIT  | TRM$M_TM_NOFILTR  |
!                        TRM$M_TM_NORECALL| TRM$M_TM_TRMNOECHO), 0);
      vul_item(&itmlst[1], sizeof(trm_mask), TRM$_TERM, (char *)&trm_mask, 0);
  
      function = (IO$_READLBLK | IO$M_EXTEND);
*** ../vim-6.3.076/src/version.c	Tue Jun  7 11:11:33 2005
--- src/version.c	Tue Jun 14 14:02:57 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     77,
  /**/

-- 
>From "know your smileys":
 !-|	I-am-a-Cylon-Centurian-with-one-red-eye-bouncing-back-and-forth

 /// 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   ///


--- NEW FILE 6.3.078 ---
To: vim-dev at vim.org
Subject: Patch 6.3.078 (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 6.3.078 (extra, after 6.3.077)
Problem:    VMS: Performance issue after patch 6.3.077
Solution:   Add a timeout in the itemlist.  (Zoltan Arpadffy)
Files:	    src/os_vms.c


*** ../vim-6.3.077/src/os_vms.c	Tue Jun 14 14:04:07 2005
--- src/os_vms.c	Tue Jun 14 19:03:58 2005
***************
*** 300,306 ****
  {
      int		status, function, len;
      TT_MODE	tt_mode;
!     ITEM	itmlst[2];
      static long trm_mask[8] = {-1, -1, -1, -1, -1, -1, -1, -1};
  
      /* whatever happened earlier we need an iochan here */
--- 300,306 ----
  {
      int		status, function, len;
      TT_MODE	tt_mode;
!     ITEM	itmlst[3];
      static long trm_mask[8] = {-1, -1, -1, -1, -1, -1, -1, -1};
  
      /* whatever happened earlier we need an iochan here */
***************
*** 308,317 ****
  	tt_mode = get_tty();
  
      vul_item(&itmlst[0], 0, TRM$_MODIFIERS,
! 	     (char *)( TRM$M_TM_ESCAPE  | TRM$M_TM_TIMED    | TRM$M_TM_NOECHO |
!                        TRM$M_TM_NOEDIT  | TRM$M_TM_NOFILTR  |
!                        TRM$M_TM_NORECALL| TRM$M_TM_TRMNOECHO), 0);
!     vul_item(&itmlst[1], sizeof(trm_mask), TRM$_TERM, (char *)&trm_mask, 0);
  
      function = (IO$_READLBLK | IO$M_EXTEND);
      memset(inbuf, 0, nbytes);
--- 308,318 ----
  	tt_mode = get_tty();
  
      vul_item(&itmlst[0], 0, TRM$_MODIFIERS,
! 	     (char *)( TRM$M_TM_ESCAPE	| TRM$M_TM_TIMED    | TRM$M_TM_NOECHO |
! 		       TRM$M_TM_NOEDIT	| TRM$M_TM_NOFILTR  |
! 		       TRM$M_TM_NORECALL| TRM$M_TM_TRMNOECHO), 0);
!     vul_item(&itmlst[1], 0, TRM$_TIMEOUT, (char *) 1, 0 );
!     vul_item(&itmlst[2], sizeof(trm_mask), TRM$_TERM, (char *)&trm_mask, 0);
  
      function = (IO$_READLBLK | IO$M_EXTEND);
      memset(inbuf, 0, nbytes);
*** ../vim-6.3.077/src/version.c	Tue Jun 14 14:04:07 2005
--- src/version.c	Tue Jun 14 19:05:34 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     78,
  /**/

-- 
>From "know your smileys":
 O:-)	Saint

 /// 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   ///


--- NEW FILE 6.3.079 ---
To: vim-dev at vim.org
Subject: Patch 6.3.079
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.079
Problem:    Crash when executing a command in the command line window while 
            syntax highlighting is enabled. (Pero Brbora)
Solution:   Don't use a pointer to a buffer that has been deleted.
Files:      src/syntax.c


*** ../vim-6.3.078/src/syntax.c	Tue May 31 21:30:24 2005
--- src/syntax.c	Fri Jul  1 11:12:05 2005
***************
*** 1158,1164 ****
      prev = NULL;
      for (p = buf->b_sst_first; p != NULL; )
      {
! 	if (p->sst_lnum + syn_buf->b_syn_sync_linebreaks > buf->b_mod_top)
  	{
  	    n = p->sst_lnum + buf->b_mod_xlines;
  	    if (n <= buf->b_mod_bot)
--- 1158,1164 ----
      prev = NULL;
      for (p = buf->b_sst_first; p != NULL; )
      {
! 	if (p->sst_lnum + buf->b_syn_sync_linebreaks > buf->b_mod_top)
  	{
  	    n = p->sst_lnum + buf->b_mod_xlines;
  	    if (n <= buf->b_mod_bot)
*** ../vim-6.3.078/src/version.c	Tue Jun 14 19:08:07 2005
--- src/version.c	Fri Jul  1 11:20:27 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     79,
  /**/

-- 
Some of the well know MS-Windows errors:
	EMEMORY		Memory error caused by..., eh...
	ELICENSE	Your license has expired, give us more money!
	EMOUSE		Mouse moved, reinstall Windows
	EILLEGAL	Illegal error, you are not allowed to see this
	EVIRUS		Undetectable virus found

 /// 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   ///


--- NEW FILE 6.3.080 ---
To: vim-dev at vim.org
Subject: Patch 6.3.080 (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 6.3.080 (extra)
Problem:    Win32: With 'encoding' set to utf-8 while the current codepage is
	    Chinese editing a file with some specific characters in the name
	    fails.
Solution:   Use _wfullpath() instead of _fullpath() when necessary.
Files:	    src/os_mswin.c


*** ../vim-6.3.079/src/os_mswin.c	Sun Dec  5 16:43:06 2004
--- src/os_mswin.c	Sat Jul  2 13:07:35 2005
***************
*** 367,385 ****
  	nResult = mch_dirname(buf, len);
      else
  #endif
- 	if (_fullpath(buf, fname, len - 1) == NULL)
      {
! 	STRNCPY(buf, fname, len);   /* failed, use the relative path name */
! 	buf[len - 1] = NUL;
! #ifndef USE_FNAME_CASE
! 	slash_adjust(buf);
  #endif
      }
-     else
- 	nResult = OK;
  
  #ifdef USE_FNAME_CASE
      fname_case(buf, len);
  #endif
  
      return nResult;
--- 367,421 ----
  	nResult = mch_dirname(buf, len);
      else
  #endif
      {
! #ifdef FEAT_MBYTE
! 	if (enc_codepage >= 0 && (int)GetACP() != enc_codepage
! # ifdef __BORLANDC__
! 		/* Wide functions of Borland C 5.5 do not work on Windows 98. */
! 		&& g_PlatformId == VER_PLATFORM_WIN32_NT
! # endif
! 	   )
! 	{
! 	    WCHAR	*wname;
! 	    WCHAR	wbuf[MAX_PATH];
! 	    char_u	*cname = NULL;
! 
! 	    /* Use the wide function:
! 	     * - convert the fname from 'encoding' to UCS2.
! 	     * - invoke _wfullpath()
! 	     * - convert the result from UCS2 to 'encoding'.
! 	     */
! 	    wname = enc_to_ucs2(fname, NULL);
! 	    if (wname != NULL && _wfullpath(wbuf, wname, MAX_PATH - 1) != NULL)
! 	    {
! 		cname = ucs2_to_enc((short_u *)wbuf, NULL);
! 		if (cname != NULL)
! 		{
! 		    STRNCPY(buf, cname, len);
! 		    buf[len - 1] = NUL;
! 		    nResult = OK;
! 		}
! 	    }
! 	    vim_free(wname);
! 	    vim_free(cname);
! 	}
! 	if (nResult == FAIL)	    /* fall back to non-wide function */
  #endif
+ 	{
+ 	    if (_fullpath(buf, fname, len - 1) == NULL)
+ 	    {
+ 		STRNCPY(buf, fname, len);   /* failed, use relative path name */
+ 		buf[len - 1] = NUL;
+ 	    }
+ 	    else
+ 		nResult = OK;
+ 	}
      }
  
  #ifdef USE_FNAME_CASE
      fname_case(buf, len);
+ #else
+     slash_adjust(buf);
  #endif
  
      return nResult;
*** ../vim-6.3.079/src/version.c	Fri Jul  1 11:20:39 2005
--- src/version.c	Mon Jul  4 12:18:34 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     80,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
225. You sign up for free subscriptions for all the computer magazines

 /// 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   ///


--- NEW FILE 6.3.081 ---
To: vim-dev at vim.org
Subject: Patch 6.3.081
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.081
Problem:    Unix: glob() may execute a shell command when it's not wanted.
	    (Georgi Guninski)
Solution:   Verify the sandbox flag is not set.
Files:	    src/os_unix.c


*** ../vim-6.3.080/src/os_unix.c	Sat Jan 29 16:14:42 2005
--- src/os_unix.c	Tue Jul 19 22:29:34 2005
***************
*** 4700,4706 ****
      /*
       * Don't allow the use of backticks in secure and restricted mode.
       */
!     if (secure || restricted)
  	for (i = 0; i < num_pat; ++i)
  	    if (vim_strchr(pat[i], '`') != NULL
  		    && (check_restricted() || check_secure()))
--- 4700,4710 ----
      /*
       * Don't allow the use of backticks in secure and restricted mode.
       */
!     if (secure || restricted
! # ifdef HAVE_SANDBOX
! 	    || sandbox != 0
! # endif
! 	    )
  	for (i = 0; i < num_pat; ++i)
  	    if (vim_strchr(pat[i], '`') != NULL
  		    && (check_restricted() || check_secure()))
*** ../vim-6.3.080/src/version.c	Mon Jul  4 12:19:01 2005
--- src/version.c	Tue Jul 19 22:26:32 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     81,
  /**/

-- 
    With sufficient thrust, pigs fly just fine.
                   -- RFC 1925

 /// 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   ///


--- NEW FILE 6.3.082 ---
To: vim-dev at vim.org
Subject: Patch 6.3.082
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.082 (after 6.3.081)
Problem:    Unix: expand() may execute a shell command when it's not wanted.
            (Georgi Guninski)
Solution:   A more generic solution than 6.3.081.
Files:      src/os_unix.c
    

*** ../vim-6.3.081/src/os_unix.c	Tue Jul 19 22:31:54 2005
--- src/os_unix.c	Wed Jul 20 10:54:12 2005
***************
*** 4697,4710 ****
      if (!have_wildcard(num_pat, pat))
  	return save_patterns(num_pat, pat, num_file, file);
  
      /*
       * Don't allow the use of backticks in secure and restricted mode.
       */
!     if (secure || restricted
! # ifdef HAVE_SANDBOX
! 	    || sandbox != 0
! # endif
! 	    )
  	for (i = 0; i < num_pat; ++i)
  	    if (vim_strchr(pat[i], '`') != NULL
  		    && (check_restricted() || check_secure()))
--- 4697,4712 ----
      if (!have_wildcard(num_pat, pat))
  	return save_patterns(num_pat, pat, num_file, file);
  
+ # ifdef HAVE_SANDBOX
+     /* Don't allow any shell command in the sandbox. */
+     if (sandbox != 0 && check_secure())
+ 	return FAIL;
+ # endif
+ 
      /*
       * Don't allow the use of backticks in secure and restricted mode.
       */
!     if (secure || restricted)
  	for (i = 0; i < num_pat; ++i)
  	    if (vim_strchr(pat[i], '`') != NULL
  		    && (check_restricted() || check_secure()))
*** ../vim-6.3.081/src/version.c	Tue Jul 19 22:31:54 2005
--- src/version.c	Wed Jul 20 11:03:50 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     82,
  /**/

-- 
No letters of the alphabet were harmed in the creation of this message.

 /// 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   ///


--- NEW FILE 6.3.083 ---
To: vim-dev at vim.org
Subject: Patch 6.3.083
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.083
Problem:    VMS: The vt320 termcap entry is incomplete.
Solution:   Add missing function keys.  (Zoltan Arpadffy)
Files:	    src/term.c


*** ../vim-6.3.082/src/term.c	Sat Sep 18 20:28:07 2004
--- src/term.c	Thu Jul 21 13:00:18 2005
***************
*** 812,827 ****
      {(int)KS_CCO,	"8"},			/* allow 8 colors */
      {(int)KS_ME,	IF_EB("\033[0m", ESC_STR "[0m")},
      {(int)KS_MR,	IF_EB("\033[7m", ESC_STR "[7m")},
!     {(int)KS_MD,        IF_EB("\033[1m", ESC_STR "[1m")},  /* bold mode */
!     {(int)KS_SE,        IF_EB("\033[22m", ESC_STR "[22m")},/* normal mode */
!     {(int)KS_UE,        IF_EB("\033[24m", ESC_STR "[24m")},/* exit underscore mode */
!     {(int)KS_US,        IF_EB("\033[4m", ESC_STR "[4m")},  /* underscore mode */
!     {(int)KS_CZH,       IF_EB("\033[34;43m", ESC_STR "[34;43m" )},  /* italic mode: blue text on yellow */
!     {(int)KS_CZR,       IF_EB("\033[0m", ESC_STR "[0m")},           /* italic mode end */
!     {(int)KS_CAB,       IF_EB("\033[4%dm", ESC_STR "[4%dm" )},      /* set background color (ANSI) */
!     {(int)KS_CAF,       IF_EB("\033[3%dm", ESC_STR "[3%dm" )},      /* set foreground color (ANSI) */
!     {(int)KS_CSB,       IF_EB("\033[102;%dm", ESC_STR "[102;%dm" )},    /* set screen background color */
!     {(int)KS_CSF,       IF_EB("\033[101;%dm", ESC_STR "[101;%dm" )},    /* set screen foreground color */
      {(int)KS_MS,	"y"},
      {(int)KS_UT,	"y"},
      {(int)KS_LE,	"\b"},
--- 812,827 ----
      {(int)KS_CCO,	"8"},			/* allow 8 colors */
      {(int)KS_ME,	IF_EB("\033[0m", ESC_STR "[0m")},
      {(int)KS_MR,	IF_EB("\033[7m", ESC_STR "[7m")},
!     {(int)KS_MD,	IF_EB("\033[1m", ESC_STR "[1m")},  /* bold mode */
!     {(int)KS_SE,	IF_EB("\033[22m", ESC_STR "[22m")},/* normal mode */
!     {(int)KS_UE,	IF_EB("\033[24m", ESC_STR "[24m")},/* exit underscore mode */
!     {(int)KS_US,	IF_EB("\033[4m", ESC_STR "[4m")},  /* underscore mode */
!     {(int)KS_CZH,	IF_EB("\033[34;43m", ESC_STR "[34;43m")},  /* italic mode: blue text on yellow */
!     {(int)KS_CZR,	IF_EB("\033[0m", ESC_STR "[0m")},	    /* italic mode end */
!     {(int)KS_CAB,	IF_EB("\033[4%dm", ESC_STR "[4%dm")},	    /* set background color (ANSI) */
!     {(int)KS_CAF,	IF_EB("\033[3%dm", ESC_STR "[3%dm")},	    /* set foreground color (ANSI) */
!     {(int)KS_CSB,	IF_EB("\033[102;%dm", ESC_STR "[102;%dm")},	/* set screen background color */
!     {(int)KS_CSF,	IF_EB("\033[101;%dm", ESC_STR "[101;%dm")},	/* set screen foreground color */
      {(int)KS_MS,	"y"},
      {(int)KS_UT,	"y"},
      {(int)KS_LE,	"\b"},
***************
*** 840,852 ****
      {K_DOWN,		IF_EB("\033[B", ESC_STR "[B")},
      {K_RIGHT,		IF_EB("\033[C", ESC_STR "[C")},
      {K_LEFT,		IF_EB("\033[D", ESC_STR "[D")},
      {K_F6,		IF_EB("\033[17~", ESC_STR "[17~")},
      {K_F7,		IF_EB("\033[18~", ESC_STR "[18~")},
      {K_F8,		IF_EB("\033[19~", ESC_STR "[19~")},
      {K_F9,		IF_EB("\033[20~", ESC_STR "[20~")},
      {K_F10,		IF_EB("\033[21~", ESC_STR "[21~")},
! /*  {K_F11,		IF_EB("\033[23~", ESC_STR "[23~")},
! 			*  (ESC) should not define, sometimes does not work */
      {K_F12,		IF_EB("\033[24~", ESC_STR "[24~")},
      {K_F13,		IF_EB("\033[25~", ESC_STR "[25~")},
      {K_F14,		IF_EB("\033[26~", ESC_STR "[26~")},
--- 840,856 ----
      {K_DOWN,		IF_EB("\033[B", ESC_STR "[B")},
      {K_RIGHT,		IF_EB("\033[C", ESC_STR "[C")},
      {K_LEFT,		IF_EB("\033[D", ESC_STR "[D")},
+     {K_F1,		IF_EB("\033[11~", ESC_STR "[11~")},
+     {K_F2,		IF_EB("\033[12~", ESC_STR "[12~")},
+     {K_F3,		IF_EB("\033[13~", ESC_STR "[13~")},
+     {K_F4,		IF_EB("\033[14~", ESC_STR "[14~")},
+     {K_F5,		IF_EB("\033[15~", ESC_STR "[15~")},
      {K_F6,		IF_EB("\033[17~", ESC_STR "[17~")},
      {K_F7,		IF_EB("\033[18~", ESC_STR "[18~")},
      {K_F8,		IF_EB("\033[19~", ESC_STR "[19~")},
      {K_F9,		IF_EB("\033[20~", ESC_STR "[20~")},
      {K_F10,		IF_EB("\033[21~", ESC_STR "[21~")},
!     {K_F11,		IF_EB("\033[23~", ESC_STR "[23~")},
      {K_F12,		IF_EB("\033[24~", ESC_STR "[24~")},
      {K_F13,		IF_EB("\033[25~", ESC_STR "[25~")},
      {K_F14,		IF_EB("\033[26~", ESC_STR "[26~")},
*** ../vim-6.3.082/src/version.c	Wed Jul 20 11:09:52 2005
--- src/version.c	Thu Jul 21 13:01:35 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     83,
  /**/

-- 
ARTHUR:   Ni!
BEDEVERE: Nu!
ARTHUR:   No.  Ni!  More like this. "Ni"!
BEDEVERE: Ni, ni, ni!
                 "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   ///


--- NEW FILE 6.3.084 ---
To: vim-dev at vim.org
Subject: Patch 6.3.084 (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 6.3.084 (extra)
Problem:    Cygwin: compiling with DEBUG doesn't work.  Perl path was ignored.
	    Failure when $(OUTDIR) already exists.  "po" makefile is missing.
Solution:   Use changes tested in Vim 7. (Tony Mechelynck)
Files:	    src/Make_cyg.mak, src/po/Make_cyg.mak


*** ../vim-6.3.083/src/Make_cyg.mak	Wed Jun  9 14:56:27 2004
--- src/Make_cyg.mak	Thu Jul 21 13:48:38 2005
***************
*** 1,6 ****
  #
  # Makefile for VIM on Win32, using Cygnus gcc
! # Last updated by Dan Sharp.  Last Change: 2004 Apr 23
  #
  # This compiles Vim as a Windows application.  If you want Vim to run as a
  # Cygwin application use the Makefile (just like on Unix).
--- 1,7 ----
  #
  # Makefile for VIM on Win32, using Cygnus gcc
! # Updated by Dan Sharp and Bram Moolenaar.
! # Last Change: 2005 Jul 21
  #
  # This compiles Vim as a Windows application.  If you want Vim to run as a
  # Cygwin application use the Makefile (just like on Unix).
***************
*** 298,304 ****
  EXTRA_OBJS += $(OUTDIR)/netbeans.o $(OUTDIR)/gui_beval.o
  EXTRA_LIBS += -lwsock32
  
! ifeq (yes, $(DEBUG))
  DEFINES += -DNBDEBUG
  NBDEBUG_DEP = nbdebug.h nbdebug.c
  endif
--- 299,305 ----
  EXTRA_OBJS += $(OUTDIR)/netbeans.o $(OUTDIR)/gui_beval.o
  EXTRA_LIBS += -lwsock32
  
! ifeq (yes, $(NBDEBUG))
  DEFINES += -DNBDEBUG
  NBDEBUG_DEP = nbdebug.h nbdebug.c
  endif
***************
*** 336,344 ****
--- 337,347 ----
  ##############################
  ifneq (sh.exe, $(SHELL))
  DEL = rm
+ MKDIR = mkdir -p
  DIRSLASH = /
  else
  DEL = del
+ MKDIR = mkdir
  DIRSLASH = \\
  endif
  
***************
*** 421,427 ****
  	$(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIBS)
  
  $(OUTDIR):
! 	mkdir $(OUTDIR)
  
  tags:
  	command /c ctags *.c $(INCL)
--- 424,430 ----
  	$(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIBS)
  
  $(OUTDIR):
! 	$(MKDIR) $(OUTDIR)
  
  tags:
  	command /c ctags *.c $(INCL)
***************
*** 429,435 ****
  clean:
  	-$(DEL) $(OUTDIR)$(DIRSLASH)*.o
  	-rmdir $(OUTDIR)
! 	-$(DEL) *.exe
  ifdef PERL
  	-$(DEL) if_perl.c
  endif
--- 432,438 ----
  clean:
  	-$(DEL) $(OUTDIR)$(DIRSLASH)*.o
  	-rmdir $(OUTDIR)
! 	-$(DEL) $(EXE) vimrun.exe install.exe uninstal.exe
  ifdef PERL
  	-$(DEL) if_perl.c
  endif
***************
*** 455,462 ****
  	$(CC) -c $(CFLAGS) -D__IID_DEFINED__ if_ole.cpp -o $(OUTDIR)/if_ole.o
  
  if_perl.c: if_perl.xs typemap
! 	perl $(PERL)/lib/ExtUtils/xsubpp -prototypes -typemap \
! 	     $(PERL)/lib/ExtUtils/typemap if_perl.xs > $@
  
  $(OUTDIR)/if_perl.o:	if_perl.c $(INCL)
  ifeq (yes, $(USEDLL))
--- 458,466 ----
  	$(CC) -c $(CFLAGS) -D__IID_DEFINED__ if_ole.cpp -o $(OUTDIR)/if_ole.o
  
  if_perl.c: if_perl.xs typemap
! 	$(PERL)/bin/perl `cygpath -d $(PERL)/lib/ExtUtils/xsubpp` \
! 		-prototypes -typemap \
! 		`cygpath -d $(PERL)/lib/ExtUtils/typemap` if_perl.xs > $@
  
  $(OUTDIR)/if_perl.o:	if_perl.c $(INCL)
  ifeq (yes, $(USEDLL))
*** ../vim-6.3.083/src/po/Make_cyg.mak	Thu Jul 21 13:47:58 2005
--- src/po/Make_cyg.mak	Thu Jul 21 13:46:39 2005
***************
*** 0 ****
--- 1,128 ----
+ # Makefile for the Vim message translations for Cygwin
+ # by Tony Mechelynck <antoine.mechelynck at skynet.be>
+ # after Make_ming.mak by
+ # Eduardo F. Amatria <eferna1 at platea.pntic.mec.es>
+ #
+ # Read the README_ming.txt file before using it.
+ #
+ # Use at your own risk but with care, it could even kill your canary.
+ #
+ 
+ ifndef VIMRUNTIME
+ VIMRUNTIME = ../../runtime
+ endif
+ 
+ LANGUAGES =	af \
+ 		ca \
+ 		cs \
+ 		cs.cp1250 \
+ 		de \
+ 		en_GB \
+ 		es \
+ 		fr \
+ 		it \
+ 		ja \
+ 		ja.sjis \
+ 		ko \
+ 		no \
+ 		pl \
+ 		pl.cp1250 \
+ 		ru \
+ 		ru.cp1251 \
+ 		sk \
+ 		sk.cp1250 \
+ 		sv \
+ 		uk \
+ 		zh_CN \
+ 		zh_CN.UTF-8 \
+ 		zh_CN.cp936 \
+ 		zh_TW \
+ 		zh_TW.UTF-8 \
+ 
+ MOFILES =	af.mo \
+ 		ca.mo \
+ 		cs.cp1250.mo \
+ 		cs.mo \
+ 		de.mo \
+ 		en_GB.mo \
+ 		es.mo \
+ 		fr.mo \
+ 		it.mo \
+ 		ja.mo \
+ 		ja.sjis.mo \
+ 		ko.mo \
+ 		no.mo \
+ 		pl.cp1250.mo \
+ 		pl.mo \
+ 		ru.cp1251.mo \
+ 		ru.mo \
+ 		sk.cp1250.mo \
+ 		sk.mo \
+ 		sv.mo \
+ 		uk.mo \
+ 		zh_CN.UTF-8.mo \
+ 		zh_CN.cp936.mo \
+ 		zh_CN.mo \
+ 		zh_TW.UTF-8.mo \
+ 		zh_TW.mo \
+ 
+ PACKAGE = vim
+ 
+ # Uncomment one of the lines below or modify it to put the path to your
+ # gettext binaries
+ ifndef GETTEXT_PATH
+ #GETTEXT_PATH = C:/gettext.win32/bin/
+ #GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/
+ GETTEXT_PATH = /bin/
+ endif
+ 
+ # The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext
+ # tools 0.10.37, which use a slightly different .po file format that is not
+ # compatible with Solaris (and old gettext implementations) unless these are
+ # set.  gettext 0.10.36 will not work!
+ MSGFMT = OLD_PO_FILE_INPUT=yes $(GETTEXT_PATH)msgfmt -v
+ XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)xgettext
+ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)msgmerge
+ 
+ # MV = move
+ # CP = copy
+ # RM = del
+ # MKD = mkdir
+ MV = mv -f
+ CP = cp -f
+ RM = rm -f
+ MKD = mkdir -p
+ 
+ .SUFFIXES:
+ .SUFFIXES: .po .mo .pot
+ .PHONY: first_time all install clean $(LANGUAGES)
+ 
+ .po.mo:
+ 	$(MSGFMT) -o $@ $<
+ 
+ all: $(MOFILES)
+ 
+ first_time:
+ 	$(XGETTEXT) --default-domain=$(LANGUAGE) \
+ 		--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
+ 
+ $(LANGUAGES):
+ 	$(XGETTEXT) --default-domain=$(PACKAGE) \
+ 		--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
+ 	$(MV) $(PACKAGE).po $(PACKAGE).pot
+ 	$(CP) $@.po $@.po.orig
+ 	$(MV) $@.po $@.po.old
+ 	$(MSGMERGE) $@.po.old $(PACKAGE).pot -o $@.po
+ 	$(RM) $@.po.old
+ 
+ install: $(MOFILES)
+ 	for TARGET in $(LANGUAGES); do \
+ 		$(MKD) $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES ; \
+ 		$(CP) $$TARGET.mo $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES/$(PACKAGE).mo ; \
+ 	done
+ 
+ clean:
+ 	$(RM) *.mo
+ 	$(RM) *.pot
+ 
+ 
*** ../vim-6.3.083/src/version.c	Thu Jul 21 13:02:06 2005
--- src/version.c	Thu Jul 21 13:47:15 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     84,
  /**/

-- 
Michael: There is no such thing as a dump question.
Bernard: Sure there is.  For example "what is a core dump?"

 /// 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   ///


--- NEW FILE 6.3.085 ---
To: vim-dev at vim.org
Subject: Patch 6.3.085
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.085
Problem:    Crash in syntax highlighting code. (Marc Espie)
Solution:   Prevent current_col going past the end of the line.
Files:	    src/syntax.c


*** ../vim-6.3.084/src/syntax.c	Fri Jul  1 11:20:39 2005
--- src/syntax.c	Sun Jul 24 19:39:04 2005
***************
*** 659,664 ****
--- 659,665 ----
      linenr_T	found_current_lnum = 0;
      int		found_current_col= 0;
      lpos_T	found_m_endpos;
+     colnr_T	prev_current_col;
  
      /*
       * Clear any current state that might be hanging around.
***************
*** 829,838 ****
  			    ++current_col;
  
  			/* syn_current_attr() will have skipped the check for
! 			 * an item that ends here, need to do that now. */
! 			++current_col;
  			check_state_ends();
! 			--current_col;
  		    }
  		    else
  			break;
--- 830,842 ----
  			    ++current_col;
  
  			/* syn_current_attr() will have skipped the check for
! 			 * an item that ends here, need to do that now.  Be
! 			 * careful not to go past the NUL. */
! 			prev_current_col = current_col;
! 			if (syn_getcurline()[current_col] != NUL)
! 			    ++current_col;
  			check_state_ends();
! 			current_col = prev_current_col;
  		    }
  		    else
  			break;
***************
*** 1635,1640 ****
--- 1639,1645 ----
      int	    syncing;		/* called for syncing */
  {
      stateitem_T	*cur_si;
+     colnr_T	prev_current_col;
  
      if (!current_finished)
      {
***************
*** 1656,1665 ****
  		    return TRUE;
  
  		/* syn_current_attr() will have skipped the check for an item
! 		 * that ends here, need to do that now. */
! 		++current_col;
  		check_state_ends();
! 		--current_col;
  	    }
  	    ++current_col;
  	}
--- 1661,1673 ----
  		    return TRUE;
  
  		/* syn_current_attr() will have skipped the check for an item
! 		 * that ends here, need to do that now.  Be careful not to go
! 		 * past the NUL. */
! 		prev_current_col = current_col;
! 		if (syn_getcurline()[current_col] != NUL)
! 		    ++current_col;
  		check_state_ends();
! 		current_col = prev_current_col;
  	    }
  	    ++current_col;
  	}
***************
*** 2178,2184 ****
  	if (!syncing)
  	{
  	    check_state_ends();
! 	    if (current_state.ga_len > 0)
  	    {
  		++current_col;
  		check_state_ends();
--- 2186,2193 ----
  	if (!syncing)
  	{
  	    check_state_ends();
! 	    if (current_state.ga_len > 0
! 				      && syn_getcurline()[current_col] != NUL)
  	    {
  		++current_col;
  		check_state_ends();
*** ../vim-6.3.084/src/version.c	Thu Jul 21 13:49:11 2005
--- src/version.c	Sun Jul 24 19:42:30 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     85,
  /**/

-- 
BEDEVERE: How do you know so much about swallows?
ARTHUR:   Well you have to know these things when you're a king, you know.
                 "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   ///


--- NEW FILE 6.3.086 ---
To: vim-dev at vim.org
Subject: Patch 6.3.086 (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 6.3.086 (extra)
Problem:    Can't produce message translation file with msgfmt that checks
	    printf strings.
Solution:   Fix the Russian translation.
Files:	    src/po/ru.po, src/po/ru.cp1251.po


*** ../vim-6.3.085/src/po/ru.po	Wed Jun  9 14:56:24 2004
--- src/po/ru.po	Fri Jul 29 09:51:52 2005
***************
*** 9,18 ****
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: Vim 6.3a\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-05-10 21:37+0400\n"
! "PO-Revision-Date: 2004-05-10 21:37+0400\n"
  "Last-Translator: vassily ragosin <vrr at users.sourceforge.net>\n"
  "Language-Team: vassily ragosin <vrr at users.sourceforge.net>\n"
  "MIME-Version: 1.0\n"
--- 9,18 ----
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: Vim 6.3.15\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-08-06 09:06+0400\n"
! "PO-Revision-Date: 2004-08-06 09:06+0400\n"
  "Last-Translator: vassily ragosin <vrr at users.sourceforge.net>\n"
  "Language-Team: vassily ragosin <vrr at users.sourceforge.net>\n"
  "MIME-Version: 1.0\n"
***************
*** 880,889 ****
  msgid "E670: Mix of help file encodings within a language: %s"
  msgstr "E670: æÁÊÌÙ ÓÐÒÁ×ËÉ ÉÓÐÏÌØÚÕÀÔ ÒÁÚÎÙÅ ËÏÄÉÒÏ×ËÉ ÄÌÑ ÏÄÎÏÇÏ ÑÚÙËÁ: %s"
  
! #: ex_cmds.c:5445
  #, c-format
! msgid "E154: Duplicate tag \"%s\" in file %s"
! msgstr "E154: ðÏ×ÔÏÒÑÀÝÁÑÓÑ ÍÅÔËÁ \"%s\" × ÆÁÊÌÅ %s"
  
  #: ex_cmds.c:5557
  #, c-format
--- 880,889 ----
  msgid "E670: Mix of help file encodings within a language: %s"
  msgstr "E670: æÁÊÌÙ ÓÐÒÁ×ËÉ ÉÓÐÏÌØÚÕÀÔ ÒÁÚÎÙÅ ËÏÄÉÒÏ×ËÉ ÄÌÑ ÏÄÎÏÇÏ ÑÚÙËÁ: %s"
  
! #: ex_cmds.c:5492
  #, c-format
! msgid "E154: Duplicate tag \"%s\" in file %s/%s"
! msgstr "E154: ðÏ×ÔÏÒÑÀÝÁÑÓÑ ÍÅÔËÁ \"%s\" × ÆÁÊÌÅ %s/%s"
  
  #: ex_cmds.c:5557
  #, c-format
***************
*** 1236,1245 ****
  msgid "E173: 1 more file to edit"
  msgstr "E173: 1 ÆÁÊÌ ÏÖÉÄÁÅÔ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ."
  
! #: ex_docmd.c:4581
  #, c-format
  msgid "E173: %ld more files to edit"
! msgstr "E173: åÓÔØ ÎÅÏÔÒÅÄÁËÔÉÒÏ×ÁÎÎÙÅ ÆÁÊÌÙ (%d)."
  
  #: ex_docmd.c:4676
  msgid "E174: Command already exists: add ! to replace it"
--- 1236,1245 ----
  msgid "E173: 1 more file to edit"
  msgstr "E173: 1 ÆÁÊÌ ÏÖÉÄÁÅÔ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ."
  
! #: ex_docmd.c:4584
  #, c-format
  msgid "E173: %ld more files to edit"
! msgstr "E173: åÓÔØ ÎÅÏÔÒÅÄÁËÔÉÒÏ×ÁÎÎÙÅ ÆÁÊÌÙ (%ld)."
  
  #: ex_docmd.c:4676
  msgid "E174: Command already exists: add ! to replace it"
***************
*** 2303,2314 ****
  "\n"
  "ïÔÐÒÁ×ËÁ ÓÏÏÂÝÅÎÉÑ ÄÌÑ ÕÎÉÞÔÏÖÅÎÉÑ ÐÒÏÃÅÓÓÁ-ÐÏÔÏÍËÁ.\n"
  
! #: gui_w32.c:829
  #, c-format
  msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
  msgstr "E243: ðÁÒÁÍÅÔÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ: \"-%s\"; ÉÓÐÏÌØÚÕÊÔÅ ×ÅÒÓÉÀ OLE."
  
! #: gui_w48.c:2090
  msgid "Find string (use '\\\\' to find  a '\\')"
  msgstr "ðÏÉÓË ÓÔÒÏËÉ (ÉÓÐÏÌØÚÕÊÔÅ '\\\\' ÄÌÑ ÐÏÉÓËÁ '\\')"
  
--- 2303,2323 ----
  "\n"
  "ïÔÐÒÁ×ËÁ ÓÏÏÂÝÅÎÉÑ ÄÌÑ ÕÎÉÞÔÏÖÅÎÉÑ ÐÒÏÃÅÓÓÁ-ÐÏÔÏÍËÁ.\n"
  
! #: gui_w32.c:839
! #, c-format
! msgid "E671: Cannot find window title \"%s\""
! msgstr "E671: îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÚÁÇÏÌÏ×ÏË ÏËÎÁ \"%s\""
! 
! #: gui_w32.c:847
  #, c-format
  msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
  msgstr "E243: ðÁÒÁÍÅÔÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ: \"-%s\"; ÉÓÐÏÌØÚÕÊÔÅ ×ÅÒÓÉÀ OLE."
  
! #: gui_w32.c:1100
! msgid "E672: Unable to open window inside MDI application"
! msgstr "E672: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÏËÎÏ ×ÎÕÔÒÉ ÐÒÉÌÏÖÅÎÉÑ MDI"
! 
! #: gui_w48.c:2163
  msgid "Find string (use '\\\\' to find  a '\\')"
  msgstr "ðÏÉÓË ÓÔÒÏËÉ (ÉÓÐÏÌØÚÕÊÔÅ '\\\\' ÄÌÑ ÐÏÉÓËÁ '\\')"
  
***************
*** 2353,2358 ****
--- 2362,2368 ----
  msgstr "Font1: %s\n"
  
  #: gui_x11.c:2184
+ #, c-format
  msgid "Font%ld width is not twice that of font0\n"
  msgstr "ûÉÒÉÎÁ ÛÒÉÆÔÁ font%ld ÄÏÌÖÎÁ ÂÙÔØ ×Ä×ÏÅ ÂÏÌØÛÅ ÛÉÒÉÎÙ ÛÒÉÆÔÁ font0\n"
  
***************
*** 2437,2443 ****
  #: if_cscope.c:589
  #, c-format
  msgid "E262: error reading cscope connection %ld"
! msgstr "E262: ÏÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÉÎÆÏÒÍÁÃÉÉ ÏÔ ÓÏÅÄÉÎÅÎÉÑ cscope %d"
  
  #: if_cscope.c:694
  msgid "E561: unknown cscope search type"
--- 2447,2453 ----
  #: if_cscope.c:589
  #, c-format
  msgid "E262: error reading cscope connection %ld"
! msgstr "E262: ÏÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÉÎÆÏÒÍÁÃÉÉ ÏÔ ÓÏÅÄÉÎÅÎÉÑ cscope %ld"
  
  #: if_cscope.c:694
  msgid "E561: unknown cscope search type"
***************
*** 2515,2521 ****
  #: if_cscope.c:1458
  #, c-format
  msgid "cscope connection %s closed"
! msgstr "ÓÏÅÄÉÎÅÎÉÅ Ó cscope ÚÁËÒÙÔÏ"
  
  #. should not reach here
  #: if_cscope.c:1598
--- 2525,2531 ----
  #: if_cscope.c:1458
  #, c-format
  msgid "cscope connection %s closed"
! msgstr "ÓÏÅÄÉÎÅÎÉÅ %s Ó cscope ÚÁËÒÙÔÏ"
  
  #. should not reach here
  #: if_cscope.c:1598
***************
*** 6654,6658 ****
  msgid "E463: Region is guarded, cannot modify"
  msgstr "E463: îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÏÈÒÁÎÑÅÍÕÀ ÏÂÌÁÓÔØ"
  
- #~ msgid "\"\n"
- #~ msgstr "\"\n"
--- 6664,6666 ----
*** ../vim-6.3.085/src/po/ru.cp1251.po	Wed Jun  9 14:56:25 2004
--- src/po/ru.cp1251.po	Fri Jul 29 09:51:58 2005
***************
*** 9,18 ****
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: Vim 6.3a\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-05-10 21:37+0400\n"
! "PO-Revision-Date: 2004-05-10 21:37+0400\n"
  "Last-Translator: vassily ragosin <vrr at users.sourceforge.net>\n"
  "Language-Team: vassily ragosin <vrr at users.sourceforge.net>\n"
  "MIME-Version: 1.0\n"
--- 9,18 ----
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: Vim 6.3.15\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-08-06 09:06+0400\n"
! "PO-Revision-Date: 2004-08-06 09:06+0400\n"
  "Last-Translator: vassily ragosin <vrr at users.sourceforge.net>\n"
  "Language-Team: vassily ragosin <vrr at users.sourceforge.net>\n"
  "MIME-Version: 1.0\n"
***************
*** 880,889 ****
  msgid "E670: Mix of help file encodings within a language: %s"
  msgstr "E670: Ôàéëû ñïðàâêè èñïîëüçóþò ðàçíûå êîäèðîâêè äëÿ îäíîãî ÿçûêà: %s"
  
! #: ex_cmds.c:5445
  #, c-format
! msgid "E154: Duplicate tag \"%s\" in file %s"
! msgstr "E154: Ïîâòîðÿþùàÿñÿ ìåòêà \"%s\" â ôàéëå %s"
  
  #: ex_cmds.c:5557
  #, c-format
--- 880,889 ----
  msgid "E670: Mix of help file encodings within a language: %s"
  msgstr "E670: Ôàéëû ñïðàâêè èñïîëüçóþò ðàçíûå êîäèðîâêè äëÿ îäíîãî ÿçûêà: %s"
  
! #: ex_cmds.c:5492
  #, c-format
! msgid "E154: Duplicate tag \"%s\" in file %s/%s"
! msgstr "E154: Ïîâòîðÿþùàÿñÿ ìåòêà \"%s\" â ôàéëå %s/%s"
  
  #: ex_cmds.c:5557
  #, c-format
***************
*** 1236,1245 ****
  msgid "E173: 1 more file to edit"
  msgstr "E173: 1 ôàéë îæèäàåò ðåäàêòèðîâàíèÿ."
  
! #: ex_docmd.c:4581
  #, c-format
  msgid "E173: %ld more files to edit"
! msgstr "E173: Åñòü íåîòðåäàêòèðîâàííûå ôàéëû (%d)."
  
  #: ex_docmd.c:4676
  msgid "E174: Command already exists: add ! to replace it"
--- 1236,1245 ----
  msgid "E173: 1 more file to edit"
  msgstr "E173: 1 ôàéë îæèäàåò ðåäàêòèðîâàíèÿ."
  
! #: ex_docmd.c:4584
  #, c-format
  msgid "E173: %ld more files to edit"
! msgstr "E173: Åñòü íåîòðåäàêòèðîâàííûå ôàéëû (%ld)."
  
  #: ex_docmd.c:4676
  msgid "E174: Command already exists: add ! to replace it"
***************
*** 2303,2314 ****
  "\n"
  "Îòïðàâêà ñîîáùåíèÿ äëÿ óíè÷òîæåíèÿ ïðîöåññà-ïîòîìêà.\n"
  
! #: gui_w32.c:829
  #, c-format
  msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
  msgstr "E243: Ïàðàìåòð íå ïîääåðæèâàåòñÿ: \"-%s\"; èñïîëüçóéòå âåðñèþ OLE."
  
! #: gui_w48.c:2090
  msgid "Find string (use '\\\\' to find  a '\\')"
  msgstr "Ïîèñê ñòðîêè (èñïîëüçóéòå '\\\\' äëÿ ïîèñêà '\\')"
  
--- 2303,2323 ----
  "\n"
  "Îòïðàâêà ñîîáùåíèÿ äëÿ óíè÷òîæåíèÿ ïðîöåññà-ïîòîìêà.\n"
  
! #: gui_w32.c:839
! #, c-format
! msgid "E671: Cannot find window title \"%s\""
! msgstr "E671: Íåâîçìîæíî íàéòè çàãîëîâîê îêíà \"%s\""
! 
! #: gui_w32.c:847
  #, c-format
  msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
  msgstr "E243: Ïàðàìåòð íå ïîääåðæèâàåòñÿ: \"-%s\"; èñïîëüçóéòå âåðñèþ OLE."
  
! #: gui_w32.c:1100
! msgid "E672: Unable to open window inside MDI application"
! msgstr "E672: Íåâîçìîæíî îòêðûòü îêíî âíóòðè ïðèëîæåíèÿ MDI"
! 
! #: gui_w48.c:2163
  msgid "Find string (use '\\\\' to find  a '\\')"
  msgstr "Ïîèñê ñòðîêè (èñïîëüçóéòå '\\\\' äëÿ ïîèñêà '\\')"
  
***************
*** 2353,2358 ****
--- 2362,2368 ----
  msgstr "Font1: %s\n"
  
  #: gui_x11.c:2184
+ #, c-format
  msgid "Font%ld width is not twice that of font0\n"
  msgstr "Øèðèíà øðèôòà font%ld äîëæíà áûòü âäâîå áîëüøå øèðèíû øðèôòà font0\n"
  
***************
*** 2437,2443 ****
  #: if_cscope.c:589
  #, c-format
  msgid "E262: error reading cscope connection %ld"
! msgstr "E262: îøèáêà ïîëó÷åíèÿ èíôîðìàöèè îò ñîåäèíåíèÿ cscope %d"
  
  #: if_cscope.c:694
  msgid "E561: unknown cscope search type"
--- 2447,2453 ----
  #: if_cscope.c:589
  #, c-format
  msgid "E262: error reading cscope connection %ld"
! msgstr "E262: îøèáêà ïîëó÷åíèÿ èíôîðìàöèè îò ñîåäèíåíèÿ cscope %ld"
  
  #: if_cscope.c:694
  msgid "E561: unknown cscope search type"
***************
*** 2515,2521 ****
  #: if_cscope.c:1458
  #, c-format
  msgid "cscope connection %s closed"
! msgstr "ñîåäèíåíèå ñ cscope çàêðûòî"
  
  #. should not reach here
  #: if_cscope.c:1598
--- 2525,2531 ----
  #: if_cscope.c:1458
  #, c-format
  msgid "cscope connection %s closed"
! msgstr "ñîåäèíåíèå %s ñ cscope çàêðûòî"
  
  #. should not reach here
  #: if_cscope.c:1598
***************
*** 6654,6658 ****
  msgid "E463: Region is guarded, cannot modify"
  msgstr "E463: Íåâîçìîæíî èçìåíèòü îõðàíÿåìóþ îáëàñòü"
  
- #~ msgid "\"\n"
- #~ msgstr "\"\n"
--- 6664,6666 ----
*** ../vim-6.3.085/src/version.c	Sun Jul 24 19:43:13 2005
--- src/version.c	Fri Jul 29 09:53:51 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     86,
  /**/

-- 
DENNIS: Oh, very nice. King, eh!  I expect you've got a palace and fine
        clothes and courtiers and plenty of food.  And how d'you get that?  By
        exploiting the workers! By hanging on to outdated imperialist dogma
        which perpetuates the social and economic differences in our society!
                 "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   ///


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-3/README.patches,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- README.patches	11 Jan 2005 14:30:03 -0000	1.21
+++ README.patches	10 Aug 2005 14:14:21 -0000	1.22
@@ -20,6 +20,8 @@
 After applying a patch, you need to compile Vim.  There are no
 patches for binaries.
 
+Checksums for the patch files can be found in the file MD5.
+
 Individual patches for Vim 6.3:
 
   SIZE  NAME     FIXES
@@ -77,3 +79,35 @@
   3175  6.3.052  (extra) Win 98: can't enter non-ASCII characters if 'enc' set
   1576  6.3.053  Win32: ":loadview" doesn't work for files with non-latin chars
   1981  6.3.054  when 'im' is set redraw remains off when repeating an insert
+  8844  6.3.055  wrong text and crash using <C-R>= or <C-\>e in command line
+  2091  6.3.056  window title wrong for specific multi-byte character
+  1748  6.3.057  folds are not updated after a filter command
+  4440  6.3.058  crash when zero columns room; can't compile without :vsplit
+  2286  6.3.059  crash when editing a file with spaces and shell expansion
+  1609  6.3.060  register name isn't checked for CTRL-R CTRL-O in Insert mode
+  1984  6.3.061  display mess when multi-byte char at right edge of screen
+  2337  6.3.062  ":normal! gQ" hangs
+  1434  6.3.063  after the CursorHold event 'mousefocus' may stop working
+  1586  6.3.064  line2byte(line("$") + 1) sometimes returns the wrong number  
+  4436  6.3.065  there was no digraph for euro in Unicode
+  4728  6.3.066  permissions of backup file may be wrong
+  2200  6.3.067  (after 6.3.066) newly created file gets execute permission
+  2247  6.3.068  can't write when editing symbolic link to compressed file
+  1710  6.3.069  when converting text with illegal characters Vim may crash
+  1928  6.3.070  crash when 'number' set and with a vertical split
+  1722  6.3.071  CTRL-X message sticks after error for completion
+  2083  6.3.072  crash for substitute message when using UTF-8 and Chinese
+  2017  6.3.073  Win32 GUI: display errors when scrolling up/down
+  2365  6.3.074  with 'insertmode' CTRL-V after Select mode doesn't work
+  1745  6.3.075  syntax highlighting wrong after unloading another buffer
+  3546  6.3.076  crash when using Cscope interface with very long result
+  1934  6.3.077  (extra) VMS: character after ESC not handled correctly
+  2508  6.3.078  (extra, after 6.3.077) VMS: performance issue
+  1853  6.3.079  crash after executing a command in the command-line window
+  3024  6.3.080  (extra) Win32: edit fails when 'enc' is utf-8 and Chinese cp
+  1729  6.3.081  glob() may execute shell command unexpectedly
+  2102  6.3.082  (after 6.3.081) more generic solution to avoid shell commands
+  5053  6.3.083  VMS: add function keys to vt320 termcap entry
+  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


Index: spec.vim
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-3/spec.vim,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spec.vim	9 Sep 2004 14:07:26 -0000	1.1
+++ spec.vim	10 Aug 2005 14:14:21 -0000	1.2
@@ -73,9 +73,9 @@
 	" Insert a changelog entry just after the given line
 	function s:InsertChangelogEntry(line)
 		" insert changelog entry
-		call append(a:line, "- ")
+		call append(a:line, "-")
 		" position cursor here
-		execute a:line
+		execute a:line +1
 		" enter insert mode
 		startinsert!
 	endfunction

vim-6.3-tmpfile.patch:
 tcltags     |   26 ++++++++++++++++++++++++--
 vimspell.sh |   15 ++++++++++++++-
 2 files changed, 38 insertions(+), 3 deletions(-)

Index: vim-6.3-tmpfile.patch
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-3/vim-6.3-tmpfile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vim-6.3-tmpfile.patch	11 Jan 2005 15:54:36 -0000	1.1
+++ vim-6.3-tmpfile.patch	10 Aug 2005 14:14:21 -0000	1.2
@@ -14,7 +14,7 @@
 +# create a file in the safest way possible.
 +if test "$OUTFILE" = none; then
 +        OUTFILE=$tmp/vimspell$$
-+	[ -e $OUTFILE ] && { echo "Cannot use temporary file $OUTFILE, it already exists!; exit 1 ; } 
++	[ -e $OUTFILE ] && { echo "Cannot use temporary file $OUTFILE, it already exists!"; exit 1 ; } 
 +        (umask 077; touch $OUTFILE)
 +fi
 +# Note the copy of vimspell cannot be deleted on exit since it is

vim-selinux.patch:
 config.h.in  |    1 +
 configure.in |   15 +++++++++++++++
 fileio.c     |   13 +++++++++++++
 os_unix.c    |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 82 insertions(+)

Index: vim-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-3/vim-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vim-selinux.patch	9 Sep 2004 14:13:56 -0000	1.2
+++ vim-selinux.patch	10 Aug 2005 14:14:21 -0000	1.3
@@ -1,6 +1,6 @@
 --- vim62/src/configure.in.selinux	2004-01-20 11:34:17.177103792 -0500
 +++ vim62/src/configure.in	2004-01-20 11:34:18.507126105 -0500
-@@ -195,6 +195,20 @@
+@@ -195,6 +195,21 @@
  fi
  
  
@@ -12,8 +12,9 @@
 +	, [enable_selinux="yes"])
 +if test "$enable_selinux" = "yes"; then
 +   AC_MSG_RESULT(no)
-+   AC_CHECK_LIB(selinux, is_selinux_enabled, [LIBS="$LIBS -lselinux"])
-+   AC_DEFINE(HAVE_SELINUX)
++   AC_CHECK_LIB(selinux, is_selinux_enabled,
++     [LIBS="$LIBS -lselinux"
++      AC_DEFINE(HAVE_SELINUX)])
 +else
 +   AC_MSG_RESULT(yes)
 +fi


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-3/vim.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- vim.spec	11 Jan 2005 14:30:03 -0000	1.45
+++ vim.spec	10 Aug 2005 14:14:21 -0000	1.46
@@ -4,19 +4,29 @@
 %define desktop_file_utils_version 0.2.93
 %endif
 
+# Set this to 1 if you're building the enterprise version
+%define enterprise 0
+
+%if %{enterprise}
+# don't build gvim
+%define withgui 0
+# don't include ruby interpreter
+%define withruby 0
+%else
 %define withgui 1
 %define withruby 0
 %define withnetbeans 0
+%endif
 
 
 %define baseversion 6.3
 %define vimdir vim63
-%define patchlevel 054
+%define patchlevel 086
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 0.fc3.1
+Release: 0.fc3
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -40,7 +50,7 @@
 Patch2010: xxd-locale.patch
 # Patches 001 < 999 are patches from the base maintainer.
 # If you're as lazy as me, generate the list using
-# for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/6.3.%03d\n" $i $i; done
+# for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/6.2.%03d\n" $i $i; done
 Patch001: ftp://ftp.vim.org/pub/vim/patches/6.3.001
 Patch002: ftp://ftp.vim.org/pub/vim/patches/6.3.002
 Patch003: ftp://ftp.vim.org/pub/vim/patches/6.3.003
@@ -95,6 +105,38 @@
 Patch052: ftp://ftp.vim.org/pub/vim/patches/6.3.052
 Patch053: ftp://ftp.vim.org/pub/vim/patches/6.3.053
 Patch054: ftp://ftp.vim.org/pub/vim/patches/6.3.054
+Patch055: ftp://ftp.vim.org/pub/vim/patches/6.3.055
+Patch056: ftp://ftp.vim.org/pub/vim/patches/6.3.056
+Patch057: ftp://ftp.vim.org/pub/vim/patches/6.3.057
+Patch058: ftp://ftp.vim.org/pub/vim/patches/6.3.058
+Patch059: ftp://ftp.vim.org/pub/vim/patches/6.3.059
+Patch060: ftp://ftp.vim.org/pub/vim/patches/6.3.060
+Patch061: ftp://ftp.vim.org/pub/vim/patches/6.3.061
+Patch062: ftp://ftp.vim.org/pub/vim/patches/6.3.062
+Patch063: ftp://ftp.vim.org/pub/vim/patches/6.3.063
+Patch064: ftp://ftp.vim.org/pub/vim/patches/6.3.064
+Patch065: ftp://ftp.vim.org/pub/vim/patches/6.3.065
+Patch066: ftp://ftp.vim.org/pub/vim/patches/6.3.066
+Patch067: ftp://ftp.vim.org/pub/vim/patches/6.3.067
+Patch068: ftp://ftp.vim.org/pub/vim/patches/6.3.068
+Patch069: ftp://ftp.vim.org/pub/vim/patches/6.3.069
+Patch070: ftp://ftp.vim.org/pub/vim/patches/6.3.070
+Patch071: ftp://ftp.vim.org/pub/vim/patches/6.3.071
+Patch072: ftp://ftp.vim.org/pub/vim/patches/6.3.072
+Patch073: ftp://ftp.vim.org/pub/vim/patches/6.3.073
+Patch074: ftp://ftp.vim.org/pub/vim/patches/6.3.074
+Patch075: ftp://ftp.vim.org/pub/vim/patches/6.3.075
+Patch076: ftp://ftp.vim.org/pub/vim/patches/6.3.076
+Patch077: ftp://ftp.vim.org/pub/vim/patches/6.3.077
+Patch078: ftp://ftp.vim.org/pub/vim/patches/6.3.078
+Patch079: ftp://ftp.vim.org/pub/vim/patches/6.3.079
+Patch080: ftp://ftp.vim.org/pub/vim/patches/6.3.080
+Patch081: ftp://ftp.vim.org/pub/vim/patches/6.3.081
+Patch082: ftp://ftp.vim.org/pub/vim/patches/6.3.082
+Patch083: ftp://ftp.vim.org/pub/vim/patches/6.3.083
+Patch084: ftp://ftp.vim.org/pub/vim/patches/6.3.084
+Patch085: ftp://ftp.vim.org/pub/vim/patches/6.3.085
+Patch086: ftp://ftp.vim.org/pub/vim/patches/6.3.086
 
 Patch3000: vim-6.1-syntax.patch
 Patch3001: vim-6.2-rh1.patch
@@ -184,6 +226,7 @@
 Group: Applications/Editors
 Requires: vim-common = %{epoch}:%{version}-%{release} libattr
 BuildRequires: gtk2-devel
+Prereq: gtk2 >= 2.6
 
 %description X11
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -202,16 +245,15 @@
 %prep
 %setup -q -b 1 -n %{vimdir}
 cp -f %{SOURCE6} runtime/ftplugin/spec.vim
-%patch2000 -p1 -b .4.2
+%patch2000 -p1
 # fix rogue dependencies from sample code
 chmod -x runtime/tools/mve.awk
-%patch2001 -p1 -b .paths
-find . -name \*.paths | xargs rm -f
-%patch2002 -p1 -b .fixkeys
-%patch2003 -p1 -b .highlite
-%patch2004 -p1 -b .crv
-%patch2005 -p1 -b .tmpfile
-%patch2010 -p1 -b .xxdloc
+%patch2001 -p1
+%patch2002 -p1
+%patch2003 -p1
+%patch2004 -p1
+%patch2005 -p1
+%patch2010 -p1
 perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 
 # Base patches...
@@ -245,22 +287,21 @@
 # VMS %patch27 -p0
 %patch28 -p0
 %patch29 -p0
-%patch030 -p0
-%patch031 -p0
-%patch032 -p0
-%patch033 -p0
-%patch034 -p0
-# RISC OS
-#%patch035 -p0
-%patch036 -p0
-%patch037 -p0
+%patch30 -p0
+%patch31 -p0
+%patch32 -p0
+%patch33 -p0
+%patch34 -p0
+#%patch35 -p0
+%patch36 -p0
+%patch37 -p0
 # Win32
-#%patch038 -p0
-%patch039 -p0
-%patch040 -p0
+#%patch38 -p0
+%patch39 -p0
+%patch40 -p0
 # Win32
-#%patch041 -p0
-%patch042 -p0
+#%patch41 -p0
+%patch42 -p0
 %patch043 -p0
 # Win32
 #%patch044 -p0
@@ -278,19 +319,57 @@
 # Win 32
 #%patch053 -p0
 %patch054 -p0
+%patch055 -p0
+%patch056 -p0
+%patch057 -p0
+%patch058 -p0
+%patch059 -p0
+%patch060 -p0
+%patch061 -p0
+%patch062 -p0
+%patch063 -p0
+%patch064 -p0
+%patch065 -p0
+%patch066 -p0
+%patch067 -p0
+%patch068 -p0
+%patch069 -p0
+%patch070 -p0
+%patch071 -p0
+%patch072 -p0
+# Win 32
+# %patch073 -p0
+%patch074 -p0
+%patch075 -p0
+%patch076 -p0
+# VMS
+#%patch077 -p0
+# VMS
+#%patch078 -p0
+%patch079 -p0
+# Win 32
+#%patch080 -p0
+%patch081 -p0
+%patch082 -p0
+# VMS
+#%patch083 -p0
+# Cygwin
+#%patch084 -p0
+%patch085 -p0
+%patch086 -p0
 
 
-%patch3000 -p1 -b .syntx
-%patch3001 -p1 -b .rh1
-%patch3002 -p1 -b .rh2
-%patch3003 -p1 -b .rh3
-%patch3004 -p1 -b .rcloc
-%patch3005 -p1 -b .rh4
-%patch3006 -p1 -b .rh5
-%patch3007 -p1 -b .dns
+%patch3000 -p1
+%patch3001 -p1
+%patch3002 -p1
+%patch3003 -p1
+%patch3004 -p1
+%patch3005 -p1
+%patch3006 -p1
+%patch3007 -p1
 
 %if %{WITH_SELINUX}
-%patch3100 -p1 -b .selinux
+%patch3100 -p1
 %endif
 
 %build
@@ -299,8 +378,8 @@
 perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimdir},g" os_unix.h
 perl -pi -e "s,\\\$VIM,/usr/share/vim/%{vimdir}/macros,g" os_unix.h
 
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
-export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
+export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
 %if "%{withruby}" == "1"
 export  RUBY_CFLAGS=-I$(ruby -r rbconfig -e 'p Config::CONFIG["archdir"]')
 %endif
@@ -364,17 +443,17 @@
 make installmacros DESTDIR=$RPM_BUILD_ROOT
 %if "%{withgui}" == "1"
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
-install -s -m755 gvim $RPM_BUILD_ROOT/usr/X11R6/bin
-install -s -m644 %{SOURCE7} \
+install -m755 gvim $RPM_BUILD_ROOT/usr/X11R6/bin
+install -m644 %{SOURCE7} \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/gvim.png
-install -s -m644 %{SOURCE8} \
+install -m644 %{SOURCE8} \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/gvim.png
-install -s -m644 %{SOURCE9} \
+install -m644 %{SOURCE9} \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gvim.png
-install -s -m644 %{SOURCE10} \
+install -m644 %{SOURCE10} \
    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/gvim.png
 %endif
-install -s -m755 enhanced-vim $RPM_BUILD_ROOT/usr/bin/vim
+install -m755 enhanced-vim $RPM_BUILD_ROOT/usr/bin/vim
 
 ( cd $RPM_BUILD_ROOT
   mv ./bin/vimtutor ./usr/bin
@@ -435,7 +514,7 @@
    iconv -f CP1252 -t UTF8 tutor.no > conv/tutor.no
    iconv -f ISO-8859-2 -t UTF8 tutor.pl > conv/tutor.pl
    iconv -f ISO-8859-2 -t UTF8 tutor.sk > conv/tutor.sk
-   iconv -f CP1251 -t UTF8 tutor.ru > conv/tutor.ru
+   iconv -f KOI8R -t UTF8 tutor.ru > conv/tutor.ru
    iconv -f CP1252 -t UTF8 tutor.sv > conv/tutor.sv
    mv -f tutor.gr.cp737 tutor.ja.euc tutor.ja.sjis tutor.ko.euc tutor.pl.cp1250 tutor.zh.big5 tutor.ru.cp1251 tutor.zh.euc conv/
    rm -f tutor.ca tutor.de tutor.es tutor.fr tutor.gr tutor.it tutor.ja.utf-8 tutor.ko.utf-8 tutor.no tutor.pl tutor.sk tutor.ru tutor.sv
@@ -452,20 +531,39 @@
 mkdir -p $RPM_BUILD_ROOT/etc/profile.d
 cat >$RPM_BUILD_ROOT/etc/profile.d/vim.sh <<EOF
 if [ -n "\$BASH_VERSION" -o -n "\$KSH_VERSION" -o -n "\$ZSH_VERSION" ]; then
-  # for bash, pdksh and zsh, only if no alias is already set
+  [ -x /usr/bin/id ] || return
+  [ \`/usr/bin/id -u\` -le 100 ] && return
+  # for bash and zsh, only if no alias is already set
   alias vi >/dev/null 2>&1 || alias vi=vim
 fi
 EOF
 cat >$RPM_BUILD_ROOT/etc/profile.d/vim.csh <<EOF
+[ -x /usr/bin/id ] || exit
+[ \`/usr/bin/id -u\` -le 100 ] && exit
 alias vi vim
 EOF
 chmod 0755 $RPM_BUILD_ROOT/etc/profile.d/*
-install -s -m644 %{SOURCE4} $RPM_BUILD_ROOT/etc/vimrc
+install -m644 %{SOURCE4} $RPM_BUILD_ROOT/etc/vimrc
+(cd $RPM_BUILD_ROOT/usr/share/vim/%{vimdir}/doc;
+ gzip -9 *.txt; gzip -d help.txt.gz
+ cat tags | sed -e 's/\t\(.*.txt\)\t/\t\1.gz\t/;s/\thelp.txt.gz\t/\thelp.txt\t/' > tags.new; mv -f tags.new tags)
 (cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;
  mv -f  macros/README.txt ../README.macros;
  mv -f  tools/README.txt ../README.tools;
 )
 
+%post X11
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+%postun X11
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -540,12 +638,93 @@
 %endif
 
 %changelog
-* Tue Jan 11 2005 Karsten Hopp <karsten at redhat.de> 6.3.054-0.fc3.1
+* Wed Aug 10 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-0.fc3
+- build for FC-3
+
+* Tue Aug 09 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-1
+- update to patchlevel 86
+
+* Mon Jun 12 2005 Karsten Hopp <karsten at redhat.de> 6.3.080-1
+- update to patchlevel 80
+
+* Wed Apr 27 2005 Jeremy Katz <katzj at redhat.com> - 1:6.3.071-3
+- silence %%post
+
+* Mon Apr 18 2005 Karsten Hopp <karsten at redhat.de> 6.3.071-2
+- fix wrong Russian code page for vimtutor (#155181)
+
+* Mon Apr 11 2005 Karsten Hopp <karsten at redhat.de> 6.3.071-1
+- patchlevel 71, fixes crashes when converting text with illegal characters
+  and when moving the vertical separator to the far left (vertically splitted 
+  window)
+
+* Mon Apr 11 2005 Karsten Hopp <karsten at redhat.de> 6.3.068-2
+- quote special characters in here documents (vim.sh/vim.csh) (#154321)
+
+* Thu Mar 31 2005 Karsten Hopp <karsten at redhat.de> 6.3-068
+- pathlevel 68 (can't write when editing symbolic link to compressed file)
+- remove -s parameter from install, this should fix debuginfo packages
+
+* Mon Mar 28 2005 Christopher Aillon <caillon at redhat.com>
+- rebuilt
+
+* Fri Mar 25 2005 Christopher Aillon <caillon at redhat.com> 6.3.067-2
+- Update the GTK+ theme icon cache on (un)install
+
+* Wed Mar 23 2005 Karsten Hopp <karsten at redhat.de> 6.3.067-1
+- Newly created files got execute permission (caused by patch 66)
+  #151667
+
+* Fri Mar 18 2005 Karsten Hopp <karsten at redhat.de> 6.3.066-1
+- patchlevel 66
+
+* Mon Mar 14 2005 Karsten Hopp <karsten at redhat.de> 6.3.064-1
+- patchlevel 64
+- fix selinux warning (#150126)
+
+* Wed Mar 02 2005 Karsten Hopp <karsten at redhat.de> 6.3.062-1
+- patchlevel 62, build with gcc-4
+
+* Thu Feb 10 2005 Karsten Hopp <karsten at redhat.de> 6.3.061-3
+- spec.vim fix from Andrew Overholt
+
+* Mon Feb 07 2005 Karsten Hopp <karsten at redhat.de> 6.3.061-2 
+- fix tmpfile patch (#147192)
+
+* Mon Jan 31 2005 Karsten Hopp <karsten at redhat.de> 6.3.061-1 
+- patchlevel 61
+
+* Tue Jan 18 2005 Chip Turner <cturner at redhat.com> 1:058-2
+- rebuild for new perl
+
+* Tue Jan 18 2005 Karsten Hopp <karsten at redhat.de> 6.3.058-1
+- Patchlevel 58
+- rebuild with new perl
+- remove all rpm backup files
+
+* Wed Jan 12 2005 Karsten Hopp <karsten at redhat.de> 6.3.054-2
+- remove backup files
+
+* Wed Jan 12 2005 Karsten Hopp <karsten at redhat.de> 6.3.054-1
 - patchlevel 54
-- fix usage of temporary files (#144698)
+- fix unsecure tempfile usage (#144698)
+
+* Mon Dec 06 2004 Karsten Hopp <karsten at redhat.de> 6.3.042-1 
+- patchlevel 42
+
+* Thu Dec 02 2004 Karsten Hopp <karsten at redhat.de> 6.3.035-2 
+- fix compressed docs handling (#141565)
+
+* Wed Dec 01 2004 Karsten Hopp <karsten at redhat.de> 6.3.035-1 
+- patchlevel 35
+- allow remapping of 'g' (#140747)
+
+* Fri Nov 19 2004 Karsten Hopp <karsten at redhat.de> 6.3.033-1 
+- patchlevel 33
 
-* Tue Dec 14 2004 Karsten Hopp <karsten at redhat.de> 6.3.046-0.fc3.1
-- patchlevel 46 (#142446) CAN-2004-1138
+* Tue Nov 02 2004 Karsten Hopp <karsten at redhat.de> 6.3.030-3 
+- fix selinux patch, so that HAVE_SELINUX will not be defined on 
+  non-selinux systems (#137860)
 
 * Tue Oct 19 2004 Karsten Hopp <karsten at redhat.de> 6.3.030-3 
 - fix dependencies on vim-common (#132371)


Index: vimrc
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-3/vimrc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vimrc	12 Oct 2004 12:07:35 -0000	1.11
+++ vimrc	10 Aug 2005 14:14:21 -0000	1.12
@@ -18,7 +18,7 @@
   " When editing a file, always jump to the last cursor position
   autocmd BufReadPost *
   \ if line("'\"") > 0 && line ("'\"") <= line("$") |
-  \   exe "normal g'\"" |
+  \   exe "normal! g'\"" |
   \ endif
 endif
 




More information about the fedora-cvs-commits mailing list