summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2020-07-18 11:17:31 +0300
committerEli Zaretskii <eliz@gnu.org>2020-07-18 11:17:31 +0300
commit05c4329cf59f8bde98e33952c1f26551de83e400 (patch)
tree31684bed9dc5beca81e265454fab18da0a8fff83
parentde68572742f37f70c128c7192576182347eb8f4b (diff)
downloademacs-05c4329cf59f8bde98e33952c1f26551de83e400.tar.gz
Revert "Fix filename completion in shell mode buffers"
This reverts commit e4d17d8cb479ffeeb7dfb7320a1432722ac8df75. Per bug#42383 discussions, the fix for bug#34330 probably just works around the real issue, which is in pcomplete.el.
-rw-r--r--lisp/shell.el7
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/shell.el b/lisp/shell.el
index ecebf937e29..dc1198b7bac 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -184,16 +184,13 @@ shell buffer. The value may depend on the operating system or shell."
shell-environment-variable-completion
shell-command-completion
shell-c-a-p-replace-by-expanded-directory
+ pcomplete-completions-at-point
shell-filename-completion
- comint-filename-completion
- ;; Put `pcomplete-completions-at-point' last so that other
- ;; functions can run before it does, see bug#34330.
- pcomplete-completions-at-point)
+ comint-filename-completion)
"List of functions called to perform completion.
This variable is used to initialize `comint-dynamic-complete-functions' in the
shell buffer."
:type '(repeat function)
- :version "27.1"
:group 'shell)
(defcustom shell-command-regexp "[^;&|\n]+"