Sync to HEAD

[bpt/emacs.git] / lisp / emerge.el

diff --git a/lisp/emerge.el b/lisp/emerge.el
index f3972ac..f982111 100644 (file)
--- 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.
@@ -3209,4 +3209,5 @@ More precisely, a [...] regexp to match any one such character."
 
 (provide 'emerge)
 
+;;; arch-tag: a575f092-6e44-400e-b8a2-4124e9377585
 ;;; emerge.el ends here