From: Alex Branham <alex.branham@gmail.com>
Date: Thu, 15 Aug 2019 16:02:38 +0000 (-0500)
Subject: Fix filename completion in shell mode buffers
X-Git-Tag: emacs-27.0.90~1328^2~56
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e4d17d8cb479ffeeb7dfb7320a1432722ac8df75;p=emacs.git

Fix filename completion in shell mode buffers

* 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
---

diff --git a/lisp/shell.el b/lisp/shell.el
index ba7515e7bad..fb2c36fa733 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -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]+"