To: vim-dev@vim.org
Subject: Patch 5.4n.12
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
------------

Patch 5.4n.12
Problem:    When using the wildmenu on a system that uses a backslash as path
	    separator, the file names in the wildmenu had the backslashes
	    removed. (Schild)
Solution:   Don't remove the backslashes when they are used as a path
	    separator.
Files:	    src/screen.c


*** ../vim-5.4n/src/screen.c	Sun Jul  4 20:35:38 1999
--- src/screen.c	Wed Jul  7 17:38:11 1999
***************
*** 2149,2155 ****
      while (*s)
      {
  	/* Don't display backslashes, they look ugly */
! 	if (*s == '\\' && *(s + 1) != NUL)
  	    ++s;
  	len += charsize(*s++);
  
--- 2149,2157 ----
      while (*s)
      {
  	/* Don't display backslashes, they look ugly */
! 	if (rem_backslash(s)
! 		|| (expand_context == EXPAND_MENUNAMES
! 					      && s[0] == '\\' && s[1] != NUL))
  	    ++s;
  	len += charsize(*s++);
  
***************
*** 2261,2267 ****
  	for (s = L_MATCH(i); *s; ++s)
  	{
  	    /* Don't display backslashes, they look ugly */
! 	    if (*s == '\\' && *(s + 1) != NUL)
  		++s;
  	    STRCPY(buf + len, transchar(*s));
  	    len += STRLEN(buf + len);
--- 2263,2271 ----
  	for (s = L_MATCH(i); *s; ++s)
  	{
  	    /* Don't display backslashes, they look ugly */
! 	    if (rem_backslash(s)
! 		    || (expand_context == EXPAND_MENUNAMES
! 					      && s[0] == '\\' && s[1] != NUL))
  		++s;
  	    STRCPY(buf + len, transchar(*s));
  	    len += STRLEN(buf + len);

--
ARTHUR: CHARGE!
   [The mighty ARMY charges.  Thundering noise of feet.  Clatter of coconuts.
   Shouts etc.   Suddenly there is a wail of a siren and a couple of police
   cars roar round in front of the charging ARMY and the POLICE leap out and
   stop them.  TWO POLICEMAN and the HISTORIAN'S WIFE.  Black Marias skid up
   behind them.]
HISTORIAN'S WIFE: They're the ones, I'm sure.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

--/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\--
  \ \    www.vim.org/iccf      www.moolenaar.net       www.vim.org    / /

.