]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix filename completion in shell mode buffers
authorAlex Branham <alex.branham@gmail.com>
Thu, 15 Aug 2019 16:02:38 +0000 (11:02 -0500)
committerAlex Branham <alex.branham@gmail.com>
Tue, 27 Aug 2019 14:51:14 +0000 (09:51 -0500)
* lisp/shell.el (shell-dynamic-complete-functions): Move
pcomplete-completions-at-point down the list so that filename
completion has a chance to complete before pcompletion.

Fixes bug#34330

lisp/shell.el

index ba7515e7bad9a306252d1fac3475be2e784aab6d..fb2c36fa733bd2fb8c5175e50ad0b6123d29184b 100644 (file)
@@ -184,13 +184,16 @@ 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)
+    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)
   "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]+"