Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu

[gnu-emacs] / lisp / eshell / em-hist.el

diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index f9ddf3b679f69a04fad49a3b63e717a4481606f2..993e9d63a94a8b7cd30178ce349819bfb652ac98 100644 (file)
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -70,8 +70,9 @@
 
 ;;; User Variables:
 
-(defcustom eshell-hist-load-hook '(eshell-hist-initialize)
+(defcustom eshell-hist-load-hook nil
   "A list of functions to call when loading `eshell-hist'."
+  :version "24.1"                      ; removed eshell-hist-initialize
   :type 'hook
   :group 'eshell-hist)