merge from upstream

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

diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index be78113d5392c9454357edc77eeff4e0dbb96fd4..df1987e13ee0824ead13a9bbc601a02c457537b5 100644 (file)
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -1,16 +1,15 @@
 ;;; em-basic.el --- basic shell builtin commands
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999-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 +17,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:
 
@@ -65,9 +62,11 @@
 (eval-when-compile
   (require 'esh-util))
 
+(require 'eshell)
 (require 'esh-opt)
 
-(defgroup eshell-basic nil
+;;;###autoload
+(eshell-defgroup eshell-basic nil
   "The \"basic\" code provides a set of convenience functions which
 are traditionally considered shell builtins.  Since all of the
 functionality provided by them is accessible through Lisp, they are
@@ -77,7 +76,7 @@ same thing."
   :group 'eshell-module)
 
 (defcustom eshell-plain-echo-behavior nil
-  "*If non-nil, `echo' tries to behave like an ordinary shell echo.
+  "If non-nil, `echo' tries to behave like an ordinary shell echo.
 This comes at some detriment to Lisp functionality.  However, the Lisp
 equivalent of `echo' can always be achieved by using `identity'."
   :type 'boolean
@@ -125,7 +124,7 @@ or `eshell-printn' for display."
    (eshell-echo args output-newline)))
 
 (defun eshell/printnl (&rest args)
-  "Print out each of the argument, separated by newlines."
+  "Print out each of the arguments, separated by newlines."
   (let ((elems (eshell-flatten-list args)))
     (while elems
       (eshell-printn (eshell-echo (list (car elems))))
@@ -180,5 +179,8 @@ or `eshell-printn' for display."
 
 (provide 'em-basic)
 
-;;; arch-tag: 385a31b1-cb95-46f0-9829-9d352ee77db8
+;; Local Variables:
+;; generated-autoload-file: "esh-groups.el"
+;; End:
+
 ;;; em-basic.el ends here