aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/shell.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/shell.el')
-rw-r--r--lisp/shell.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index fd5e6c25032..7a9f261859d 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -133,7 +133,7 @@ arguments."
133(defcustom shell-prompt-pattern "^[^#$%>\n]*[#$%>] *" 133(defcustom shell-prompt-pattern "^[^#$%>\n]*[#$%>] *"
134 "Regexp to match prompts in the inferior shell. 134 "Regexp to match prompts in the inferior shell.
135Defaults to \"^[^#$%>\\n]*[#$%>] *\", which works pretty well. 135Defaults to \"^[^#$%>\\n]*[#$%>] *\", which works pretty well.
136This variable is used to initialise `comint-prompt-regexp' in the 136This variable is used to initialize `comint-prompt-regexp' in the
137shell buffer. 137shell buffer.
138 138
139If `comint-use-prompt-regexp' is nil, then this variable is only used 139If `comint-use-prompt-regexp' is nil, then this variable is only used
@@ -159,7 +159,7 @@ This is a fine thing to set in your `.emacs' file."
159 :group 'shell) 159 :group 'shell)
160 160
161(defvar shell-delimiter-argument-list '(?\| ?& ?< ?> ?\( ?\) ?\;) 161(defvar shell-delimiter-argument-list '(?\| ?& ?< ?> ?\( ?\) ?\;)
162 "List of characters to recognise as separate arguments. 162 "List of characters to recognize as separate arguments.
163This variable is used to initialize `comint-delimiter-argument-list' in the 163This variable is used to initialize `comint-delimiter-argument-list' in the
164shell buffer. The value may depend on the operating system or shell. 164shell buffer. The value may depend on the operating system or shell.
165 165
@@ -192,7 +192,7 @@ This is a fine thing to set in your `.emacs' file.")
192 shell-replace-by-expanded-directory 192 shell-replace-by-expanded-directory
193 comint-dynamic-complete-filename) 193 comint-dynamic-complete-filename)
194 "List of functions called to perform completion. 194 "List of functions called to perform completion.
195This variable is used to initialise `comint-dynamic-complete-functions' in the 195This variable is used to initialize `comint-dynamic-complete-functions' in the
196shell buffer. 196shell buffer.
197 197
198This is a fine thing to set in your `.emacs' file.") 198This is a fine thing to set in your `.emacs' file.")
@@ -407,7 +407,7 @@ Variables `comint-completion-autolist', `comint-completion-addsuffix',
407`comint-completion-recexact' and `comint-completion-fignore' control the 407`comint-completion-recexact' and `comint-completion-fignore' control the
408behavior of file name, command name and variable name completion. Variable 408behavior of file name, command name and variable name completion. Variable
409`shell-completion-execonly' controls the behavior of command name completion. 409`shell-completion-execonly' controls the behavior of command name completion.
410Variable `shell-completion-fignore' is used to initialise the value of 410Variable `shell-completion-fignore' is used to initialize the value of
411`comint-completion-fignore'. 411`comint-completion-fignore'.
412 412
413Variables `comint-input-ring-file-name' and `comint-input-autoexpand' control 413Variables `comint-input-ring-file-name' and `comint-input-autoexpand' control
@@ -950,7 +950,7 @@ See `shell-dynamic-complete-filename'. Returns t if successful."
950 (and comint-completion-fignore 950 (and comint-completion-fignore
951 (mapconcat (function (lambda (x) (concat (regexp-quote x) "$"))) 951 (mapconcat (function (lambda (x) (concat (regexp-quote x) "$")))
952 comint-completion-fignore "\\|"))) 952 comint-completion-fignore "\\|")))
953 (dir "") (comps-in-dir ()) 953 (dir "") (comps-in-dir ())
954 (file "") (abs-file-name "") (completions ())) 954 (file "") (abs-file-name "") (completions ()))
955 ;; Go thru each dir in the search path, finding completions. 955 ;; Go thru each dir in the search path, finding completions.
956 (while path-dirs 956 (while path-dirs