Mercurial > emacs
changeset 45936:00b587e45a1a
(find-file-read-args): Add new argument `mustmatch' and
pass it down to read-file-name.
(find-file, find-file-other-window, find-file-other-frame)
(find-file-read-only, find-file-read-only-other-window)
(find-file-read-only-other-frame): Use it and fix prompts.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Fri, 21 Jun 2002 08:35:50 +0000 |
| parents | 7ac43b3204b0 |
| children | eb2f1d89a28f |
| files | lisp/files.el |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/files.el Thu Jun 20 21:35:38 2002 +0000 +++ b/lisp/files.el Fri Jun 21 08:35:50 2002 +0000 @@ -791,7 +791,7 @@ (defvar find-file-default nil "Used within `find-file-read-args'.") -(defun find-file-read-args (prompt) +(defun find-file-read-args (prompt mustmatch) (list (let ((find-file-default (and buffer-file-name (abbreviate-file-name buffer-file-name))) @@ -804,7 +804,7 @@ (minibuffer-setup-hook minibuffer-setup-hook)) (add-hook 'minibuffer-setup-hook munge-default-fun) - (read-file-name prompt nil default-directory)) + (read-file-name prompt nil default-directory mustmatch)) current-prefix-arg)) (defun find-file (filename &optional wildcards) @@ -819,7 +819,7 @@ expand wildcards (if any) and visit multiple files. Wildcard expansion can be suppressed by setting `find-file-wildcards'." (interactive - (find-file-read-args "Find file: ")) + (find-file-read-args "Find file: " nil)) (let ((value (find-file-noselect filename nil nil wildcards))) (if (listp value) (mapcar 'switch-to-buffer (nreverse value)) @@ -836,7 +836,7 @@ Interactively, or if WILDCARDS is non-nil in a call from Lisp, expand wildcards (if any) and visit multiple files." - (interactive (find-file-read-args "FFind file in other window: ")) + (interactive (find-file-read-args "Find file in other window: " nil)) (let ((value (find-file-noselect filename nil nil wildcards))) (if (listp value) (progn @@ -856,7 +856,7 @@ Interactively, or if WILDCARDS is non-nil in a call from Lisp, expand wildcards (if any) and visit multiple files." - (interactive (find-file-read-args "FFind file in other frame: ")) + (interactive (find-file-read-args "Find file in other frame: " nil)) (let ((value (find-file-noselect filename nil nil wildcards))) (if (listp value) (progn @@ -869,7 +869,7 @@ "Edit file FILENAME but don't allow changes. Like \\[find-file] but marks buffer as read-only. Use \\[toggle-read-only] to permit editing." - (interactive (find-file-read-args "fFind file read-only: ")) + (interactive (find-file-read-args "Find file read-only: " t)) (find-file filename wildcards) (toggle-read-only 1) (current-buffer)) @@ -878,7 +878,7 @@ "Edit file FILENAME in another window but don't allow changes. Like \\[find-file-other-window] but marks buffer as read-only. Use \\[toggle-read-only] to permit editing." - (interactive (find-file-read-args "fFind file read-only other window: ")) + (interactive (find-file-read-args "Find file read-only other window: " t)) (find-file-other-window filename wildcards) (toggle-read-only 1) (current-buffer)) @@ -887,7 +887,7 @@ "Edit file FILENAME in another frame but don't allow changes. Like \\[find-file-other-frame] but marks buffer as read-only. Use \\[toggle-read-only] to permit editing." - (interactive (find-file-read-args "fFind file read-only other frame: ")) + (interactive (find-file-read-args "Find file read-only other frame: " t)) (find-file-other-frame filename wildcards) (toggle-read-only 1) (current-buffer))