/[emacs]/emacs/lisp/files.el
ViewVC logotype

Diff of /emacs/lisp/files.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.584 by schwab, Thu Jun 13 09:31:50 2002 UTC revision 1.585 by schwab, Fri Jun 21 08:35:50 2002 UTC
# Line 791  documentation for additional customizati Line 791  documentation for additional customizati
791  (defvar find-file-default nil  (defvar find-file-default nil
792    "Used within `find-file-read-args'.")    "Used within `find-file-read-args'.")
793    
794  (defun find-file-read-args (prompt)  (defun find-file-read-args (prompt mustmatch)
795    (list (let ((find-file-default    (list (let ((find-file-default
796                 (and buffer-file-name                 (and buffer-file-name
797                      (abbreviate-file-name buffer-file-name)))                      (abbreviate-file-name buffer-file-name)))
# Line 804  documentation for additional customizati Line 804  documentation for additional customizati
804                (minibuffer-setup-hook                (minibuffer-setup-hook
805                 minibuffer-setup-hook))                 minibuffer-setup-hook))
806            (add-hook 'minibuffer-setup-hook munge-default-fun)            (add-hook 'minibuffer-setup-hook munge-default-fun)
807            (read-file-name prompt nil default-directory))            (read-file-name prompt nil default-directory mustmatch))
808          current-prefix-arg))          current-prefix-arg))
809    
810  (defun find-file (filename &optional wildcards)  (defun find-file (filename &optional wildcards)
# Line 819  Interactively, or if WILDCARDS is non-ni Line 819  Interactively, or if WILDCARDS is non-ni
819  expand wildcards (if any) and visit multiple files.  Wildcard expansion  expand wildcards (if any) and visit multiple files.  Wildcard expansion
820  can be suppressed by setting `find-file-wildcards'."  can be suppressed by setting `find-file-wildcards'."
821    (interactive    (interactive
822     (find-file-read-args "Find file: "))     (find-file-read-args "Find file: " nil))
823    (let ((value (find-file-noselect filename nil nil wildcards)))    (let ((value (find-file-noselect filename nil nil wildcards)))
824      (if (listp value)      (if (listp value)
825          (mapcar 'switch-to-buffer (nreverse value))          (mapcar 'switch-to-buffer (nreverse value))
# Line 836  type M-n to pull it into the minibuffer. Line 836  type M-n to pull it into the minibuffer.
836    
837  Interactively, or if WILDCARDS is non-nil in a call from Lisp,  Interactively, or if WILDCARDS is non-nil in a call from Lisp,
838  expand wildcards (if any) and visit multiple files."  expand wildcards (if any) and visit multiple files."
839    (interactive (find-file-read-args "FFind file in other window: "))    (interactive (find-file-read-args "Find file in other window: " nil))
840    (let ((value (find-file-noselect filename nil nil wildcards)))    (let ((value (find-file-noselect filename nil nil wildcards)))
841      (if (listp value)      (if (listp value)
842          (progn          (progn
# Line 856  type M-n to pull it into the minibuffer. Line 856  type M-n to pull it into the minibuffer.
856    
857  Interactively, or if WILDCARDS is non-nil in a call from Lisp,  Interactively, or if WILDCARDS is non-nil in a call from Lisp,
858  expand wildcards (if any) and visit multiple files."  expand wildcards (if any) and visit multiple files."
859    (interactive (find-file-read-args "FFind file in other frame: "))    (interactive (find-file-read-args "Find file in other frame: " nil))
860    (let ((value (find-file-noselect filename nil nil wildcards)))    (let ((value (find-file-noselect filename nil nil wildcards)))
861      (if (listp value)      (if (listp value)
862          (progn          (progn
# Line 869  expand wildcards (if any) and visit mult Line 869  expand wildcards (if any) and visit mult
869    "Edit file FILENAME but don't allow changes.    "Edit file FILENAME but don't allow changes.
870  Like \\[find-file] but marks buffer as read-only.  Like \\[find-file] but marks buffer as read-only.
871  Use \\[toggle-read-only] to permit editing."  Use \\[toggle-read-only] to permit editing."
872    (interactive (find-file-read-args "fFind file read-only: "))    (interactive (find-file-read-args "Find file read-only: " t))
873    (find-file filename wildcards)    (find-file filename wildcards)
874    (toggle-read-only 1)    (toggle-read-only 1)
875    (current-buffer))    (current-buffer))
# Line 878  Use \\[toggle-read-only] to permit editi Line 878  Use \\[toggle-read-only] to permit editi
878    "Edit file FILENAME in another window but don't allow changes.    "Edit file FILENAME in another window but don't allow changes.
879  Like \\[find-file-other-window] but marks buffer as read-only.  Like \\[find-file-other-window] but marks buffer as read-only.
880  Use \\[toggle-read-only] to permit editing."  Use \\[toggle-read-only] to permit editing."
881    (interactive (find-file-read-args "fFind file read-only other window: "))    (interactive (find-file-read-args "Find file read-only other window: " t))
882    (find-file-other-window filename wildcards)    (find-file-other-window filename wildcards)
883    (toggle-read-only 1)    (toggle-read-only 1)
884    (current-buffer))    (current-buffer))
# Line 887  Use \\[toggle-read-only] to permit editi Line 887  Use \\[toggle-read-only] to permit editi
887    "Edit file FILENAME in another frame but don't allow changes.    "Edit file FILENAME in another frame but don't allow changes.
888  Like \\[find-file-other-frame] but marks buffer as read-only.  Like \\[find-file-other-frame] but marks buffer as read-only.
889  Use \\[toggle-read-only] to permit editing."  Use \\[toggle-read-only] to permit editing."
890    (interactive (find-file-read-args "fFind file read-only other frame: "))    (interactive (find-file-read-args "Find file read-only other frame: " t))
891    (find-file-other-frame filename wildcards)    (find-file-other-frame filename wildcards)
892    (toggle-read-only 1)    (toggle-read-only 1)
893    (current-buffer))    (current-buffer))

Legend:
Removed from v.1.584  
changed lines
  Added in v.1.585

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26