From: John Paul Wallington <jpw@pobox.com>
Date: Thu, 8 Jan 2004 05:43:22 +0000 (+0000)
Subject: (emerge-restore-buffer-characteristics): Doc fix.
X-Git-Tag: ttn-vms-21-2-B4~7971
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9ec040a0de0c3d2b336adddbe697a1eaaca3210;p=emacs.git

(emerge-restore-buffer-characteristics): Doc fix.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f27dac3243..456c48ce33c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-08  John Paul Wallington  <jpw@gnu.org>
+
+	* emerge.el (emerge-restore-buffer-characteristics): Doc fix.
+
 2004-01-07  Nick Roberts  <nick@nick.uklinux.net>
 
 	* progmodes/gud.el (gdb-first-prompt): Renamed from
diff --git a/lisp/emerge.el b/lisp/emerge.el
index e1fd33587ce..f9821111e71 100644
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -1454,7 +1454,7 @@ These characteristics are restored by `emerge-restore-buffer-characteristics'."
 				     emerge-merging-values)))))
 
 (defun emerge-restore-buffer-characteristics ()
-  "Restores characteristics saved by `emerge-remember-buffer-characteristics'."
+  "Restore characteristics saved by `emerge-remember-buffer-characteristics'."
   (let ((A-values emerge-A-buffer-values)
 	(B-values emerge-B-buffer-values))
     (emerge-eval-in-buffer emerge-A-buffer
@@ -3112,7 +3112,7 @@ SPC, it is ignored; if it is anything else, it is processed as a command."
 		  (setq unread-command-events (list c)))))
 	(erase-buffer)))))
 
-;; Improved auto-save gfile names.
+;; Improved auto-save file names.
 ;; This function fixes many problems with the standard auto-save file names:
 ;; Auto-save files for non-file buffers get put in the default directory
 ;; for the buffer, whether that makes sense or not.