projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d2415672 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.195 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.195 | |
| 11 | Problem: '0 mark doesn't work for "~/foo ~ foo". | |
| 12 | Solution: Don't expand the whole file name, only "~/". | |
| 13 | Files: src/mark.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.194/src/mark.c Thu May 10 18:48:03 2007 | |
| 17 | --- src/mark.c Thu Jan 3 20:17:29 2008 | |
| 18 | *************** | |
| 19 | *** 505,513 **** | |
| 20 | { | |
| 21 | /* | |
| 22 | * First expand "~/" in the file name to the home directory. | |
| 23 | ! * Try to shorten the file name. | |
| 24 | */ | |
| 25 | ! expand_env(fm->fname, NameBuff, MAXPATHL); | |
| 26 | mch_dirname(IObuff, IOSIZE); | |
| 27 | p = shorten_fname(NameBuff, IObuff); | |
| 28 | ||
| 29 | --- 505,528 ---- | |
| 30 | { | |
| 31 | /* | |
| 32 | * First expand "~/" in the file name to the home directory. | |
| 33 | ! * Don't expand the whole name, it may contain other '~' chars. | |
| 34 | */ | |
| 35 | ! if (fm->fname[0] == '~' && (fm->fname[1] == '/' | |
| 36 | ! #ifdef BACKSLASH_IN_FILENAME | |
| 37 | ! || fm->fname[1] == '\\' | |
| 38 | ! #endif | |
| 39 | ! )) | |
| 40 | ! { | |
| 41 | ! int len; | |
| 42 | ! | |
| 43 | ! expand_env((char_u *)"~/", NameBuff, MAXPATHL); | |
| 44 | ! len = STRLEN(NameBuff); | |
| 45 | ! vim_strncpy(NameBuff + len, fm->fname + 2, MAXPATHL - len - 1); | |
| 46 | ! } | |
| 47 | ! else | |
| 48 | ! vim_strncpy(NameBuff, fm->fname, MAXPATHL - 1); | |
| 49 | ! | |
| 50 | ! /* Try to shorten the file name. */ | |
| 51 | mch_dirname(IObuff, IOSIZE); | |
| 52 | p = shorten_fname(NameBuff, IObuff); | |
| 53 | ||
| 54 | *** ../vim-7.1.194/src/version.c Thu Jan 3 18:55:21 2008 | |
| 55 | --- src/version.c Thu Jan 3 20:10:16 2008 | |
| 56 | *************** | |
| 57 | *** 668,669 **** | |
| 58 | --- 668,671 ---- | |
| 59 | { /* Add new patch number below this line */ | |
| 60 | + /**/ | |
| 61 | + 195, | |
| 62 | /**/ | |
| 63 | ||
| 64 | -- | |
| 65 | GUARD #2: Wait a minute -- supposing two swallows carried it together? | |
| 66 | GUARD #1: No, they'd have to have it on a line. | |
| 67 | GUARD #2: Well, simple! They'd just use a standard creeper! | |
| 68 | GUARD #1: What, held under the dorsal guiding feathers? | |
| 69 | GUARD #2: Well, why not? | |
| 70 | The Quest for the Holy Grail (Monty Python) | |
| 71 | ||
| 72 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 73 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 74 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 75 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |