projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d02ad552 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.170 | |
| 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 6.2.170 | |
| 11 | Problem: When using Sun WorkShop the current directory isn't changed to | |
| 12 | where the file is. | |
| 13 | Solution: Set the 'autochdir' option when using WorkShop. And avoid using | |
| 14 | the basename when 'autochdir' is not set. | |
| 15 | Files: src/gui_x11.c, src/ex_cmds.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-6.2.169/src/gui_x11.c Sun Jul 27 14:16:53 2003 | |
| 19 | --- src/gui_x11.c Wed Dec 24 14:25:10 2003 | |
| 20 | *************** | |
| 21 | *** 1223,1228 **** | |
| 22 | --- 1223,1229 ---- | |
| 23 | if (strcmp("-ws", argv[arg]) == 0) | |
| 24 | { | |
| 25 | usingSunWorkShop++; | |
| 26 | + p_acd = TRUE; | |
| 27 | gui.dofork = FALSE; /* don't fork() when starting GUI */ | |
| 28 | mch_memmove(&argv[arg], &argv[arg + 1], | |
| 29 | (--*argc - arg) * sizeof(char *)); | |
| 30 | *** ../vim-6.2.169/src/ex_cmds.c Sun Nov 9 20:23:26 2003 | |
| 31 | --- src/ex_cmds.c Wed Dec 24 14:31:16 2003 | |
| 32 | *************** | |
| 33 | *** 2615,2621 **** | |
| 34 | ffname = free_fname; | |
| 35 | other_file = otherfile(ffname); | |
| 36 | #ifdef FEAT_SUN_WORKSHOP | |
| 37 | ! if (usingSunWorkShop && (cp = vim_strrchr(sfname, '/')) != NULL) | |
| 38 | sfname = ++cp; | |
| 39 | #endif | |
| 40 | } | |
| 41 | --- 2615,2622 ---- | |
| 42 | ffname = free_fname; | |
| 43 | other_file = otherfile(ffname); | |
| 44 | #ifdef FEAT_SUN_WORKSHOP | |
| 45 | ! if (usingSunWorkShop && p_acd | |
| 46 | ! && (cp = vim_strrchr(sfname, '/')) != NULL) | |
| 47 | sfname = ++cp; | |
| 48 | #endif | |
| 49 | } | |
| 50 | *************** | |
| 51 | *** 3122,3128 **** | |
| 52 | && vim_chdirfile(curbuf->b_ffname) == OK) | |
| 53 | shorten_fnames(TRUE); | |
| 54 | ||
| 55 | ! if (gui.in_use && curbuf->b_fname != NULL) | |
| 56 | { | |
| 57 | # ifdef FEAT_SUN_WORKSHOP | |
| 58 | if (usingSunWorkShop) | |
| 59 | --- 3123,3129 ---- | |
| 60 | && vim_chdirfile(curbuf->b_ffname) == OK) | |
| 61 | shorten_fnames(TRUE); | |
| 62 | ||
| 63 | ! if (gui.in_use && curbuf->b_ffname != NULL) | |
| 64 | { | |
| 65 | # ifdef FEAT_SUN_WORKSHOP | |
| 66 | if (usingSunWorkShop) | |
| 67 | *** ../vim-6.2.169/src/version.c Mon Dec 29 21:17:44 2003 | |
| 68 | --- src/version.c Mon Dec 29 21:20:47 2003 | |
| 69 | *************** | |
| 70 | *** 639,640 **** | |
| 71 | --- 639,642 ---- | |
| 72 | { /* Add new patch number below this line */ | |
| 73 | + /**/ | |
| 74 | + 170, | |
| 75 | /**/ | |
| 76 | ||
| 77 | -- | |
| 78 | hundred-and-one symptoms of being an internet addict: | |
| 79 | 92. It takes you two hours to check all 14 of your mailboxes. | |
| 80 | ||
| 81 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 82 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 83 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 84 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |