mirror of
https://github.com/vim/vim.git
synced 2025-07-25 10:54:51 -04:00
patch 8.0.1382: get "no write since last change" message if terminal is open
Problem: Get "no write since last change" message if a terminal is open. (Fritz mehner) Solution: Don't consider a buffer changed if it's a terminal window.
This commit is contained in:
parent
620ca2da37
commit
f405c8fe85
@ -1482,7 +1482,7 @@ do_shell(
|
|||||||
#endif
|
#endif
|
||||||
&& msg_silent == 0)
|
&& msg_silent == 0)
|
||||||
FOR_ALL_BUFFERS(buf)
|
FOR_ALL_BUFFERS(buf)
|
||||||
if (bufIsChanged(buf))
|
if (bufIsChangedNotTerm(buf))
|
||||||
{
|
{
|
||||||
#ifdef FEAT_GUI_MSWIN
|
#ifdef FEAT_GUI_MSWIN
|
||||||
if (!winstart)
|
if (!winstart)
|
||||||
|
@ -25,6 +25,7 @@ void u_clearline(void);
|
|||||||
void u_undoline(void);
|
void u_undoline(void);
|
||||||
void u_blockfree(buf_T *buf);
|
void u_blockfree(buf_T *buf);
|
||||||
int bufIsChanged(buf_T *buf);
|
int bufIsChanged(buf_T *buf);
|
||||||
|
int bufIsChangedNotTerm(buf_T *buf);
|
||||||
int curbufIsChanged(void);
|
int curbufIsChanged(void);
|
||||||
void u_eval_tree(u_header_T *first_uhp, list_T *list);
|
void u_eval_tree(u_header_T *first_uhp, list_T *list);
|
||||||
/* vim: set ft=c : */
|
/* vim: set ft=c : */
|
||||||
|
11
src/undo.c
11
src/undo.c
@ -3523,6 +3523,8 @@ u_save_line(linenr_T lnum)
|
|||||||
* Check if the 'modified' flag is set, or 'ff' has changed (only need to
|
* Check if the 'modified' flag is set, or 'ff' has changed (only need to
|
||||||
* check the first character, because it can only be "dos", "unix" or "mac").
|
* check the first character, because it can only be "dos", "unix" or "mac").
|
||||||
* "nofile" and "scratch" type buffers are considered to always be unchanged.
|
* "nofile" and "scratch" type buffers are considered to always be unchanged.
|
||||||
|
* Also considers a buffer changed when a terminal window contains a running
|
||||||
|
* job.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
bufIsChanged(buf_T *buf)
|
bufIsChanged(buf_T *buf)
|
||||||
@ -3531,6 +3533,15 @@ bufIsChanged(buf_T *buf)
|
|||||||
if (term_job_running(buf->b_term))
|
if (term_job_running(buf->b_term))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
#endif
|
#endif
|
||||||
|
return bufIsChangedNotTerm(buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Like bufIsChanged() but ignoring a terminal window.
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
bufIsChangedNotTerm(buf_T *buf)
|
||||||
|
{
|
||||||
return !bt_dontwrite(buf)
|
return !bt_dontwrite(buf)
|
||||||
&& (buf->b_changed || file_ff_differs(buf, TRUE));
|
&& (buf->b_changed || file_ff_differs(buf, TRUE));
|
||||||
}
|
}
|
||||||
|
@ -771,6 +771,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1382,
|
||||||
/**/
|
/**/
|
||||||
1381,
|
1381,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user