[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/vim/devel 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 README.patches, 1.33, 1.34 vim.spec, 1.72, 1.73



Author: karsten

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

Modified Files:
	README.patches vim.spec 
Added Files:
	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 
Log Message:
- update to patchlevel 80


--- NEW FILE 6.3.072 ---
To: vim-dev vim org
Subject: Patch 6.3.072
Fcc: outbox
From: Bram Moolenaar <Bram 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 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 vim org
Subject: Patch 6.3.073
Fcc: outbox
From: Bram Moolenaar <Bram 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 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 vim org
Subject: Patch 6.3.074
Fcc: outbox
From: Bram Moolenaar <Bram 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 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 vim org
Subject: Patch 6.3.075
Fcc: outbox
From: Bram Moolenaar <Bram 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 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 vim org
Subject: Patch 6.3.076
Fcc: outbox
From: Bram Moolenaar <Bram 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 zk3 dec com>
!  * Ported to Win32 by Sergey Khorev <khorev 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 zk3 dec com>
!  * Ported to Win32 by Sergey Khorev <sergey khorev 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 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 vim org
Subject: Patch 6.3.077 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram 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 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 vim org
Subject: Patch 6.3.078 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram 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 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 vim org
Subject: Patch 6.3.079
Fcc: outbox
From: Bram Moolenaar <Bram 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 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 vim org
Subject: Patch 6.3.080 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram 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 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/devel/README.patches,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- README.patches	11 Apr 2005 10:20:32 -0000	1.33
+++ README.patches	12 Jul 2005 19:04:30 -0000	1.34
@@ -96,3 +96,12 @@
   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


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- vim.spec	27 Apr 2005 05:06:46 -0000	1.72
+++ vim.spec	12 Jul 2005 19:04:30 -0000	1.73
@@ -21,12 +21,12 @@
 
 %define baseversion 6.3
 %define vimdir vim63
-%define patchlevel 071
+%define patchlevel 080
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 3
+Release: 1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -122,6 +122,15 @@
 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
 
 Patch3000: vim-6.1-syntax.patch
 Patch3001: vim-6.2-rh1.patch
@@ -321,6 +330,19 @@
 %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
 
 
 %patch3000 -p1
@@ -602,6 +624,9 @@
 %endif
 
 %changelog
+* Mon Jun 12 2005 Karsten Hopp <karsten redhat de> 6.3.080-1
+- update to patchlevel 80
+
 * Wed Apr 27 2005 Jeremy Katz <katzj redhat com> - 1:6.3.071-3
 - silence %%post
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]