Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org

[gnu-emacs] / lisp / chistory.el

diff --git a/lisp/chistory.el b/lisp/chistory.el
index 21053950c9ec73e8bb35cff9cd5c471a5eca9ed9..509324ade8855787170cd0e80475a4afd48a91c9 100644 (file)
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -1,7 +1,6 @@
 ;;; chistory.el --- list command history
 
-;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2013 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
@@ -67,7 +66,7 @@ editing and the result is evaluated."
   '(command-history-mode
     list-command-history
     electric-command-history)
-  "*A list of symbols to be ignored by `default-command-history-filter'.
+  "A list of symbols to be ignored by `default-command-history-filter'.
 If that function is given a list whose car is an element of this list,
 then it will return non-nil (indicating the list should be discarded from
 the history).
@@ -90,7 +89,7 @@ from the command history."
       (memq (car frob) default-command-history-filter-garbage)))
 
 (defcustom list-command-history-max 32
-  "*If non-nil, maximum length of the listing produced by `list-command-history'."
+  "If non-nil, maximum length of the listing produced by `list-command-history'."
   :type '(choice integer (const nil))
   :group 'chistory)
 
@@ -116,8 +115,7 @@ The buffer is left in Command History mode."
          (prin1 (car history))
          (terpri))
        (setq history (cdr history))))
-    (save-excursion
-      (set-buffer "*Command History*")
+    (with-current-buffer "*Command History*"
       (goto-char (point-min))
       (if (eobp)
          (error "No command history")
@@ -190,5 +188,4 @@ and runs the normal hook `command-history-hook'."
 
 (provide 'chistory)
 
-;; arch-tag: c201a0cd-89f2-4d39-a532-4cb309391dbd
 ;;; chistory.el ends here