aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-10-12 23:00:44 +0000
committerRichard M. Stallman2006-10-12 23:00:44 +0000
commit5c471b12bc7cafbee3e57b41edb34ace3aeed211 (patch)
treeed5b683c2b57870227e6cc3d7904d96c9711c5ae
parentdfea17e083019b71fd5cb2ccb740b45232bf9fcd (diff)
downloademacs-5c471b12bc7cafbee3e57b41edb34ace3aeed211.tar.gz
emacs-5c471b12bc7cafbee3e57b41edb34ace3aeed211.zip
(file-name-history): Add defvar.
(save-some-buffers-action-alist): Improve description strings.
-rw-r--r--lisp/files.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 556c5e680b7..4b746225f60 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -514,6 +514,9 @@ using \\[toggle-read-only]."
514 :type 'boolean 514 :type 'boolean
515 :group 'view) 515 :group 'view)
516 516
517(defvar file-name-history nil
518 "History list of file names entered in the minibuffer.")
519
517(put 'ange-ftp-completion-hook-function 'safe-magic t) 520(put 'ange-ftp-completion-hook-function 'safe-magic t)
518(defun ange-ftp-completion-hook-function (op &rest args) 521(defun ange-ftp-completion-hook-function (op &rest args)
519 "Provides support for ange-ftp host name completion. 522 "Provides support for ange-ftp host name completion.
@@ -3730,7 +3733,7 @@ This requires the external program `diff' to be in your `exec-path'."
3730 (recursive-edit) 3733 (recursive-edit)
3731 ;; Return nil to ask about BUF again. 3734 ;; Return nil to ask about BUF again.
3732 nil) 3735 nil)
3733 "view this file") 3736 "view this buffer")
3734 (?d (lambda (buf) 3737 (?d (lambda (buf)
3735 (save-window-excursion 3738 (save-window-excursion
3736 (diff-buffer-with-file buf)) 3739 (diff-buffer-with-file buf))
@@ -3738,7 +3741,7 @@ This requires the external program `diff' to be in your `exec-path'."
3738 (lambda (ignore) (exit-recursive-edit))) 3741 (lambda (ignore) (exit-recursive-edit)))
3739 (recursive-edit) 3742 (recursive-edit)
3740 nil) 3743 nil)
3741 "view changes in file")) 3744 "view changes in this buffer"))
3742 "ACTION-ALIST argument used in call to `map-y-or-n-p'.") 3745 "ACTION-ALIST argument used in call to `map-y-or-n-p'.")
3743 3746
3744(defvar buffer-save-without-query nil 3747(defvar buffer-save-without-query nil