(custom-face-attributes): Handle mapping `nil' and `unspecified' to

[gnu-emacs] / lisp / echistory.el

diff --git a/lisp/echistory.el b/lisp/echistory.el
index 66e0b08c52b2f3ca868cdd6c997e32da0936f6e0..8e04d7eb01d6b5306d0b364966f6bf79e83ee5a4 100644 (file)
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -113,9 +113,10 @@ The Command History listing is recomputed each time this mode is invoked."
                  (save-window-excursion
                    (list-command-history)
                    (set-buffer "*Command History*")
-                   (Command-history-setup 'electric-command-history
-                                          "Electric History"
-                                          electric-history-map))
+                   (Command-history-setup)
+                   (setq major-mode 'electric-command-history)
+                   (setq mode-name "Electric History")
+                   (use-local-map electric-history-map))
                  (Electric-pop-up-window "*Command History*")
                  (run-hooks 'electric-command-history-hook)
                  (if (eobp)
@@ -126,7 +127,7 @@ The Command History listing is recomputed each time this mode is invoked."
                      (Electric-command-loop 'electric-history-quit
                                             "->" t))))))
       (set-buffer "*Command History*")
-      (Command-history-setup)
+      (command-history-mode)
       (bury-buffer (current-buffer)))
     (if (consp todo)
        (progn (set-buffer old-buffer)
@@ -147,4 +148,6 @@ The Command History listing is recomputed each time this mode is invoked."
       (progn (message "")
             (throw 'electric-history-quit nil))))
 
+(provide 'echistory)
+
 ;;; echistory.el ends here