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.0164

Browse Source
This commit is contained in:
Bram Moolenaar 2005-12-07 20:54:59 +00:00
parent 241a8aaa48
commit e64ac77a28
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/buffer.c
View File

@ -660,16 +660,14 @@ goto_buffer(eap, start, dir, count)
int dir; int dir;
int count; int count;
{ {
# if defined(FEAT_WINDOWS) \ # if defined(FEAT_WINDOWS) && defined(HAS_SWAP_EXISTS_ACTION)
&& (defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG))
buf_T *old_curbuf = curbuf; buf_T *old_curbuf = curbuf;
swap_exists_action = SEA_DIALOG; swap_exists_action = SEA_DIALOG;
# endif # endif
(void)do_buffer(*eap->cmd == 's' ? DOBUF_SPLIT : DOBUF_GOTO, (void)do_buffer(*eap->cmd == 's' ? DOBUF_SPLIT : DOBUF_GOTO,
start, dir, count, eap->forceit); start, dir, count, eap->forceit);
# if defined(FEAT_WINDOWS) \ # if defined(FEAT_WINDOWS) && defined(HAS_SWAP_EXISTS_ACTION)
&& (defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG))
if (swap_exists_action == SEA_QUIT && *eap->cmd == 's') if (swap_exists_action == SEA_QUIT && *eap->cmd == 's')
{ {
# if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) # if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
@ -696,7 +694,7 @@ goto_buffer(eap, start, dir, count)
} }
#endif #endif
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) || defined(PROTO) #if defined(HAS_SWAP_EXISTS_ACTION) || defined(PROTO)
/* /*
* Handle the situation of swap_exists_action being set. * Handle the situation of swap_exists_action being set.
* It is allowed for "old_curbuf" to be NULL or invalid. * It is allowed for "old_curbuf" to be NULL or invalid.
@ -4376,20 +4374,20 @@ ex_buffer_all(eap)
continue; continue;
/* Open the buffer in this window. */ /* Open the buffer in this window. */
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) #if defined(HAS_SWAP_EXISTS_ACTION)
swap_exists_action = SEA_DIALOG; swap_exists_action = SEA_DIALOG;
#endif #endif
set_curbuf(buf, DOBUF_GOTO); set_curbuf(buf, DOBUF_GOTO);
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
if (!buf_valid(buf)) /* autocommands deleted the buffer!!! */ if (!buf_valid(buf)) /* autocommands deleted the buffer!!! */
{ {
# if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) #if defined(HAS_SWAP_EXISTS_ACTION)
swap_exists_action = SEA_NONE; swap_exists_action = SEA_NONE;
# endif # endif
break; break;
} }
#endif #endif
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) #if defined(HAS_SWAP_EXISTS_ACTION)
if (swap_exists_action == SEA_QUIT) if (swap_exists_action == SEA_QUIT)
{ {
# if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL) # if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)