aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.0058

Browse Source
This commit is contained in:
Bram Moolenaar 2005-03-08 22:40:03 +00:00
parent 9be038da7d
commit 111ff9f40e
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/diff.txt
View File

@ -1,4 +1,4 @@
*diff.txt* For Vim version 7.0aa. Last change: 2004 Jul 20 *diff.txt* For Vim version 7.0aa. Last change: 2005 Mar 08
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -157,8 +157,8 @@ original file and diff with that. For example: >
A buffer that is unloaded cannot be used for the diff. But it does work for A buffer that is unloaded cannot be used for the diff. But it does work for
hidden buffers. You can use ":hide" to close a window without unloading the hidden buffers. You can use ":hide" to close a window without unloading the
buffer. buffer. If you don't want a buffer to remain used for the diff do ":set
nodiff" before hiding it.
*:diffu* *:diffupdate* *:diffu* *:diffupdate*
Vim attempts to keep the differences updated when you make changes to the Vim attempts to keep the differences updated when you make changes to the

14
src/ex_getln.c
View File

@ -172,6 +172,12 @@ getcmdline(firstc, count, indent)
#endif #endif
expand_T xpc; expand_T xpc;
long *b_im_ptr = NULL; long *b_im_ptr = NULL;
#if defined(FEAT_WILDMENU) || defined(FEAT_EVAL) || defined(FEAT_SEARCH_EXTRA)
/* Everything that may work recursively should save and restore the
* current command line in save_ccline. That includes update_screen(), a
* custom status line may invoke ":normal". */
struct cmdline_info save_ccline;
#endif
#ifdef FEAT_SNIFF #ifdef FEAT_SNIFF
want_sniff_request = 0; want_sniff_request = 0;
@ -423,7 +429,9 @@ getcmdline(firstc, count, indent)
p_ls = save_p_ls; p_ls = save_p_ls;
p_wmh = save_p_wmh; p_wmh = save_p_wmh;
last_status(FALSE); last_status(FALSE);
save_cmdline(&save_ccline);
update_screen(VALID); /* redraw the screen NOW */ update_screen(VALID); /* redraw the screen NOW */
restore_cmdline(&save_ccline);
redrawcmd(); redrawcmd();
save_p_ls = -1; save_p_ls = -1;
} }
@ -613,7 +621,6 @@ getcmdline(firstc, count, indent)
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
else if (c == 'e') else if (c == 'e')
{ {
struct cmdline_info save_ccline;
char_u *p = NULL; char_u *p = NULL;
/* /*
@ -1061,8 +1068,6 @@ getcmdline(firstc, count, indent)
new_cmdpos = -1; new_cmdpos = -1;
if (c == '=') if (c == '=')
{ {
struct cmdline_info save_ccline;
if (ccline.cmdfirstc == '=')/* can't do this recursively */ if (ccline.cmdfirstc == '=')/* can't do this recursively */
{ {
beep_flush(); beep_flush();
@ -1665,7 +1670,10 @@ cmdline_changed:
} }
validate_cursor(); validate_cursor();
save_cmdline(&save_ccline);
update_screen(NOT_VALID); update_screen(NOT_VALID);
restore_cmdline(&save_ccline);
msg_starthere(); msg_starthere();
redrawcmdline(); redrawcmdline();
did_incsearch = TRUE; did_incsearch = TRUE;

4
src/regexp.c
View File

@ -3516,7 +3516,7 @@ reg_prev_class()
static long bl_minval; static long bl_minval;
static long bl_maxval; static long bl_maxval;
/* Values for rs_state. */ /* Values for rs_state in regitem_T. */
typedef enum regstate_E typedef enum regstate_E
{ {
RS_NOPEN = 0 /* NOPEN and NCLOSE */ RS_NOPEN = 0 /* NOPEN and NCLOSE */
@ -3545,7 +3545,7 @@ typedef enum regstate_E
*/ */
typedef struct regitem_S typedef struct regitem_S
{ {
regstate_T rs_state; /* what we are doing, on of RS_ below */ regstate_T rs_state; /* what we are doing, one of RS_ above */
char_u *rs_scan; /* current node in program */ char_u *rs_scan; /* current node in program */
long rs_startp; /* start position for BACK (offset) */ long rs_startp; /* start position for BACK (offset) */
union union

4
src/version.h
View File

@ -36,5 +36,5 @@
#define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_NODOT "vim70aa"
#define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_SHORT "7.0aa"
#define VIM_VERSION_MEDIUM "7.0aa ALPHA" #define VIM_VERSION_MEDIUM "7.0aa ALPHA"
#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 7)" #define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 8)"
#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 7, compiled " #define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 8, compiled "