Add 2011 to FSF/AIST copyright years.

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

diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index ffb1b4a..f988076 100644 (file)
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -1,16 +1,16 @@
 ;;; em-smart.el --- smart display of output
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -73,7 +71,8 @@
 
 (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.
@@ -110,8 +109,8 @@ If set to nil, quick commands won't be reviewed.  A quick command is a
 command that produces no output, and exits successfully.
 
 If set to `not-even-short-output', then the definition of \"quick
-command\" is extended to include commands that produce output, iff
-that output can be presented in its entirely in the Eshell window."
+command\" is extended to include commands that produce output, if and
+only if that output can be presented in its entirely in the Eshell window."
   :type '(choice (const :tag "No" nil)
                 (const :tag "Yes" t)
                 (const :tag "Not even short output"
@@ -292,7 +291,7 @@ and the end of the buffer are still visible."
        (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)))
@@ -324,5 +323,9 @@ and the end of the buffer are still visible."
 
 (provide 'em-smart)
 
-;;; arch-tag: 8c0112c7-379c-4d54-9a1c-204d68786a4b
+;; Local Variables:
+;; generated-autoload-file: "esh-groups.el"
+;; End:
+
+;; arch-tag: 8c0112c7-379c-4d54-9a1c-204d68786a4b
 ;;; em-smart.el ends here