From: Miles Bader <miles@gnu.org>
Date: Mon, 10 Jun 2002 06:30:41 +0000 (+0000)
Subject: (revert-buffer): Correct typo: variable name is `buffer-file-format',
X-Git-Tag: ttn-vms-21-2-B4~14691
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0415fedcd5591881f3646bae868ca24287a530e8;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 328809035ca..be19ba2a9dc 100644
--- 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 34fdefd6da6..02457b23a8c 100644
--- 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)