]> git.eshelyaron.com Git - emacs.git/commitdiff
Revert "Fix filename completion in shell mode buffers"
authorEli Zaretskii <eliz@gnu.org>
Sat, 18 Jul 2020 08:17:31 +0000 (11:17 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 18 Jul 2020 08:17:31 +0000 (11:17 +0300)
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.

lisp/shell.el

index ecebf937e29188cfad74b08111831f6e4bc8f534..dc1198b7bac3c94b9a9f118875d94820b169ccdb 100644 (file)
@@ -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]+"