# HG changeset patch # User Richard M. Stallman # Date 864106070 0 # Node ID 488536bc29c25fd0054b36460df523812e47e6d2 # Parent ad5fda4d4c361401cef0cb3addf9002f17b0249b (path-separator, parse-colon-path): Doc fixes. (revert-without-query): Renamed from find-file-revert-without-query. (find-file-noselect): Use new option. (revert-buffer): Check the option here too. diff -r ad5fda4d4c36 -r 488536bc29c2 lisp/files.el --- a/lisp/files.el Tue May 20 05:26:22 1997 +0000 +++ b/lisp/files.el Tue May 20 05:27:50 1997 +0000 @@ -146,12 +146,12 @@ :type 'boolean :group 'find-file) -(defcustom find-file-revert-without-query +(defcustom revert-without-query nil "*Specify which files should be reverted without query. The value is a list of regular expressions. If the file name matches one of these regular expressions, -then `find-file' reverts the file without querying +then `revert-buffer' reverts the file without querying if the file has changed on disk and you have not edited the buffer." :type 'boolean :group 'find-file) @@ -366,10 +366,10 @@ Not actually set up until the first time you you use it.") (defvar path-separator ":" - "Character used to separate concatenated paths.") + "Character used to separate directories in search paths.") (defun parse-colon-path (cd-path) - "Explode a colon-separated list of paths into a string list." + "Explode a colon-separated search path into a list of directory names." (and cd-path (let (cd-prefix cd-list (cd-start 0) cd-colon) (setq cd-path (concat cd-path path-separator)) @@ -879,7 +879,7 @@ ;; Certain files should be reverted automatically ;; if they have changed on disk and not in the buffer. ((and (not (buffer-modified-p buf)) - (let ((tail find-file-revert-without-query) + (let ((tail revert-without-query) (found nil)) (while tail (if (string-match (car tail) filename) @@ -2446,6 +2446,14 @@ (cond ((null file-name) (error "Buffer does not seem to be associated with any file")) ((or noconfirm + (and (not (buffer-modified-p)) + (let ((tail revert-without-query) + (found nil)) + (while tail + (if (string-match (car tail) file-name) + (setq found t)) + (setq tail (cdr tail))) + found)) (yes-or-no-p (format "Revert buffer from file %s? " file-name))) (run-hooks 'before-revert-hook)