projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 47612863 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.015 | |
| 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.015 | |
| 11 | Problem: The +xsmp feature is never enabled. | |
| 12 | Solution: Move the #define for USE_XSMP to below where WANT_X11 is defined. | |
| 13 | (Alexey Froloff) | |
| 14 | Files: src/feature.h | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.014/src/feature.h Sun May 25 19:44:49 2003 | |
| 18 | --- src/feature.h Wed Jun 4 21:14:43 2003 | |
| 19 | *************** | |
| 20 | *** 606,626 **** | |
| 21 | #endif | |
| 22 | ||
| 23 | /* | |
| 24 | - * XSMP - X11 Session Management Protocol | |
| 25 | - * It may be preferred to disable this if the GUI supports it (e.g., GNOME/KDE) | |
| 26 | - * and implement save-yourself etc. through that, but it may also be cleaner to | |
| 27 | - * have all SM-aware vims do the same thing (libSM does not depend upon X11). | |
| 28 | - * If your GUI wants to support SM itself, change this ifdef. | |
| 29 | - * I'm assuming that any X11 implementation will cope with this for now. | |
| 30 | - */ | |
| 31 | - #if defined(HAVE_X11) && defined(WANT_X11) && defined(HAVE_X11_SM_SMLIB_H) | |
| 32 | - # define USE_XSMP | |
| 33 | - #endif | |
| 34 | - #if defined(USE_XSMP_INTERACT) && !defined(USE_XSMP) | |
| 35 | - # undef USE_XSMP_INTERACT | |
| 36 | - #endif | |
| 37 | - | |
| 38 | - /* | |
| 39 | * +xim X Input Method. For entering special languages like | |
| 40 | * chinese and Japanese. | |
| 41 | * +hangul_input Internal Hangul input method. Must be included | |
| 42 | --- 606,611 ---- | |
| 43 | *************** | |
| 44 | *** 946,951 **** | |
| 45 | --- 931,952 ---- | |
| 46 | */ | |
| 47 | #if defined(FEAT_NORMAL) || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) | |
| 48 | # define WANT_X11 | |
| 49 | + #endif | |
| 50 | + | |
| 51 | + /* | |
| 52 | + * XSMP - X11 Session Management Protocol | |
| 53 | + * It may be preferred to disable this if the GUI supports it (e.g., | |
| 54 | + * GNOME/KDE) and implement save-yourself etc. through that, but it may also | |
| 55 | + * be cleaner to have all SM-aware vims do the same thing (libSM does not | |
| 56 | + * depend upon X11). | |
| 57 | + * If your GUI wants to support SM itself, change this ifdef. | |
| 58 | + * I'm assuming that any X11 implementation will cope with this for now. | |
| 59 | + */ | |
| 60 | + #if defined(HAVE_X11) && defined(WANT_X11) && defined(HAVE_X11_SM_SMLIB_H) | |
| 61 | + # define USE_XSMP | |
| 62 | + #endif | |
| 63 | + #if defined(USE_XSMP_INTERACT) && !defined(USE_XSMP) | |
| 64 | + # undef USE_XSMP_INTERACT | |
| 65 | #endif | |
| 66 | ||
| 67 | /* | |
| 68 | *** ../vim-6.2.014/src/version.c Thu Jun 5 12:24:08 2003 | |
| 69 | --- src/version.c Mon Jun 30 22:17:00 2003 | |
| 70 | *************** | |
| 71 | *** 632,633 **** | |
| 72 | --- 632,635 ---- | |
| 73 | { /* Add new patch number below this line */ | |
| 74 | + /**/ | |
| 75 | + 15, | |
| 76 | /**/ | |
| 77 | ||
| 78 | -- | |
| 79 | hundred-and-one symptoms of being an internet addict: | |
| 80 | 263. You have more e-mail addresses than shorts. | |
| 81 | ||
| 82 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 83 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 84 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 85 | \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html /// |