projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 717fd8f6 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.094 | |
| 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.094 | |
| 11 | Problem: Can't compile with GTK and tiny features. | |
| 12 | Solution: Include handle_drop() and vim_chdirfile() when FEAT_DND is defined. | |
| 13 | Do not try to split the window. | |
| 14 | Files: src/ex_docmd.c, src/misc2.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.093/src/ex_docmd.c Fri Sep 12 19:56:26 2003 | |
| 18 | --- src/ex_docmd.c Sun Sep 7 14:26:29 2003 | |
| 19 | *************** | |
| 20 | *** 5656,5662 **** | |
| 21 | do_shell(NULL, 0); | |
| 22 | } | |
| 23 | ||
| 24 | ! #if (defined(FEAT_WINDOWS) && defined(HAVE_DROP_FILE)) || defined(PROTO) | |
| 25 | ||
| 26 | /* | |
| 27 | * Handle a file drop. The code is here because a drop is *nearly* like an | |
| 28 | --- 5656,5664 ---- | |
| 29 | do_shell(NULL, 0); | |
| 30 | } | |
| 31 | ||
| 32 | ! #if (defined(FEAT_WINDOWS) && defined(HAVE_DROP_FILE)) \ | |
| 33 | ! || (defined(FEAT_GUI_GTK) && defined(FEAT_DND)) \ | |
| 34 | ! || defined(PROTO) | |
| 35 | ||
| 36 | /* | |
| 37 | * Handle a file drop. The code is here because a drop is *nearly* like an | |
| 38 | *************** | |
| 39 | *** 5702,5717 **** | |
| 40 | } | |
| 41 | if (split) | |
| 42 | { | |
| 43 | if (win_split(0, 0) == FAIL) | |
| 44 | return; | |
| 45 | ! # ifdef FEAT_SCROLLBIND | |
| 46 | curwin->w_p_scb = FALSE; | |
| 47 | ! # endif | |
| 48 | ||
| 49 | /* When splitting the window, create a new alist. Otherwise the | |
| 50 | * existing one is overwritten. */ | |
| 51 | alist_unlink(curwin->w_alist); | |
| 52 | alist_new(); | |
| 53 | } | |
| 54 | ||
| 55 | /* | |
| 56 | --- 5704,5723 ---- | |
| 57 | } | |
| 58 | if (split) | |
| 59 | { | |
| 60 | + # ifdef FEAT_WINDOWS | |
| 61 | if (win_split(0, 0) == FAIL) | |
| 62 | return; | |
| 63 | ! # ifdef FEAT_SCROLLBIND | |
| 64 | curwin->w_p_scb = FALSE; | |
| 65 | ! # endif | |
| 66 | ||
| 67 | /* When splitting the window, create a new alist. Otherwise the | |
| 68 | * existing one is overwritten. */ | |
| 69 | alist_unlink(curwin->w_alist); | |
| 70 | alist_new(); | |
| 71 | + # else | |
| 72 | + return; /* can't split, always fail */ | |
| 73 | + # endif | |
| 74 | } | |
| 75 | ||
| 76 | /* | |
| 77 | *** ../vim-6.2.093/src/misc2.c Sun May 25 20:28:57 2003 | |
| 78 | --- src/misc2.c Sun Sep 7 23:25:58 2003 | |
| 79 | *************** | |
| 80 | *** 2639,2645 **** | |
| 81 | } | |
| 82 | ||
| 83 | #if defined(FEAT_SESSION) || defined(MSWIN) \ | |
| 84 | ! || (defined(FEAT_GUI_GTK) && defined(FEAT_WINDOWS)) \ | |
| 85 | || defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG) \ | |
| 86 | || defined(PROTO) | |
| 87 | /* | |
| 88 | --- 2639,2646 ---- | |
| 89 | } | |
| 90 | ||
| 91 | #if defined(FEAT_SESSION) || defined(MSWIN) \ | |
| 92 | ! || (defined(FEAT_GUI_GTK) \ | |
| 93 | ! && (defined(FEAT_WINDOWS) || defined(FEAT_DND))) \ | |
| 94 | || defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG) \ | |
| 95 | || defined(PROTO) | |
| 96 | /* | |
| 97 | *** ../vim-6.2.093/src/version.c Fri Sep 12 20:13:48 2003 | |
| 98 | --- src/version.c Fri Sep 12 20:16:07 2003 | |
| 99 | *************** | |
| 100 | *** 632,633 **** | |
| 101 | --- 632,635 ---- | |
| 102 | { /* Add new patch number below this line */ | |
| 103 | + /**/ | |
| 104 | + 94, | |
| 105 | /**/ | |
| 106 | ||
| 107 | -- | |
| 108 | "I love deadlines. I especially like the whooshing sound they | |
| 109 | make as they go flying by." | |
| 110 | -- Douglas Adams | |
| 111 | ||
| 112 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 113 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 114 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 115 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |