projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d034a75d AG |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.385 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.385 | |
| 11 | Problem: When using an expression mapping on the command line the cursor | |
| 12 | ends up in the wrong place. (Yasuhiro Matsumoto) | |
| 13 | Solution: Save and restore msg_col and msg_row when evaluating the | |
| 14 | expression. | |
| 15 | Files: src/getchar. | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.3.384/src/getchar.c 2011-10-12 22:02:07.000000000 +0200 | |
| 19 | --- src/getchar.c 2011-12-14 18:37:52.000000000 +0100 | |
| 20 | *************** | |
| 21 | *** 4510,4515 **** | |
| 22 | --- 4510,4517 ---- | |
| 23 | char_u *expr; | |
| 24 | char_u *save_cmd; | |
| 25 | pos_T save_cursor; | |
| 26 | + int save_msg_col; | |
| 27 | + int save_msg_row; | |
| 28 | ||
| 29 | /* Remove escaping of CSI, because "str" is in a format to be used as | |
| 30 | * typeahead. */ | |
| 31 | *************** | |
| 32 | *** 4533,4544 **** | |
| 33 | --- 4535,4550 ---- | |
| 34 | #endif | |
| 35 | set_vim_var_char(c); /* set v:char to the typed character */ | |
| 36 | save_cursor = curwin->w_cursor; | |
| 37 | + save_msg_col = msg_col; | |
| 38 | + save_msg_row = msg_row; | |
| 39 | p = eval_to_string(expr, NULL, FALSE); | |
| 40 | --textlock; | |
| 41 | #ifdef FEAT_EX_EXTRA | |
| 42 | --ex_normal_lock; | |
| 43 | #endif | |
| 44 | curwin->w_cursor = save_cursor; | |
| 45 | + msg_col = save_msg_col; | |
| 46 | + msg_row = save_msg_row; | |
| 47 | ||
| 48 | restore_cmdline_alloc(save_cmd); | |
| 49 | vim_free(expr); | |
| 50 | *** ../vim-7.3.384/src/version.c 2011-12-23 13:14:58.000000000 +0100 | |
| 51 | --- src/version.c 2011-12-23 14:53:23.000000000 +0100 | |
| 52 | *************** | |
| 53 | *** 716,717 **** | |
| 54 | --- 716,719 ---- | |
| 55 | { /* Add new patch number below this line */ | |
| 56 | + /**/ | |
| 57 | + 385, | |
| 58 | /**/ | |
| 59 | ||
| 60 | -- | |
| 61 | `When any government, or any church for that matter, undertakes to say to | |
| 62 | its subjects, "This you may not read, this you must not see, this you are | |
| 63 | forbidden to know," the end result is tyranny and oppression no matter how | |
| 64 | holy the motives' -- Robert A Heinlein, "If this goes on --" | |
| 65 | ||
| 66 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 67 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 68 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 69 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |