projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 7bf01cab ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.153 | |
| 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.153 | |
| 11 | Problem: Compiler warnings on SGI. Undefined XpmAllocColor (Charles | |
| 12 | Campbell) | |
| 13 | Solution: Add type casts. Init st_dev and st_ino separately. Don't use | |
| 14 | type casts for vim_snprintf() when HAVE_STDARG_H is defined. | |
| 15 | Define XpmAllocColor when needed. | |
| 16 | Files: src/eval.c, src/ex_cmds.c, src/fileio.c, src/misc2.c, | |
| 17 | src/gui_xmebw.c | |
| 18 | ||
| 19 | ||
| 20 | *** ../vim-7.1.152/src/eval.c Tue Oct 2 22:07:58 2007 | |
| 21 | --- src/eval.c Mon Oct 1 20:56:09 2007 | |
| 22 | *************** | |
| 23 | *** 8729,8735 **** | |
| 24 | static int fnum = 0; | |
| 25 | static int change_start = 0; | |
| 26 | static int change_end = 0; | |
| 27 | ! static hlf_T hlID = 0; | |
| 28 | int filler_lines; | |
| 29 | int col; | |
| 30 | ||
| 31 | --- 8729,8735 ---- | |
| 32 | static int fnum = 0; | |
| 33 | static int change_start = 0; | |
| 34 | static int change_end = 0; | |
| 35 | ! static hlf_T hlID = (hlf_T)0; | |
| 36 | int filler_lines; | |
| 37 | int col; | |
| 38 | ||
| 39 | *** ../vim-7.1.152/src/ex_cmds.c Thu Sep 13 18:25:08 2007 | |
| 40 | --- src/ex_cmds.c Thu Sep 13 16:19:40 2007 | |
| 41 | *************** | |
| 42 | *** 1774,1780 **** | |
| 43 | * overwrite a user's viminfo file after a "su root", with a | |
| 44 | * viminfo file that the user can't read. | |
| 45 | */ | |
| 46 | ! st_old.st_dev = st_old.st_ino = 0; | |
| 47 | st_old.st_mode = 0600; | |
| 48 | if (mch_stat((char *)fname, &st_old) == 0 | |
| 49 | && getuid() != ROOT_UID | |
| 50 | --- 1774,1781 ---- | |
| 51 | * overwrite a user's viminfo file after a "su root", with a | |
| 52 | * viminfo file that the user can't read. | |
| 53 | */ | |
| 54 | ! st_old.st_dev = 0; | |
| 55 | ! st_old.st_ino = 0; | |
| 56 | st_old.st_mode = 0600; | |
| 57 | if (mch_stat((char *)fname, &st_old) == 0 | |
| 58 | && getuid() != ROOT_UID | |
| 59 | *** ../vim-7.1.152/src/fileio.c Mon Oct 29 22:37:57 2007 | |
| 60 | --- src/fileio.c Mon Oct 22 21:10:00 2007 | |
| 61 | *************** | |
| 62 | *** 3209,3215 **** | |
| 63 | * Get information about original file (if there is one). | |
| 64 | */ | |
| 65 | #if defined(UNIX) && !defined(ARCHIE) | |
| 66 | ! st_old.st_dev = st_old.st_ino = 0; | |
| 67 | perm = -1; | |
| 68 | if (mch_stat((char *)fname, &st_old) < 0) | |
| 69 | newfile = TRUE; | |
| 70 | --- 3209,3216 ---- | |
| 71 | * Get information about original file (if there is one). | |
| 72 | */ | |
| 73 | #if defined(UNIX) && !defined(ARCHIE) | |
| 74 | ! st_old.st_dev = 0; | |
| 75 | ! st_old.st_ino = 0; | |
| 76 | perm = -1; | |
| 77 | if (mch_stat((char *)fname, &st_old) < 0) | |
| 78 | newfile = TRUE; | |
| 79 | *** ../vim-7.1.152/src/misc2.c Sun Oct 7 15:44:28 2007 | |
| 80 | --- src/misc2.c Sun Sep 30 18:00:09 2007 | |
| 81 | *************** | |
| 82 | *** 5924,5930 **** | |
| 83 | --- 5925,5935 ---- | |
| 84 | { | |
| 85 | if (emsg_not_now()) | |
| 86 | return TRUE; /* no error messages at the moment */ | |
| 87 | + #ifdef HAVE_STDARG_H | |
| 88 | + vim_snprintf((char *)IObuff, IOSIZE, (char *)s, a1, a2); | |
| 89 | + #else | |
| 90 | vim_snprintf((char *)IObuff, IOSIZE, (char *)s, (long_u)a1, (long_u)a2); | |
| 91 | + #endif | |
| 92 | return emsg(IObuff); | |
| 93 | } | |
| 94 | ||
| 95 | *** ../vim-7.1.152/src/gui_xmebw.c Thu May 10 19:46:55 2007 | |
| 96 | --- src/gui_xmebw.c Thu Sep 6 12:57:51 2007 | |
| 97 | *************** | |
| 98 | *** 395,405 **** | |
| 99 | ||
| 100 | /* Create the "highlight" pixmap. */ | |
| 101 | color[4].pixel = eb->primitive.bottom_shadow_color; | |
| 102 | attr.valuemask = XpmColorSymbols | XpmCloseness | XpmAllocColor; | |
| 103 | attr.closeness = 65535; /* accuracy isn't crucial */ | |
| 104 | attr.colorsymbols = color; | |
| 105 | attr.numsymbols = XtNumber(color); | |
| 106 | - attr.alloc_color = alloc_color; | |
| 107 | ||
| 108 | status = XpmCreatePixmapFromData(dpy, root, data, &pix, NULL, &attr); | |
| 109 | XpmFreeAttributes(&attr); | |
| 110 | --- 395,409 ---- | |
| 111 | ||
| 112 | /* Create the "highlight" pixmap. */ | |
| 113 | color[4].pixel = eb->primitive.bottom_shadow_color; | |
| 114 | + #ifdef XpmAllocColor /* SGI doesn't have it */ | |
| 115 | attr.valuemask = XpmColorSymbols | XpmCloseness | XpmAllocColor; | |
| 116 | + attr.alloc_color = alloc_color; | |
| 117 | + #else | |
| 118 | + attr.valuemask = XpmColorSymbols | XpmCloseness; | |
| 119 | + #endif | |
| 120 | attr.closeness = 65535; /* accuracy isn't crucial */ | |
| 121 | attr.colorsymbols = color; | |
| 122 | attr.numsymbols = XtNumber(color); | |
| 123 | ||
| 124 | status = XpmCreatePixmapFromData(dpy, root, data, &pix, NULL, &attr); | |
| 125 | XpmFreeAttributes(&attr); | |
| 126 | *** ../vim-7.1.152/src/version.c Thu Nov 8 14:50:58 2007 | |
| 127 | --- src/version.c Thu Nov 8 20:45:56 2007 | |
| 128 | *************** | |
| 129 | *** 668,669 **** | |
| 130 | --- 668,671 ---- | |
| 131 | { /* Add new patch number below this line */ | |
| 132 | + /**/ | |
| 133 | + 153, | |
| 134 | /**/ | |
| 135 | ||
| 136 | -- | |
| 137 | From "know your smileys": | |
| 138 | @:-() Elvis Presley | |
| 139 | ||
| 140 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 141 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 142 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 143 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |