(revert-buffer): Correct typo: variable name is `buffer-file-format',

not `buffer-file-formats'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 328809035ca333a0b524ab7980b1d384551bdf61..be19ba2a9dc81a8847b9ae0b8972b4b9ab75c051 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2002-06-10  Miles Bader  <miles@gnu.org>
 
+       * files.el (revert-buffer): Correct typo: variable name is
+       `buffer-file-format', not `buffer-file-formats'.
+
+       * comint.el (comint-send-input, comint-output-filter): Use the
+       `font-lock-face' property instead of `face'.  Don't check the
+       highlight-enabling variables anymore.
+       (comint-highlight-input, comint-highlight-prompt): Variables
+       removed.
+       
        * faces.el (display-supports-face-attributes-p): New function.
        (face-spec-set-match-display): Support `supports' predicate.
        (italic): Try underlining for displays that don't support real italics.

diff --git a/lisp/files.el b/lisp/files.el
index 34fdefd6da628746e88a5649d0f5b20b09798172..02457b23a8cd0130bd9a7166cada53cb2a45a05f 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3223,7 +3223,7 @@ non-nil, it is called instead of rereading visited file contents."
                            coding-system-for-read)))
                     ;; Note that this preserves point in an intelligent way.
                     (if preserve-modes
-                        (let ((buffer-file-formats buffer-file-formats))
+                        (let ((buffer-file-format buffer-file-format))
                           (insert-file-contents file-name (not auto-save-p)
                                                 nil nil t))
                       (insert-file-contents file-name (not auto-save-p)