(comint-dynamic-complete-as-filename): Simplify.

diff --git a/lisp/comint.el b/lisp/comint.el
index 7e57e88579b8452d2eaecbc92e35502e2e20a7f9..dedc99a5144badafe9d9cb904ff17cd1701ab774 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1836,14 +1836,11 @@ See `comint-dynamic-complete-filename'.  Returns t if successful."
   (let* ((completion-ignore-case nil)
         (completion-ignored-extensions comint-completion-fignore)
         (success t)
-        (filename (comint-match-partial-filename))
-        endpos pathdir pathnondir directory completion)
-    (setq endpos (if filename (match-end 0) (point)))
-    (or filename (setq filename ""))
-    (setq pathdir (file-name-directory filename)
-         pathnondir (file-name-nondirectory filename)
-         directory (if pathdir (comint-directory pathdir) default-directory)
-         completion (file-name-completion pathnondir directory))
+        (filename (or (comint-match-partial-filename) ""))
+        (pathdir (file-name-directory filename))
+        (pathnondir (file-name-nondirectory filename))
+        (directory (if pathdir (comint-directory pathdir) default-directory))
+        (completion (file-name-completion pathnondir directory)))
     (cond ((null completion)
            (message "No completions of %s" filename)
           (setq success nil))
@@ -1854,7 +1851,6 @@ See `comint-dynamic-complete-filename'.  Returns t if successful."
            (comint-dynamic-list-filename-completions))
           (t                            ; Completion string returned.
            (let ((file (concat (file-name-as-directory directory) completion)))
-             (goto-char endpos)
              (insert (substring (directory-file-name completion)
                                 (length pathnondir)))
              (cond ((symbolp (file-name-completion completion directory))