[Emacs-diffs] Changes to emacs/lisp/files.el

[Andreas Schwab]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.584 emacs/lisp/files.el:1.585
*** emacs/lisp/files.el:1.584   Thu Jun 13 05:31:50 2002
--- emacs/lisp/files.el Fri Jun 21 04:35:50 2002
***************
*** 791,797 ****
  (defvar find-file-default nil
    "Used within `find-file-read-args'.")
  
! (defun find-file-read-args (prompt)
    (list (let ((find-file-default
               (and buffer-file-name
                    (abbreviate-file-name buffer-file-name)))
--- 791,797 ----
  (defvar find-file-default nil
    "Used within `find-file-read-args'.")
  
! (defun find-file-read-args (prompt mustmatch)
    (list (let ((find-file-default
               (and buffer-file-name
                    (abbreviate-file-name buffer-file-name)))
***************
*** 804,810 ****
              (minibuffer-setup-hook
               minibuffer-setup-hook))
          (add-hook 'minibuffer-setup-hook munge-default-fun)
!         (read-file-name prompt nil default-directory))
        current-prefix-arg))
  
  (defun find-file (filename &optional wildcards)
--- 804,810 ----
              (minibuffer-setup-hook
               minibuffer-setup-hook))
          (add-hook 'minibuffer-setup-hook munge-default-fun)
!         (read-file-name prompt nil default-directory mustmatch))
        current-prefix-arg))
  
  (defun find-file (filename &optional wildcards)
***************
*** 819,825 ****
  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: "))
    (let ((value (find-file-noselect filename nil nil wildcards)))
      (if (listp value)
        (mapcar 'switch-to-buffer (nreverse value))
--- 819,825 ----
  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: " nil))
    (let ((value (find-file-noselect filename nil nil wildcards)))
      (if (listp value)
        (mapcar 'switch-to-buffer (nreverse value))
***************
*** 836,842 ****
  
  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: "))
    (let ((value (find-file-noselect filename nil nil wildcards)))
      (if (listp value)
        (progn
--- 836,842 ----
  
  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 "Find file in other window: " nil))
    (let ((value (find-file-noselect filename nil nil wildcards)))
      (if (listp value)
        (progn
***************
*** 856,862 ****
  
  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: "))
    (let ((value (find-file-noselect filename nil nil wildcards)))
      (if (listp value)
        (progn
--- 856,862 ----
  
  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 "Find file in other frame: " nil))
    (let ((value (find-file-noselect filename nil nil wildcards)))
      (if (listp value)
        (progn
***************
*** 869,875 ****
    "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: "))
    (find-file filename wildcards)
    (toggle-read-only 1)
    (current-buffer))
--- 869,875 ----
    "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 "Find file read-only: " t))
    (find-file filename wildcards)
    (toggle-read-only 1)
    (current-buffer))
***************
*** 878,884 ****
    "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: "))
    (find-file-other-window filename wildcards)
    (toggle-read-only 1)
    (current-buffer))
--- 878,884 ----
    "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 "Find file read-only other window: " t))
    (find-file-other-window filename wildcards)
    (toggle-read-only 1)
    (current-buffer))
***************
*** 887,893 ****
    "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: "))
    (find-file-other-frame filename wildcards)
    (toggle-read-only 1)
    (current-buffer))
--- 887,893 ----
    "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 "Find file read-only other frame: " t))
    (find-file-other-frame filename wildcards)
    (toggle-read-only 1)
    (current-buffer))