|
 |
c17bcc4 |
To: vim-dev@vim.org
|
|
|
c17bcc4 |
Subject: Patch 7.1.195
|
|
|
c17bcc4 |
Fcc: outbox
|
|
|
c17bcc4 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
c17bcc4 |
Mime-Version: 1.0
|
|
|
c17bcc4 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
c17bcc4 |
Content-Transfer-Encoding: 8bit
|
|
|
c17bcc4 |
------------
|
|
|
c17bcc4 |
|
|
|
c17bcc4 |
Patch 7.1.195
|
|
|
c17bcc4 |
Problem: '0 mark doesn't work for "~/foo ~ foo".
|
|
|
c17bcc4 |
Solution: Don't expand the whole file name, only "~/".
|
|
|
c17bcc4 |
Files: src/mark.c
|
|
|
c17bcc4 |
|
|
|
c17bcc4 |
|
|
|
c17bcc4 |
*** ../vim-7.1.194/src/mark.c Thu May 10 18:48:03 2007
|
|
|
c17bcc4 |
--- src/mark.c Thu Jan 3 20:17:29 2008
|
|
|
c17bcc4 |
***************
|
|
|
c17bcc4 |
*** 505,513 ****
|
|
|
c17bcc4 |
{
|
|
|
c17bcc4 |
/*
|
|
|
c17bcc4 |
* First expand "~/" in the file name to the home directory.
|
|
|
c17bcc4 |
! * Try to shorten the file name.
|
|
|
c17bcc4 |
*/
|
|
|
c17bcc4 |
! expand_env(fm->fname, NameBuff, MAXPATHL);
|
|
|
c17bcc4 |
mch_dirname(IObuff, IOSIZE);
|
|
|
c17bcc4 |
p = shorten_fname(NameBuff, IObuff);
|
|
|
c17bcc4 |
|
|
|
c17bcc4 |
--- 505,528 ----
|
|
|
c17bcc4 |
{
|
|
|
c17bcc4 |
/*
|
|
|
c17bcc4 |
* First expand "~/" in the file name to the home directory.
|
|
|
c17bcc4 |
! * Don't expand the whole name, it may contain other '~' chars.
|
|
|
c17bcc4 |
*/
|
|
|
c17bcc4 |
! if (fm->fname[0] == '~' && (fm->fname[1] == '/'
|
|
|
c17bcc4 |
! #ifdef BACKSLASH_IN_FILENAME
|
|
|
c17bcc4 |
! || fm->fname[1] == '\\'
|
|
|
c17bcc4 |
! #endif
|
|
|
c17bcc4 |
! ))
|
|
|
c17bcc4 |
! {
|
|
|
c17bcc4 |
! int len;
|
|
|
c17bcc4 |
!
|
|
|
c17bcc4 |
! expand_env((char_u *)"~/", NameBuff, MAXPATHL);
|
|
|
c17bcc4 |
! len = STRLEN(NameBuff);
|
|
|
c17bcc4 |
! vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1);
|
|
|
c17bcc4 |
! }
|
|
|
c17bcc4 |
! else
|
|
|
c17bcc4 |
! vim_strncpy(NameBuff, fm->fname, MAXPATHL - 1);
|
|
|
c17bcc4 |
!
|
|
|
c17bcc4 |
! /* Try to shorten the file name. */
|
|
|
c17bcc4 |
mch_dirname(IObuff, IOSIZE);
|
|
|
c17bcc4 |
p = shorten_fname(NameBuff, IObuff);
|
|
|
c17bcc4 |
|
|
|
c17bcc4 |
*** ../vim-7.1.194/src/version.c Thu Jan 3 18:55:21 2008
|
|
|
c17bcc4 |
--- src/version.c Thu Jan 3 20:10:16 2008
|
|
|
c17bcc4 |
***************
|
|
|
c17bcc4 |
*** 668,669 ****
|
|
|
c17bcc4 |
--- 668,671 ----
|
|
|
c17bcc4 |
{ /* Add new patch number below this line */
|
|
|
c17bcc4 |
+ /**/
|
|
|
c17bcc4 |
+ 195,
|
|
|
c17bcc4 |
/**/
|
|
|
c17bcc4 |
|
|
|
c17bcc4 |
--
|
|
|
c17bcc4 |
GUARD #2: Wait a minute -- supposing two swallows carried it together?
|
|
|
c17bcc4 |
GUARD #1: No, they'd have to have it on a line.
|
|
|
c17bcc4 |
GUARD #2: Well, simple! They'd just use a standard creeper!
|
|
|
c17bcc4 |
GUARD #1: What, held under the dorsal guiding feathers?
|
|
|
c17bcc4 |
GUARD #2: Well, why not?
|
|
|
c17bcc4 |
The Quest for the Holy Grail (Monty Python)
|
|
|
c17bcc4 |
|
|
|
c17bcc4 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
c17bcc4 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
c17bcc4 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
c17bcc4 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|