From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 30 Sep 2006 10:02:22 +0000 (+0000)
Subject: (find-file-existing): Modified to not allow wildcards.
X-Git-Tag: emacs-pretest-22.0.90~280
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63c8abc42a2b43fdc2f049f27f095379c2aebc8f;p=emacs.git

(find-file-existing): Modified to not allow wildcards.
---

diff --git a/lisp/files.el b/lisp/files.el
index 5af68f6014e..3e2cf2ee92d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1117,13 +1117,15 @@ expand wildcards (if any) and visit multiple files."
 		(mapcar 'switch-to-buffer (cdr value))))
       (switch-to-buffer-other-frame value))))
 
-(defun find-file-existing (filename &optional wildcards)
-  "Edit the existing file FILENAME.
-Like \\[find-file] but only allow a file that exists."
-  (interactive (find-file-read-args "Find existing file: " t))
-  (unless (file-exists-p filename) (error "%s does not exist" filename))
-  (find-file filename wildcards)
-  (current-buffer))
+(defun find-file-existing (filename)
+   "Edit the existing file FILENAME.
+Like \\[find-file] but only allow a file that exists, and do not allow
+file names with wildcards."
+   (interactive (nbutlast (find-file-read-args "Find existing file: " t)))
+   (if (and (not (interactive-p)) (not (file-exists-p filename)))
+       (error "%s does not exist" filename)
+     (find-file filename)
+     (current-buffer)))
 
 (defun find-file-read-only (filename &optional wildcards)
   "Edit file FILENAME but don't allow changes.