projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 717fd8f6 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.098 | |
| 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.098 (after 6.2.097) | |
| 11 | Problem: Can't build Vim with tiny features. (Christian J. Robinson) | |
| 12 | Solution: Declare stop_insert_mode always. | |
| 13 | Files: src/edit.c, src/globals.h | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.2.097/src/edit.c Sun Jul 27 15:06:48 2003 | |
| 17 | --- src/edit.c Sat Sep 13 13:43:36 2003 | |
| 18 | *************** | |
| 19 | *** 335,343 **** | |
| 20 | else | |
| 21 | State = INSERT; | |
| 22 | ||
| 23 | - #ifdef FEAT_EX_EXTRA | |
| 24 | stop_insert_mode = FALSE; | |
| 25 | - #endif | |
| 26 | ||
| 27 | /* | |
| 28 | * Need to recompute the cursor position, it might move when the cursor is | |
| 29 | --- 335,341 ---- | |
| 30 | *************** | |
| 31 | *** 494,507 **** | |
| 32 | if (arrow_used) /* don't repeat insert when arrow key used */ | |
| 33 | count = 0; | |
| 34 | ||
| 35 | - #ifdef FEAT_EX_EXTRA | |
| 36 | if (stop_insert_mode) | |
| 37 | { | |
| 38 | ! /* ":stopinsert" used */ | |
| 39 | count = 0; | |
| 40 | goto doESCkey; | |
| 41 | } | |
| 42 | - #endif | |
| 43 | ||
| 44 | /* set curwin->w_curswant for next K_DOWN or K_UP */ | |
| 45 | if (!arrow_used) | |
| 46 | --- 492,503 ---- | |
| 47 | if (arrow_used) /* don't repeat insert when arrow key used */ | |
| 48 | count = 0; | |
| 49 | ||
| 50 | if (stop_insert_mode) | |
| 51 | { | |
| 52 | ! /* ":stopinsert" used or 'insertmode' reset */ | |
| 53 | count = 0; | |
| 54 | goto doESCkey; | |
| 55 | } | |
| 56 | ||
| 57 | /* set curwin->w_curswant for next K_DOWN or K_UP */ | |
| 58 | if (!arrow_used) | |
| 59 | *** ../vim-6.2.097/src/globals.h Thu Sep 11 21:11:22 2003 | |
| 60 | --- src/globals.h Sat Sep 13 13:44:02 2003 | |
| 61 | *************** | |
| 62 | *** 814,821 **** | |
| 63 | ; | |
| 64 | #ifdef FEAT_EX_EXTRA | |
| 65 | EXTERN int ex_normal_busy INIT(= 0); /* recursivenes of ex_normal() */ | |
| 66 | - EXTERN int stop_insert_mode; /* for ":stopinsert" */ | |
| 67 | #endif | |
| 68 | ||
| 69 | EXTERN int KeyTyped; /* TRUE if user typed current char */ | |
| 70 | EXTERN int KeyStuffed; /* TRUE if current char from stuffbuf */ | |
| 71 | --- 814,821 ---- | |
| 72 | ; | |
| 73 | #ifdef FEAT_EX_EXTRA | |
| 74 | EXTERN int ex_normal_busy INIT(= 0); /* recursivenes of ex_normal() */ | |
| 75 | #endif | |
| 76 | + EXTERN int stop_insert_mode; /* for ":stopinsert" and 'insertmode' */ | |
| 77 | ||
| 78 | EXTERN int KeyTyped; /* TRUE if user typed current char */ | |
| 79 | EXTERN int KeyStuffed; /* TRUE if current char from stuffbuf */ | |
| 80 | *** ../vim-6.2.097/src/version.c Fri Sep 12 20:56:50 2003 | |
| 81 | --- src/version.c Sat Sep 13 21:13:01 2003 | |
| 82 | *************** | |
| 83 | *** 632,633 **** | |
| 84 | --- 638,641 ---- | |
| 85 | { /* Add new patch number below this line */ | |
| 86 | + /**/ | |
| 87 | + 98, | |
| 88 | /**/ | |
| 89 | ||
| 90 | -- | |
| 91 | Any resemblance between the above views and those of my employer, my terminal, | |
| 92 | or the view out my window are purely coincidental. Any resemblance between | |
| 93 | the above and my own views is non-deterministic. The question of the | |
| 94 | existence of views in the absence of anyone to hold them is left as an | |
| 95 | exercise for the reader. The question of the existence of the reader is left | |
| 96 | as an exercise for the second god coefficient. (A discussion of | |
| 97 | non-orthogonal, non-integral polytheism is beyond the scope of this article.) | |
| 98 | (Ralph Jennings) | |
| 99 | ||
| 100 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 101 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 102 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 103 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |