projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 25f687b8 AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.135 | |
| 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.135 | |
| 11 | Problem: Win32: When editing a file c:\tmp\foo and c:\tmp\\foo we have two | |
| 12 | buffers for the same file. (Suresh Govindachar) | |
| 13 | Solution: Invoke FullName_save() when a path contains "//" or "\\". | |
| 14 | Files: src/buffer.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.1.134/src/buffer.c Sun Sep 30 14:00:41 2007 | |
| 18 | --- src/buffer.c Wed Oct 3 14:24:52 2007 | |
| 19 | *************** | |
| 20 | *** 4175,4203 **** | |
| 21 | * mess up the full path name, even though it starts with a '/'. | |
| 22 | * Also expand when there is ".." in the file name, try to remove it, | |
| 23 | * because "c:/src/../README" is equal to "c:/README". | |
| 24 | * For MS-Windows also expand names like "longna~1" to "longname". | |
| 25 | */ | |
| 26 | #ifdef UNIX | |
| 27 | return FullName_save(fname, TRUE); | |
| 28 | #else | |
| 29 | ! if (!vim_isAbsName(fname) || strstr((char *)fname, "..") != NULL | |
| 30 | ! #if defined(MSWIN) || defined(DJGPP) | |
| 31 | || vim_strchr(fname, '~') != NULL | |
| 32 | ! #endif | |
| 33 | ) | |
| 34 | return FullName_save(fname, FALSE); | |
| 35 | ||
| 36 | fname = vim_strsave(fname); | |
| 37 | ||
| 38 | ! #ifdef USE_FNAME_CASE | |
| 39 | ! # ifdef USE_LONG_FNAME | |
| 40 | if (USE_LONG_FNAME) | |
| 41 | ! # endif | |
| 42 | { | |
| 43 | if (fname != NULL) | |
| 44 | fname_case(fname, 0); /* set correct case for file name */ | |
| 45 | } | |
| 46 | ! #endif | |
| 47 | ||
| 48 | return fname; | |
| 49 | #endif | |
| 50 | --- 4175,4209 ---- | |
| 51 | * mess up the full path name, even though it starts with a '/'. | |
| 52 | * Also expand when there is ".." in the file name, try to remove it, | |
| 53 | * because "c:/src/../README" is equal to "c:/README". | |
| 54 | + * Similarly "c:/src//file" is equal to "c:/src/file". | |
| 55 | * For MS-Windows also expand names like "longna~1" to "longname". | |
| 56 | */ | |
| 57 | #ifdef UNIX | |
| 58 | return FullName_save(fname, TRUE); | |
| 59 | #else | |
| 60 | ! if (!vim_isAbsName(fname) | |
| 61 | ! || strstr((char *)fname, "..") != NULL | |
| 62 | ! || strstr((char *)fname, "//") != NULL | |
| 63 | ! # ifdef BACKSLASH_IN_FILENAME | |
| 64 | ! || strstr((char *)fname, "\\\\") != NULL | |
| 65 | ! # endif | |
| 66 | ! # if defined(MSWIN) || defined(DJGPP) | |
| 67 | || vim_strchr(fname, '~') != NULL | |
| 68 | ! # endif | |
| 69 | ) | |
| 70 | return FullName_save(fname, FALSE); | |
| 71 | ||
| 72 | fname = vim_strsave(fname); | |
| 73 | ||
| 74 | ! # ifdef USE_FNAME_CASE | |
| 75 | ! # ifdef USE_LONG_FNAME | |
| 76 | if (USE_LONG_FNAME) | |
| 77 | ! # endif | |
| 78 | { | |
| 79 | if (fname != NULL) | |
| 80 | fname_case(fname, 0); /* set correct case for file name */ | |
| 81 | } | |
| 82 | ! # endif | |
| 83 | ||
| 84 | return fname; | |
| 85 | #endif | |
| 86 | *** ../vim-7.1.134/src/version.c Wed Oct 3 13:28:40 2007 | |
| 87 | --- src/version.c Wed Oct 3 14:26:54 2007 | |
| 88 | *************** | |
| 89 | *** 668,669 **** | |
| 90 | --- 668,671 ---- | |
| 91 | { /* Add new patch number below this line */ | |
| 92 | + /**/ | |
| 93 | + 135, | |
| 94 | /**/ | |
| 95 | ||
| 96 | -- | |
| 97 | A village. Sound of chanting of Latin canon, punctuated by short, sharp | |
| 98 | cracks. It comes nearer. We see it is a line of MONKS ala SEVENTH SEAL | |
| 99 | flagellation scene, chanting and banging themselves on the foreheads with | |
| 100 | wooden boards. | |
| 101 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 102 | ||
| 103 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 104 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 105 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 106 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |