Merge from emacs-23

[bpt/emacs.git] / lisp / eshell / em-smart.el

diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index bc84421..afe3cf8 100644 (file)
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -1,7 +1,7 @@
 ;;; em-smart.el --- smart display of output
 
 ;;; em-smart.el --- smart display of output
 

-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010  Free Software Foundation, Inc.

 
 ;; Author: John Wiegley <johnw@gnu.org>
 
 
 ;; Author: John Wiegley <johnw@gnu.org>
 


@@ -71,7 +71,8 @@
 
 (eval-when-compile (require 'eshell))
 
 
 (eval-when-compile (require 'eshell))
 

-(defgroup eshell-smart nil
+;;;###autoload
+(eshell-defgroup eshell-smart nil

   "This module combines the facility of normal, modern shells with
 some of the edit/review concepts inherent in the design of Plan 9's
 9term.  See the docs for more details.
   "This module combines the facility of normal, modern shells with
 some of the edit/review concepts inherent in the design of Plan 9's
 9term.  See the docs for more details.


@@ -85,7 +86,7 @@ it to get a real sense of how it works."
 ;;; User Variables:
 
 (defcustom eshell-smart-load-hook '(eshell-smart-initialize)
 ;;; User Variables:
 
 (defcustom eshell-smart-load-hook '(eshell-smart-initialize)

-  "*A list of functions to call when loading `eshell-smart'."
+  "A list of functions to call when loading `eshell-smart'."

   :type 'hook
   :group 'eshell-smart)
 
   :type 'hook
   :group 'eshell-smart)
 


@@ -95,12 +96,12 @@ it to get a real sense of how it works."
     (lambda ()
       (remove-hook 'window-configuration-change-hook
                   'eshell-refresh-windows))))
     (lambda ()
       (remove-hook 'window-configuration-change-hook
                   'eshell-refresh-windows))))

-  "*A hook that gets run when `eshell-smart' is unloaded."
+  "A hook that gets run when `eshell-smart' is unloaded."

   :type 'hook
   :group 'eshell-smart)
 
 (defcustom eshell-review-quick-commands nil
   :type 'hook
   :group 'eshell-smart)
 
 (defcustom eshell-review-quick-commands nil

-  "*If t, always review commands.
+  "If t, always review commands.

 Reviewing means keeping point on the text of the command that was just
 invoked, to allow corrections to be made easily.
 
 Reviewing means keeping point on the text of the command that was just
 invoked, to allow corrections to be made easily.
 


@@ -123,12 +124,12 @@ only if that output can be presented in its entirely in the Eshell window."
     yank-pop
     yank-rectangle
     yank)
     yank-pop
     yank-rectangle
     yank)

-  "*A list of commands which cause Eshell to jump to the end of buffer."
+  "A list of commands which cause Eshell to jump to the end of buffer."

   :type '(repeat function)
   :group 'eshell-smart)
 
 (defcustom eshell-smart-space-goes-to-end t
   :type '(repeat function)
   :group 'eshell-smart)
 
 (defcustom eshell-smart-space-goes-to-end t

-  "*If non-nil, space will go to end of buffer when point-max is visible.
+  "If non-nil, space will go to end of buffer when point-max is visible.

 That is, if a command is running and the user presses SPACE at a time
 when the end of the buffer is visible, point will go to the end of the
 buffer and smart-display will be turned off (that is, subsequently
 That is, if a command is running and the user presses SPACE at a time
 when the end of the buffer is visible, point will go to the end of the
 buffer and smart-display will be turned off (that is, subsequently


@@ -147,7 +148,7 @@ buffer using \\[end-of-buffer]."
   :group 'eshell-smart)
 
 (defcustom eshell-where-to-jump 'begin
   :group 'eshell-smart)
 
 (defcustom eshell-where-to-jump 'begin

-  "*This variable indicates where point should jump to after a command.
+  "This variable indicates where point should jump to after a command.

 The options are `begin', `after' or `end'."
   :type '(radio (const :tag "Beginning of command" begin)
                (const :tag "After command word" after)
 The options are `begin', `after' or `end'."
   :type '(radio (const :tag "Beginning of command" begin)
                (const :tag "After command word" after)


@@ -290,7 +291,7 @@ and the end of the buffer are still visible."
        (setq clear t)
       (cond
        ((eq this-command 'self-insert-command)
        (setq clear t)
       (cond
        ((eq this-command 'self-insert-command)

-       (if (eq last-command-char ? )
+       (if (eq last-command-event ? )

            (if (and eshell-smart-space-goes-to-end
                     eshell-current-command)
                (if (not (pos-visible-in-window-p (point-max)))
            (if (and eshell-smart-space-goes-to-end
                     eshell-current-command)
                (if (not (pos-visible-in-window-p (point-max)))


@@ -322,5 +323,9 @@ and the end of the buffer are still visible."
 
 (provide 'em-smart)
 
 
 (provide 'em-smart)
 

+;; Local Variables:
+;; generated-autoload-file: "esh-groups.el"
+;; End:
+

 ;; arch-tag: 8c0112c7-379c-4d54-9a1c-204d68786a4b
 ;;; em-smart.el ends here
 ;; arch-tag: 8c0112c7-379c-4d54-9a1c-204d68786a4b
 ;;; em-smart.el ends here