projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 50c86d7b AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.311 | |
| 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.311 | |
| 11 | Problem: Compiler warning for missing sentinel in X code. | |
| 12 | Solution: Change 0 to NULL. (Markus Heidelberg) | |
| 13 | Files: src/mbyte.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.310/src/mbyte.c Wed Jun 4 10:59:18 2008 | |
| 17 | --- src/mbyte.c Wed Jun 4 18:34:43 2008 | |
| 18 | *************** | |
| 19 | *** 5520,5532 **** | |
| 20 | preedit_caret_cb.callback = (XIMProc)preedit_caret_cbproc; | |
| 21 | preedit_done_cb.callback = (XIMProc)preedit_done_cbproc; | |
| 22 | preedit_attr | |
| 23 | ! = XVaCreateNestedList (0, | |
| 24 | XNPreeditStartCallback, &preedit_start_cb, | |
| 25 | XNPreeditDrawCallback, &preedit_draw_cb, | |
| 26 | XNPreeditCaretCallback, &preedit_caret_cb, | |
| 27 | XNPreeditDoneCallback, &preedit_done_cb, | |
| 28 | ! 0); | |
| 29 | ! XSetICValues (xxic, XNPreeditAttributes, preedit_attr, 0); | |
| 30 | XFree(preedit_attr); | |
| 31 | } | |
| 32 | ||
| 33 | --- 5520,5532 ---- | |
| 34 | preedit_caret_cb.callback = (XIMProc)preedit_caret_cbproc; | |
| 35 | preedit_done_cb.callback = (XIMProc)preedit_done_cbproc; | |
| 36 | preedit_attr | |
| 37 | ! = XVaCreateNestedList(0, | |
| 38 | XNPreeditStartCallback, &preedit_start_cb, | |
| 39 | XNPreeditDrawCallback, &preedit_draw_cb, | |
| 40 | XNPreeditCaretCallback, &preedit_caret_cb, | |
| 41 | XNPreeditDoneCallback, &preedit_done_cb, | |
| 42 | ! NULL); | |
| 43 | ! XSetICValues(xxic, XNPreeditAttributes, preedit_attr, NULL); | |
| 44 | XFree(preedit_attr); | |
| 45 | } | |
| 46 | ||
| 47 | *************** | |
| 48 | *** 5536,5542 **** | |
| 49 | { | |
| 50 | #ifdef USE_X11R6_XIM | |
| 51 | /* don't change the input context when we call reset */ | |
| 52 | ! XSetICValues(((GdkICPrivate*)ic)->xic, XNResetState, XIMPreserveState, 0); | |
| 53 | #endif | |
| 54 | } | |
| 55 | ||
| 56 | --- 5536,5543 ---- | |
| 57 | { | |
| 58 | #ifdef USE_X11R6_XIM | |
| 59 | /* don't change the input context when we call reset */ | |
| 60 | ! XSetICValues(((GdkICPrivate *)ic)->xic, XNResetState, XIMPreserveState, | |
| 61 | ! NULL); | |
| 62 | #endif | |
| 63 | } | |
| 64 | ||
| 65 | *** ../vim-7.1.310/src/version.c Wed Jun 4 19:36:56 2008 | |
| 66 | --- src/version.c Wed Jun 4 21:34:00 2008 | |
| 67 | *************** | |
| 68 | *** 668,669 **** | |
| 69 | --- 673,676 ---- | |
| 70 | { /* Add new patch number below this line */ | |
| 71 | + /**/ | |
| 72 | + 311, | |
| 73 | /**/ | |
| 74 | ||
| 75 | -- | |
| 76 | A radioactive cat has eighteen half-lives. | |
| 77 | ||
| 78 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 79 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 80 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 81 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |