Merge remote-tracking branch 'vim/master'

splhack · splhack · commit e44348c5c96e · 2018-02-03T10:10:42.000-08:00
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
@@ -295,6 +295,8 @@ Name			triggered by ~
 |FileChangedShellPost|	After handling a file changed since editing started
 |FileChangedRO|		before making the first change to a read-only file
 
+|DirChanged|		after the working directory has changed
+
 |ShellCmdPost|		after executing a shell command
 |ShellFilterPost|	after filtering with a shell command
 
@@ -633,6 +635,16 @@ FileChangedRO			Before making the first change to a read-only
 							*E881*
 				If the number of lines changes saving for undo
 				may fail and the change will be aborted.
+							*DirChanged*
+DirChanged			The working directory has changed in response
+				to the |:cd| or |:lcd| commands, or as a
+				result of the 'autochdir' option.
+				The pattern can be:
+					"window" to trigger on `:lcd
+					"global" to trigger on `:cd`
+					"auto"   to trigger on 'autochdir'.
+					"drop"	 to trigger on editing a file
+				<afile> is set to the new directory name.
 							*FileChangedShell*
 FileChangedShell		When Vim notices that the modification time of
 				a file has changed since editing started.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
@@ -6791,14 +6791,21 @@ A jump table for the options with a short description can be found at |Q_op|.
 	It is allowed to give an argument to the command, e.g.  "csh -f".
 	See |option-backslash| about including spaces and backslashes.
 	Environment variables are expanded |:set_env|.
+
 	If the name of the shell contains a space, you might need to enclose
-	it in quotes.  Example: >
+	it in quotes or escape the space.  Example with quotes: >
 		:set shell=\"c:\program\ files\unix\sh.exe\"\ -f
 <	Note the backslash before each quote (to avoid starting a comment) and
 	each space (to avoid ending the option value).  Also note that the
 	"-f" is not inside the quotes, because it is not part of the command
-	name.  And Vim automagically recognizes the backslashes that are path
+	name.  Vim automagically recognizes the backslashes that are path
 	separators.
+	Example with escaped space (Vim will do this when initializing the
+	option from $SHELL): >
+		:set shell=/bin/with\\\ space/sh
+<	The resulting value of 'shell' is  "/bin/with\ space/sh", two
+	backslashes are consumed by `:set`.
+
 	Under MS-Windows, when the executable ends in ".com" it must be
 	included.  Thus setting the shell to "command.com" or "4dos.com"
 	works, but "command" and "4dos" do not work for all commands (e.g.,
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types in scripts
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2017 Nov 11
+" Last change:	2018 Feb 03
 
 " This file is called by an autocommand for every file that has just been
 " loaded into a buffer.  It checks if the type of file can be recognized by
@@ -104,6 +104,10 @@ if s:line1 =~# "^#!"
   elseif s:name =~# '^pike\%(\>\|[0-9]\)'
     set ft=pike
 
+    " Pike
+  elseif s:name =~# '^pike\%(\>\|[0-9]\)'
+    set ft=pike
+
     " Lua
   elseif s:name =~# 'lua'
     set ft=lua
@@ -176,6 +180,10 @@ if s:line1 =~# "^#!"
   elseif s:name =~# 'scala\>'
     set ft=scala
 
+    " Clojure
+  elseif s:name =~# 'clojure'
+    set ft=clojure
+
   endif
   unlet s:name
 
diff --git a/src/buffer.c b/src/buffer.c
@@ -595,7 +595,7 @@ close_buffer(
 
 #ifdef FEAT_DIFF
     if (diffopt_hiddenoff() && !unload_buf && buf->b_nwindows == 0)
-    	diff_buf_delete(buf);	/* Clear 'diff' for hidden buffer. */
+	diff_buf_delete(buf);	/* Clear 'diff' for hidden buffer. */
 #endif
 
     /* Return when a window is displaying the buffer or when it's not
@@ -661,9 +661,6 @@ close_buffer(
     odb_buffer_close(buf);
 #endif
 
-    /* Change directories when the 'acd' option is set. */
-    DO_AUTOCHDIR
-
     /*
      * Remove the buffer from the list.
      */
@@ -1866,7 +1863,7 @@ do_autochdir(void)
 {
     if ((starting == 0 || test_autochdir)
 	    && curbuf->b_ffname != NULL
-	    && vim_chdirfile(curbuf->b_ffname) == OK)
+	    && vim_chdirfile(curbuf->b_ffname, "auto") == OK)
 	shorten_fnames(TRUE);
 }
 #endif
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
@@ -4368,8 +4368,22 @@ do_ecmd(
     if (p_im)
 	need_start_insertmode = TRUE;
 
-    /* Change directories when the 'acd' option is set. */
-    DO_AUTOCHDIR
+#ifdef FEAT_AUTOCHDIR
+    /* Change directories when the 'acd' option is set and we aren't already in
+     * that directory (should already be done above). Expect getcwd() to be
+     * faster than calling shorten_fnames() unnecessarily. */
+    if (p_acd && curbuf->b_ffname != NULL)
+    {
+	char_u	curdir[MAXPATHL];
+	char_u	filedir[MAXPATHL];
+
+	vim_strncpy(filedir, curbuf->b_ffname, MAXPATHL - 1);
+	*gettail_sep(filedir) = NUL;
+	if (mch_dirname(curdir, MAXPATHL) != FAIL
+		&& vim_fnamecmp(curdir, filedir) != 0)
+	    do_autochdir();
+    }
+#endif
 
 #if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG)
     if (curbuf->b_ffname != NULL)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
@@ -9067,11 +9067,19 @@ ex_cd(exarg_T *eap)
 	    EMSG(_(e_failed));
 	else
 	{
-	    post_chdir(eap->cmdidx == CMD_lcd || eap->cmdidx == CMD_lchdir);
+	    int is_local_chdir = eap->cmdidx == CMD_lcd
+						  || eap->cmdidx == CMD_lchdir;
+
+	    post_chdir(is_local_chdir);
 
 	    /* Echo the new current directory if the command was typed. */
 	    if (KeyTyped || p_verbose >= 5)
 		ex_pwd(eap);
+#ifdef FEAT_AUTOCMD
+	    apply_autocmds(EVENT_DIRCHANGED,
+		    is_local_chdir ? (char_u *)"window" : (char_u *)"global",
+		    new_dir, FALSE, curbuf);
+#endif
 	}
 	vim_free(tofree);
     }
@@ -9959,7 +9967,7 @@ ex_mkrc(
 			*dirnow = NUL;
 		    if (*dirnow != NUL && (ssop_flags & SSOP_SESDIR))
 		    {
-			if (vim_chdirfile(fname) == OK)
+			if (vim_chdirfile(fname, NULL) == OK)
 			    shorten_fnames(TRUE);
 		    }
 		    else if (*dirnow != NUL
diff --git a/src/fileio.c b/src/fileio.c
@@ -7836,6 +7836,7 @@ static struct event_name
     {"CursorHoldI",	EVENT_CURSORHOLDI},
     {"CursorMoved",	EVENT_CURSORMOVED},
     {"CursorMovedI",	EVENT_CURSORMOVEDI},
+    {"DirChanged",	EVENT_DIRCHANGED},
     {"EncodingChanged",	EVENT_ENCODINGCHANGED},
     {"FileEncoding",	EVENT_ENCODINGCHANGED},
     {"FileAppendPost",	EVENT_FILEAPPENDPOST},
@@ -9626,7 +9627,7 @@ apply_autocmds_group(
     {
 	sfname = vim_strsave(fname);
 	/* Don't try expanding FileType, Syntax, FuncUndefined, WindowID,
-	 * ColorScheme or QuickFixCmd* */
+	 * ColorScheme, QuickFixCmd* or DirChanged */
 	if (event == EVENT_FILETYPE
 		|| event == EVENT_SYNTAX
 		|| event == EVENT_FUNCUNDEFINED
@@ -9635,7 +9636,8 @@ apply_autocmds_group(
 		|| event == EVENT_QUICKFIXCMDPRE
 		|| event == EVENT_COLORSCHEME
 		|| event == EVENT_OPTIONSET
-		|| event == EVENT_QUICKFIXCMDPOST)
+		|| event == EVENT_QUICKFIXCMDPOST
+		|| event == EVENT_DIRCHANGED)
 	    fname = vim_strsave(fname);
 	else
 	    fname = FullName_save(fname, FALSE);
diff --git a/src/gui_mac.c b/src/gui_mac.c
@@ -1105,7 +1105,8 @@ HandleODocAE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
 	}
 
 	/* Change directory to the location of the first file. */
-	if (GARGCOUNT > 0 && vim_chdirfile(alist_name(&GARGLIST[0])) == OK)
+	if (GARGCOUNT > 0
+		      && vim_chdirfile(alist_name(&GARGLIST[0]), "drop") == OK)
 	    shorten_fnames(TRUE);
 
 	goto finished;
diff --git a/src/main.c b/src/main.c
@@ -279,7 +279,7 @@ main
 	 * Hint: to avoid this when typing a command use a forward slash.
 	 * If the cd fails, it doesn't matter.
 	 */
-	(void)vim_chdirfile(params.fname);
+	(void)vim_chdirfile(params.fname, "drop");
 	if (start_dir != NULL)
 	    mch_dirname(start_dir, MAXPATHL);
     }
@@ -330,7 +330,7 @@ main
 						&& STRCMP(NameBuff, "/") == 0)
 	{
 	    if (params.fname != NULL)
-		(void)vim_chdirfile(params.fname);
+		(void)vim_chdirfile(params.fname, "drop");
 	    else
 	    {
 		expand_env((char_u *)"$HOME", NameBuff, MAXPATHL);
@@ -375,6 +375,13 @@ main
      */
     check_tty(&params);
 
+#ifdef _IOLBF
+    /* Ensure output works usefully without a tty: buffer lines instead of
+     * fully buffered. */
+    if (silent_mode)
+	setvbuf(stdout, NULL, _IOLBF, 0);
+#endif
+
     /* This message comes before term inits, but after setting "silent_mode"
      * when the input is not a tty. */
     if (GARGCOUNT > 1 && !silent_mode)
@@ -2616,7 +2623,7 @@ command_line_scan(mparm_T *parmp)
 
 /*
  * Print a warning if stdout is not a terminal.
- * When starting in Ex mode and commands come from a file, set Silent mode.
+ * When starting in Ex mode and commands come from a file, set silent_mode.
  */
     static void
 check_tty(mparm_T *parmp)
diff --git a/src/misc2.c b/src/misc2.c
@@ -3395,13 +3395,20 @@ same_directory(char_u *f1, char_u *f2)
  * Return OK or FAIL.
  */
     int
-vim_chdirfile(char_u *fname)
+vim_chdirfile(char_u *fname, char *trigger_autocmd UNUSED)
 {
     char_u	dir[MAXPATHL];
+    int		res;
 
     vim_strncpy(dir, fname, MAXPATHL - 1);
     *gettail_sep(dir) = NUL;
-    return mch_chdir((char *)dir) == 0 ? OK : FAIL;
+    res = mch_chdir((char *)dir) == 0 ? OK : FAIL;
+#ifdef FEAT_AUTOCMD
+    if (res == OK && trigger_autocmd != NULL)
+	apply_autocmds(EVENT_DIRCHANGED, (char_u *)trigger_autocmd,
+							   dir, FALSE, curbuf);
+#endif
+    return res;
 }
 #endif
 
diff --git a/src/netbeans.c b/src/netbeans.c
@@ -2663,7 +2663,7 @@ netbeans_file_opened(buf_T *bufp)
     nbdebug(("EVT: %s", buffer));
 
     nb_send(buffer, "netbeans_file_opened");
-    if (p_acd && vim_chdirfile(bufp->b_ffname) == OK)
+    if (p_acd && vim_chdirfile(bufp->b_ffname, "auto") == OK)
 	shorten_fnames(TRUE);
 }
 
diff --git a/src/option.c b/src/option.c
@@ -3348,6 +3348,7 @@ static char *(p_scl_values[]) = {"yes", "no", "auto", NULL};
 
 static void set_option_default(int, int opt_flags, int compatible);
 static void set_options_default(int opt_flags);
+static void set_string_default_esc(char *name, char_u *val, int escape);
 static char_u *term_bg_default(void);
 static void did_set_option(int opt_idx, int opt_flags, int new_value);
 static char_u *illegal_char(char_u *, int);
@@ -3460,7 +3461,7 @@ set_init_1(void)
 # endif
 #endif
 	    )
-	set_string_default("sh", p);
+	set_string_default_esc("sh", p, TRUE);
 
 #ifdef FEAT_WILDIGN
     /*
@@ -3963,14 +3964,18 @@ set_options_default(
 /*
  * Set the Vi-default value of a string option.
  * Used for 'sh', 'backupskip' and 'term'.
+ * When "escape" is TRUE escape spaces with a backslash.
  */
-    void
-set_string_default(char *name, char_u *val)
+    static void
+set_string_default_esc(char *name, char_u *val, int escape)
 {
     char_u	*p;
     int		opt_idx;
 
-    p = vim_strsave(val);
+    if (escape && vim_strchr(val, ' ') != NULL)
+	p = vim_strsave_escaped(val, (char_u *)" ");
+    else
+	p = vim_strsave(val);
     if (p != NULL)		/* we don't want a NULL */
     {
 	opt_idx = findoption((char_u *)name);
@@ -3984,6 +3989,12 @@ set_string_default(char *name, char_u *val)
     }
 }
 
+    void
+set_string_default(char *name, char_u *val)
+{
+    set_string_default_esc(name, val, FALSE);
+}
+
 /*
  * Set the Vi-default value of a number option.
  * Used for 'lines' and 'columns'.
diff --git a/src/os_win32.c b/src/os_win32.c
@@ -7193,7 +7193,7 @@ fix_arg_enc(void)
     {
 	do_cmdline_cmd((char_u *)":rewind");
 	if (GARGCOUNT == 1 && used_file_full_path)
-	    (void)vim_chdirfile(alist_name(&GARGLIST[0]));
+	    (void)vim_chdirfile(alist_name(&GARGLIST[0]), "drop");
     }
 
     set_alist_count();
diff --git a/src/proto/misc2.pro b/src/proto/misc2.pro
@@ -82,7 +82,7 @@ int call_shell(char_u *cmd, int opt);
 int get_real_state(void);
 int after_pathsep(char_u *b, char_u *p);
 int same_directory(char_u *f1, char_u *f2);
-int vim_chdirfile(char_u *fname);
+int vim_chdirfile(char_u *fname, char *trigger_autocmd);
 int vim_stat(const char *name, stat_T *stp);
 char_u *parse_shape_opt(int what);
 int get_shape_idx(int mouse);
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
diff --git a/src/version.c b/src/version.c
diff --git a/src/vim.h b/src/vim.h

Original file line number	Diff line number	Diff line change
`@@ -9067,11 +9067,19 @@ ex_cd(exarg_T *eap)`
`9067`	`9067`	`EMSG(_(e_failed));`
`9068`	`9068`	`else`
`9069`	`9069`	`{`
`9070`		`- post_chdir(eap->cmdidx == CMD_lcd \|\| eap->cmdidx == CMD_lchdir);`
	`9070`	`+ int is_local_chdir = eap->cmdidx == CMD_lcd`
	`9071`	`+ \|\| eap->cmdidx == CMD_lchdir;`
	`9072`	`+`
	`9073`	`+ post_chdir(is_local_chdir);`
`9071`	`9074`
`9072`	`9075`	`/* Echo the new current directory if the command was typed. */`
`9073`	`9076`	`if (KeyTyped \|\| p_verbose >= 5)`
`9074`	`9077`	`ex_pwd(eap);`
	`9078`	`+#ifdef FEAT_AUTOCMD`
	`9079`	`+ apply_autocmds(EVENT_DIRCHANGED,`
	`9080`	`+ is_local_chdir ? (char_u )"window" : (char_u )"global",`
	`9081`	`+ new_dir, FALSE, curbuf);`
	`9082`	`+#endif`
`9075`	`9083`	`}`
`9076`	`9084`	`vim_free(tofree);`
`9077`	`9085`	`}`
`@@ -9959,7 +9967,7 @@ ex_mkrc(`
`9959`	`9967`	`*dirnow = NUL;`
`9960`	`9968`	`if (*dirnow != NUL && (ssop_flags & SSOP_SESDIR))`
`9961`	`9969`	`{`
`9962`		`- if (vim_chdirfile(fname) == OK)`
	`9970`	`+ if (vim_chdirfile(fname, NULL) == OK)`
`9963`	`9971`	`shorten_fnames(TRUE);`
`9964`	`9972`	`}`
`9965`	`9973`	`else if (*dirnow != NUL`
Original file line number	Diff line number	Diff line change
`@@ -1105,7 +1105,8 @@ HandleODocAE(const AppleEvent theAEvent, AppleEvent theReply, long refCon)`
`1105`	`1105`	`}`
`1106`	`1106`
`1107`	`1107`	`/* Change directory to the location of the first file. */`
`1108`		`- if (GARGCOUNT > 0 && vim_chdirfile(alist_name(&GARGLIST[0])) == OK)`
	`1108`	`+ if (GARGCOUNT > 0`
	`1109`	`+ && vim_chdirfile(alist_name(&GARGLIST[0]), "drop") == OK)`
`1109`	`1110`	`shorten_fnames(TRUE);`
`1110`	`1111`
`1111`	`1112`	`goto finished;`