diff options
| author | Andrea Corallo | 2020-10-04 19:45:05 +0200 |
|---|---|---|
| committer | Andrea Corallo | 2020-10-04 19:45:05 +0200 |
| commit | 44ef24342fd8a2ac876212124ebf38673acda35a (patch) | |
| tree | 793dc4ba4197559b4bc65339d713c0807a7b2ca9 /lisp/shell.el | |
| parent | afb765ab3cab7b6582d0def543b23603cd076445 (diff) | |
| parent | d8665e6d3473403c90a0831e83439a013d0012d3 (diff) | |
| download | emacs-44ef24342fd8a2ac876212124ebf38673acda35a.tar.gz emacs-44ef24342fd8a2ac876212124ebf38673acda35a.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 6129e5efc84..226bdf4d919 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -1208,7 +1208,7 @@ Returns t if successful." | |||
| 1208 | (cwd (file-name-as-directory (expand-file-name default-directory))) | 1208 | (cwd (file-name-as-directory (expand-file-name default-directory))) |
| 1209 | (ignored-extensions | 1209 | (ignored-extensions |
| 1210 | (and comint-completion-fignore | 1210 | (and comint-completion-fignore |
| 1211 | (mapconcat (function (lambda (x) (concat (regexp-quote x) "\\'"))) | 1211 | (mapconcat (lambda (x) (concat (regexp-quote x) "\\'")) |
| 1212 | comint-completion-fignore "\\|"))) | 1212 | comint-completion-fignore "\\|"))) |
| 1213 | (dir "") (comps-in-dir ()) | 1213 | (dir "") (comps-in-dir ()) |
| 1214 | (file "") (abs-file-name "") (completions ())) | 1214 | (file "") (abs-file-name "") (completions ())) |