(comint-match-partial-filename): Consider +@: part of

filenames; don't consider parens as part of them.

diff --git a/lisp/comint.el b/lisp/comint.el
index 6ac896fbbc147b8a585a6985896328d8d702ccdd..81e48cd209a71f4ccd5f48d83b18f90d35a61df3 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1741,11 +1741,11 @@ directory tracking functions.")
   "Return the filename at point, or signal an error.
 Environment variables are substituted."
   (save-excursion
-    (if (re-search-backward "[^~/A-Za-z0-9_.$#,={}()-]" nil 'move)
+    (if (re-search-backward "[^~/A-Za-z0-9+@:_.$#,={}-]" nil 'move)
        (forward-char 1))
     ;; Anchor the search forwards.
-    (if (not (looking-at "[~/A-Za-z0-9_.$#,={}()-]")) (error ""))
-    (re-search-forward "[~/A-Za-z0-9_.$#,={}()-]+")
+    (if (not (looking-at "[~/A-Za-z0-9+@:_.$#,={}-]")) (error ""))
+    (re-search-forward "[~/A-Za-z0-9+@:_.$#,={}-]+")
     (substitute-in-file-name
      (buffer-substring (match-beginning 0) (match-end 0)))))