mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 13:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

move changed

Browse Source
This commit is contained in:
Daniel Hahler
2019-06-09 15:42:21 +02:00
parent 2a421e52e4
commit a822b3e547
2 changed files with 36 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/nvim/change.c
View File

@@ -60,64 +60,45 @@ void change_warning(int col)
* *
* Careful: may trigger autocommands that reload the buffer. * Careful: may trigger autocommands that reload the buffer.
*/ */
void void changed(void)
changed(void)
{ {
#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
if (p_imst == IM_ON_THE_SPOT) if (!curbuf->b_changed) {
{ int save_msg_scroll = msg_scroll;
// The text of the preediting area is inserted, but this doesn't
// mean a change of the buffer yet. That is delayed until the // Give a warning about changing a read-only file. This may also
// text is committed. (this means preedit becomes empty) // check-out the file, thus change "curbuf"!
if (im_is_preediting() && !xim_changed_while_preediting) change_warning(0);
return;
xim_changed_while_preediting = FALSE; // Create a swap file if that is wanted.
// Don't do this for "nofile" and "nowrite" buffer types.
if (curbuf->b_may_swap
&& !bt_dontwrite(curbuf)
) {
int save_need_wait_return = need_wait_return;
need_wait_return = false;
ml_open_file(curbuf);
// The ml_open_file() can cause an ATTENTION message.
// Wait two seconds, to make sure the user reads this unexpected
// message. Since we could be anywhere, call wait_return() now,
// and don't let the emsg() set msg_scroll.
if (need_wait_return && emsg_silent == 0) {
ui_flush();
os_delay(2000L, true);
wait_return(TRUE);
msg_scroll = save_msg_scroll;
} else {
need_wait_return = save_need_wait_return;
}
} }
#endif changed_int();
}
buf_inc_changedtick(curbuf);
if (!curbuf->b_changed) // If a pattern is highlighted, the position may now be invalid.
{ highlight_match = false;
int save_msg_scroll = msg_scroll;
// Give a warning about changing a read-only file. This may also
// check-out the file, thus change "curbuf"!
change_warning(0);
// Create a swap file if that is wanted.
// Don't do this for "nofile" and "nowrite" buffer types.
if (curbuf->b_may_swap
#ifdef FEAT_QUICKFIX
&& !bt_dontwrite(curbuf)
#endif
)
{
int save_need_wait_return = need_wait_return;
need_wait_return = FALSE;
ml_open_file(curbuf);
// The ml_open_file() can cause an ATTENTION message.
// Wait two seconds, to make sure the user reads this unexpected
// message. Since we could be anywhere, call wait_return() now,
// and don't let the emsg() set msg_scroll.
if (need_wait_return && emsg_silent == 0)
{
out_flush();
ui_delay(2000L, TRUE);
wait_return(TRUE);
msg_scroll = save_msg_scroll;
}
else
need_wait_return = save_need_wait_return;
}
changed_internal();
}
++CHANGEDTICK(curbuf);
#ifdef FEAT_SEARCH_EXTRA
// If a pattern is highlighted, the position may now be invalid.
highlight_match = FALSE;
#endif
} }
/* /*

49
src/nvim/misc1.c
View File

@@ -1785,55 +1785,6 @@ int gchar_pos(pos_T *pos)
return utf_ptr2char(ml_get_pos(pos)); return utf_ptr2char(ml_get_pos(pos));
} }
/*
* Call this function when something in the current buffer is changed.
*
* Most often called through changed_bytes() and changed_lines(), which also
* mark the area of the display to be redrawn.
*
* Careful: may trigger autocommands that reload the buffer.
*/
void changed(void)
{
if (!curbuf->b_changed) {
int save_msg_scroll = msg_scroll;
/* Give a warning about changing a read-only file. This may also
* check-out the file, thus change "curbuf"! */
change_warning(0);
/* Create a swap file if that is wanted.
* Don't do this for "nofile" and "nowrite" buffer types. */
if (curbuf->b_may_swap
&& !bt_dontwrite(curbuf)
) {
int save_need_wait_return = need_wait_return;
need_wait_return = false;
ml_open_file(curbuf);
/* The ml_open_file() can cause an ATTENTION message.
* Wait two seconds, to make sure the user reads this unexpected
* message. Since we could be anywhere, call wait_return() now,
* and don't let the emsg() set msg_scroll. */
if (need_wait_return && emsg_silent == 0) {
ui_flush();
os_delay(2000L, true);
wait_return(TRUE);
msg_scroll = save_msg_scroll;
} else {
need_wait_return = save_need_wait_return;
}
}
changed_int();
}
buf_inc_changedtick(curbuf);
// If a pattern is highlighted, the position may now be invalid.
highlight_match = false;
}
/* /*
* Internal part of changed(), no user interaction. * Internal part of changed(), no user interaction.
*/ */