projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 04f0bc09 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.069 | |
| 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.069 (after 6.2.064) | |
| 11 | Problem: Unused variables "limit" and "new_st" and unused label "fail" in | |
| 12 | some situation. (Bill McCarthy) | |
| 13 | Solution: Put the declarations inside an #ifdef. (Servatius Brandt) | |
| 14 | Files: src/eval.c, src/tag.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.068/src/eval.c Sun Aug 10 22:31:29 2003 | |
| 18 | --- src/eval.c Mon Aug 11 09:54:12 2003 | |
| 19 | *************** | |
| 20 | *** 5810,5816 **** | |
| 21 | VAR retvar; | |
| 22 | { | |
| 23 | char_u *p; | |
| 24 | - int limit = 100; | |
| 25 | ||
| 26 | p = get_var_string(&argvars[0]); | |
| 27 | #ifdef FEAT_SHORTCUT | |
| 28 | --- 5810,5815 ---- | |
| 29 | *************** | |
| 30 | *** 5833,5838 **** | |
| 31 | --- 5832,5838 ---- | |
| 32 | char_u *q; | |
| 33 | int is_relative_to_current = FALSE; | |
| 34 | int has_trailing_pathsep = FALSE; | |
| 35 | + int limit = 100; | |
| 36 | ||
| 37 | p = vim_strsave(p); | |
| 38 | ||
| 39 | *************** | |
| 40 | *** 5853,5859 **** | |
| 41 | q[-1] = NUL; | |
| 42 | } | |
| 43 | ||
| 44 | ! for(;;) | |
| 45 | { | |
| 46 | for (;;) | |
| 47 | { | |
| 48 | --- 5853,5859 ---- | |
| 49 | q[-1] = NUL; | |
| 50 | } | |
| 51 | ||
| 52 | ! for (;;) | |
| 53 | { | |
| 54 | for (;;) | |
| 55 | { | |
| 56 | *************** | |
| 57 | *** 5998,6004 **** | |
| 58 | --- 5998,6006 ---- | |
| 59 | ||
| 60 | simplify_filename(retvar->var_val.var_string); | |
| 61 | ||
| 62 | + #ifdef HAVE_READLINK | |
| 63 | fail: | |
| 64 | + #endif | |
| 65 | retvar->var_type = VAR_STRING; | |
| 66 | } | |
| 67 | ||
| 68 | *** ../vim-6.2.068/src/tag.c Sun Aug 10 22:31:29 2003 | |
| 69 | --- src/tag.c Mon Aug 11 21:18:10 2003 | |
| 70 | *************** | |
| 71 | *** 2936,2942 **** | |
| 72 | { | |
| 73 | int do_strip = FALSE; | |
| 74 | char_u saved_char; | |
| 75 | ! struct stat st, new_st; | |
| 76 | ||
| 77 | /* Don't strip for an erroneous file name. */ | |
| 78 | if (!stripping_disabled) | |
| 79 | --- 2936,2942 ---- | |
| 80 | { | |
| 81 | int do_strip = FALSE; | |
| 82 | char_u saved_char; | |
| 83 | ! struct stat st; | |
| 84 | ||
| 85 | /* Don't strip for an erroneous file name. */ | |
| 86 | if (!stripping_disabled) | |
| 87 | *************** | |
| 88 | *** 2961,2966 **** | |
| 89 | --- 2961,2968 ---- | |
| 90 | ||
| 91 | if (!do_strip) | |
| 92 | { | |
| 93 | + struct stat new_st; | |
| 94 | + | |
| 95 | /* If the component exists in the file system, check | |
| 96 | * that stripping it won't change the meaning of the | |
| 97 | * file name. First get information about the | |
| 98 | *** ../vim-6.2.068/src/version.c Sun Aug 10 22:43:27 2003 | |
| 99 | --- src/version.c Mon Aug 11 23:03:28 2003 | |
| 100 | *************** | |
| 101 | *** 632,633 **** | |
| 102 | --- 632,635 ---- | |
| 103 | { /* Add new patch number below this line */ | |
| 104 | + /**/ | |
| 105 | + 69, | |
| 106 | /**/ | |
| 107 | ||
| 108 | -- | |
| 109 | I AM THANKFUL... | |
| 110 | ...for the clothes that fit a little too snug because it | |
| 111 | means I have more than enough to eat. | |
| 112 | ||
| 113 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 114 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 115 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 116 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |