Merge remote-tracking branch 'vim/master'

splhack · splhack · commit 4da4a082584a · 2017-08-17T19:45:07.000-07:00
diff --git a/src/buffer.c b/src/buffer.c
@@ -473,8 +473,8 @@ close_buffer(
     {
 	if (term_job_running(buf->b_term))
 	{
-	    if (wipe_buf)
-		/* Wiping out a terminal buffer kills the job. */
+	    if (wipe_buf || unload_buf)
+		/* Wiping out or unloading a terminal buffer kills the job. */
 		free_terminal(buf);
 	    else
 	    {
@@ -1652,7 +1652,7 @@ do_buffer(
 	if (bufIsChanged(curbuf))
 #endif
 	{
-	    EMSG(_(e_nowrtmsg));
+	    no_write_message();
 	    return FAIL;
 	}
     }
@@ -1901,6 +1901,28 @@ do_autochdir(void)
 }
 #endif
 
+    void
+no_write_message(void)
+{
+#ifdef FEAT_TERMINAL
+    if (term_job_running(curbuf->b_term))
+	EMSG(_("E948: Job still running (add ! to end the job)"));
+    else
+#endif
+	EMSG(_("E37: No write since last change (add ! to override)"));
+}
+
+    void
+no_write_message_nobang(void)
+{
+#ifdef FEAT_TERMINAL
+    if (term_job_running(curbuf->b_term))
+	EMSG(_("E948: Job still running"));
+    else
+#endif
+	EMSG(_("E37: No write since last change"));
+}
+
 /*
  * functions for dealing with the buffer list
  */
diff --git a/src/evalfunc.c b/src/evalfunc.c
@@ -5942,7 +5942,7 @@ f_has(typval_T *argvars, typval_T *rettv)
 #ifdef FEAT_TERMGUICOLORS
 	"termguicolors",
 #endif
-#ifdef FEAT_TERMINAL
+#if defined(FEAT_TERMINAL) && !defined(WIN3264)
 	"terminal",
 #endif
 #ifdef TERMINFO
@@ -6152,6 +6152,10 @@ f_has(typval_T *argvars, typval_T *rettv)
 #ifdef FEAT_NETBEANS_INTG
 	else if (STRICMP(name, "netbeans_enabled") == 0)
 	    n = netbeans_active();
+#endif
+#if defined(FEAT_TERMINAL) && defined(WIN3264)
+	else if (STRICMP(name, "terminal") == 0)
+	    n = terminal_enabled();
 #endif
     }
 
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
@@ -3572,7 +3572,7 @@ getfile(
 	{
 	    if (other)
 		--no_wait_return;
-	    EMSG(_(e_nowrtmsg));
+	    no_write_message();
 	    retval = GETFILE_NOT_WRITTEN;	/* file has been changed */
 	    goto theend;
 	}
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
@@ -1934,9 +1934,9 @@ check_changed(buf_T *buf, int flags)
 	}
 #endif
 	if (flags & CCGD_EXCMD)
-	    EMSG(_(e_nowrtmsg));
+	    no_write_message();
 	else
-	    EMSG(_(e_nowrtmsg_nobang));
+	    no_write_message_nobang();
 	return TRUE;
     }
     return FALSE;
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
@@ -7485,7 +7485,7 @@ ex_win_close(
 	else
 # endif
 	{
-	    EMSG(_(e_nowrtmsg));
+	    no_write_message();
 	    return;
 	}
     }
diff --git a/src/globals.h b/src/globals.h
@@ -1520,8 +1520,6 @@ EXTERN char_u e_notcreate[]	INIT(= N_("E482: Can't create file %s"));
 EXTERN char_u e_notmp[]		INIT(= N_("E483: Can't get temp file name"));
 EXTERN char_u e_notopen[]	INIT(= N_("E484: Can't open file %s"));
 EXTERN char_u e_notread[]	INIT(= N_("E485: Can't read file %s"));
-EXTERN char_u e_nowrtmsg[]	INIT(= N_("E37: No write since last change (add ! to override)"));
-EXTERN char_u e_nowrtmsg_nobang[]   INIT(= N_("E37: No write since last change"));
 EXTERN char_u e_null[]		INIT(= N_("E38: Null argument"));
 #if defined(FEAT_DIGRAPHS) || defined(FEAT_TIMERS)
 EXTERN char_u e_number_exp[]	INIT(= N_("E39: Number expected"));
diff --git a/src/main.c b/src/main.c
@@ -3681,36 +3681,35 @@ set_progpath(char_u *argv0)
 {
     char_u *val = argv0;
 
-# ifdef PROC_EXE_LINK
-    char    buf[MAXPATHL + 1];
-    ssize_t len;
-
-    len = readlink(PROC_EXE_LINK, buf, MAXPATHL);
-    if (len > 0)
-    {
-	buf[len] = NUL;
-	val = (char_u *)buf;
-    }
-# else
+# if defined(WIN32)
     /* A relative path containing a "/" will become invalid when using ":cd",
      * turn it into a full path.
      * On MS-Windows "vim" should be expanded to "vim.exe", thus always do
      * this. */
-#  ifdef WIN32
     char_u *path = NULL;
 
     if (mch_can_exe(argv0, &path, FALSE) && path != NULL)
 	val = path;
-#  else
-    char_u buf[MAXPATHL];
+# else
+    char_u	buf[MAXPATHL + 1];
+#  ifdef PROC_EXE_LINK
+    char	linkbuf[MAXPATHL + 1];
+    ssize_t	len;
 
-    if (!mch_isFullName(argv0))
+    len = readlink(PROC_EXE_LINK, linkbuf, MAXPATHL);
+    if (len > 0)
     {
-	if (gettail(argv0) != argv0
-			   && vim_FullName(argv0, buf, MAXPATHL, TRUE) != FAIL)
-	    val = buf;
+	linkbuf[len] = NUL;
+	val = (char_u *)linkbuf;
     }
 #  endif
+
+    if (!mch_isFullName(val))
+    {
+	if (gettail(val) != val
+			   && vim_FullName(val, buf, MAXPATHL, TRUE) != FAIL)
+	    val = buf;
+    }
 # endif
 
     set_vim_var_string(VV_PROGPATH, val, -1);
diff --git a/src/message.c b/src/message.c
@@ -2317,7 +2317,7 @@ msg_scroll_up(void)
 	gui_undraw_cursor();
 #endif
     /* scrolling up always works */
-    screen_del_lines(0, 0, 1, (int)Rows, TRUE, NULL);
+    screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL);
 
     if (!can_clear((char_u *)" "))
     {
@@ -2909,7 +2909,7 @@ do_more_prompt(int typed_char)
 		    }
 
 		    if (toscroll == -1 && screen_ins_lines(0, 0, 1,
-						       (int)Rows, NULL) == OK)
+						     (int)Rows, 0, NULL) == OK)
 		    {
 			/* display line at top */
 			(void)disp_sb_line(0, mp);
diff --git a/src/move.c b/src/move.c
@@ -1192,7 +1192,7 @@ curs_columns(
 	if (extra > 0)
 	    win_ins_lines(curwin, 0, extra, FALSE, FALSE);
 	else if (extra < 0)
-	    win_del_lines(curwin, 0, -extra, FALSE, FALSE);
+	    win_del_lines(curwin, 0, -extra, FALSE, FALSE, 0);
     }
     else
 	curwin->w_skipcol = 0;
diff --git a/src/option.c b/src/option.c
@@ -3196,7 +3196,7 @@ static struct vimoption options[] =
 #endif
 			    {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
     {"winptydll", NULL,	    P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
-#if defined(WIN3264) && defined(TERMINAL)
+#if defined(WIN3264) && defined(FEAT_TERMINAL)
 			    (char_u *)&p_winptydll, PV_NONE, {
 # ifdef _WIN64
 			    (char_u *)"winpty64.dll",
diff --git a/src/option.h b/src/option.h
@@ -989,7 +989,7 @@ EXTERN long	p_wmh;		/* 'winminheight' */
 EXTERN long	p_wmw;		/* 'winminwidth' */
 EXTERN long	p_wiw;		/* 'winwidth' */
 #endif
-#if defined(WIN3264) && defined(TERMINAL)
+#if defined(WIN3264) && defined(FEAT_TERMINAL)
 EXTERN char_u	*p_winptydll;	/* 'winptydll' */
 #endif
 EXTERN int	p_ws;		/* 'wrapscan' */
diff --git a/src/os_win32.c b/src/os_win32.c
@@ -5072,7 +5072,7 @@ make_job_env(garray_T *gap, dict_T *env)
 	    --todo;
 	    if (wkey != NULL && wval != NULL)
 	    {
-		int	n;
+		size_t	n;
 		size_t	lkey = wcslen(wkey);
 		size_t	lval = wcslen(wval);
 
diff --git a/src/proto/buffer.pro b/src/proto/buffer.pro
@@ -13,6 +13,8 @@ int do_buffer(int action, int start, int dir, int count, int forceit);
 void set_curbuf(buf_T *buf, int action);
 void enter_buffer(buf_T *buf);
 void do_autochdir(void);
+void no_write_message(void);
+void no_write_message_nobang(void);
 buf_T *buflist_new(char_u *ffname, char_u *sfname, linenr_T lnum, int flags);
 void free_buf_options(buf_T *buf, int free_p_ff);
 int buflist_getfile(int n, linenr_T lnum, int options, int forceit);
diff --git a/src/proto/screen.pro b/src/proto/screen.pro
@@ -45,9 +45,9 @@ void screen_start(void);
 void windgoto(int row, int col);
 void setcursor(void);
 int win_ins_lines(win_T *wp, int row, int line_count, int invalid, int mayclear);
-int win_del_lines(win_T *wp, int row, int line_count, int invalid, int mayclear);
-int screen_ins_lines(int off, int row, int line_count, int end, win_T *wp);
-int screen_del_lines(int off, int row, int line_count, int end, int force, win_T *wp);
+int win_del_lines(win_T *wp, int row, int line_count, int invalid, int mayclear, int clear_attr);
+int screen_ins_lines(int off, int row, int line_count, int end, int clear_attr, win_T *wp);
+int screen_del_lines(int off, int row, int line_count, int end, int force, int attr, win_T *wp);
 int showmode(void);
 void unshowmode(int force);
 void clearmode(void);
diff --git a/src/proto/terminal.pro b/src/proto/terminal.pro
@@ -34,4 +34,5 @@ void f_term_scrape(typval_T *argvars, typval_T *rettv);
 void f_term_sendkeys(typval_T *argvars, typval_T *rettv);
 void f_term_start(typval_T *argvars, typval_T *rettv);
 void f_term_wait(typval_T *argvars, typval_T *rettv);
+int terminal_enabled(void);
 /* vim: set ft=c : */
diff --git a/src/quickfix.c b/src/quickfix.c
@@ -2327,7 +2327,7 @@ qf_jump(
 	     * set b_p_ro flag). */
 	    if (!can_abandon(curbuf, forceit))
 	    {
-		EMSG(_(e_nowrtmsg));
+		no_write_message();
 		ok = FALSE;
 	    }
 	    else
diff --git a/src/screen.c b/src/screen.c
diff --git a/src/terminal.c b/src/terminal.c
diff --git a/src/testdir/test_stat.vim b/src/testdir/test_stat.vim
diff --git a/src/version.c b/src/version.c

Original file line number	Diff line number	Diff line change
`@@ -3572,7 +3572,7 @@ getfile(`
`3572`	`3572`	`{`
`3573`	`3573`	`if (other)`
`3574`	`3574`	`--no_wait_return;`
`3575`		`- EMSG(_(e_nowrtmsg));`
	`3575`	`+ no_write_message();`
`3576`	`3576`	`retval = GETFILE_NOT_WRITTEN; /* file has been changed */`
`3577`	`3577`	`goto theend;`
`3578`	`3578`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1934,9 +1934,9 @@ check_changed(buf_T *buf, int flags)`
`1934`	`1934`	`}`
`1935`	`1935`	`#endif`
`1936`	`1936`	`if (flags & CCGD_EXCMD)`
`1937`		`- EMSG(_(e_nowrtmsg));`
	`1937`	`+ no_write_message();`
`1938`	`1938`	`else`
`1939`		`- EMSG(_(e_nowrtmsg_nobang));`
	`1939`	`+ no_write_message_nobang();`
`1940`	`1940`	`return TRUE;`
`1941`	`1941`	`}`
`1942`	`1942`	`return FALSE;`
Original file line number	Diff line number	Diff line change
`@@ -7485,7 +7485,7 @@ ex_win_close(`
`7485`	`7485`	`else`
`7486`	`7486`	`# endif`
`7487`	`7487`	`{`
`7488`		`- EMSG(_(e_nowrtmsg));`
	`7488`	`+ no_write_message();`
`7489`	`7489`	`return;`
`7490`	`7490`	`}`
`7491`	`7491`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2317,7 +2317,7 @@ msg_scroll_up(void)`
`2317`	`2317`	`gui_undraw_cursor();`
`2318`	`2318`	`#endif`
`2319`	`2319`	`/* scrolling up always works */`
`2320`		`- screen_del_lines(0, 0, 1, (int)Rows, TRUE, NULL);`
	`2320`	`+ screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL);`
`2321`	`2321`
`2322`	`2322`	`if (!can_clear((char_u *)" "))`
`2323`	`2323`	`{`
`@@ -2909,7 +2909,7 @@ do_more_prompt(int typed_char)`
`2909`	`2909`	`}`
`2910`	`2910`
`2911`	`2911`	`if (toscroll == -1 && screen_ins_lines(0, 0, 1,`
`2912`		`- (int)Rows, NULL) == OK)`
	`2912`	`+ (int)Rows, 0, NULL) == OK)`
`2913`	`2913`	`{`
`2914`	`2914`	`/* display line at top */`
`2915`	`2915`	`(void)disp_sb_line(0, mp);`
Original file line number	Diff line number	Diff line change
`@@ -1192,7 +1192,7 @@ curs_columns(`
`1192`	`1192`	`if (extra > 0)`
`1193`	`1193`	`win_ins_lines(curwin, 0, extra, FALSE, FALSE);`
`1194`	`1194`	`else if (extra < 0)`
`1195`		`- win_del_lines(curwin, 0, -extra, FALSE, FALSE);`
	`1195`	`+ win_del_lines(curwin, 0, -extra, FALSE, FALSE, 0);`
`1196`	`1196`	`}`
`1197`	`1197`	`else`
`1198`	`1198`	`curwin->w_skipcol = 0;`