merge from upstream

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

diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 46a98b97daac7084e55ab740d64996c98a064e2e..f08fec8f8fa8b35c447cce61d054a6cb4f308aa8 100644 (file)
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -1,7 +1,6 @@
 ;;; em-smart.el --- smart display of output
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -85,8 +84,9 @@ it to get a real sense of how it works."
 
 ;;; User Variables:
 
-(defcustom eshell-smart-load-hook '(eshell-smart-initialize)
+(defcustom eshell-smart-load-hook nil
   "A list of functions to call when loading `eshell-smart'."
+  :version "24.1"                      ; removed eshell-smart-initialize
   :type 'hook
   :group 'eshell-smart)
 
@@ -327,5 +327,4 @@ and the end of the buffer are still visible."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 8c0112c7-379c-4d54-9a1c-204d68786a4b
 ;;; em-smart.el ends here