(comint-replace-by-expanded-filename): Do nothing if

comint-match-partial-filename returns nil.

2 files changed, 13 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 08fdaf06a7b..e6cf4a208c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-25  Kim F. Storm  <no-spam@cua.dk>
+
+        * comint.el (comint-replace-by-expanded-filename): Do nothing if
+        comint-match-partial-filename returns nil.
+
+        * shell.el (shell-pcomplete-setup-done): New variable.
+        (shell-pcomplete): Use it instead of shell-pcomplete-setup-p.
+        (shell-pcomplete-reverse): Ditto.
+
 2002-02-25  Per Abrahamsen  <abraham@dina.kvl.dk>
 
         * ps-print.el (ps-print-printer): Added `lpr' customize group
diff --git a/lisp/comint.el b/lisp/comint.el
index 0c1dcbd7f52..0fb22b3341c 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2756,8 +2756,10 @@ removed, and the filename is made absolute instead of relative.  For expansion
 see `expand-file-name' and `substitute-in-file-name'.  For completion see
 `comint-dynamic-complete-filename'."
   (interactive)
-  (replace-match (expand-file-name (comint-match-partial-filename)) t t)
-  (comint-dynamic-complete-filename))
+  (let ((filename (comint-match-partial-filename)))
+    (when filename
+      (replace-match (expand-file-name filename) t t)
+      (comint-dynamic-complete-filename))))
 
 
 (defun comint-dynamic-simple-complete (stub candidates)