Merge from emacs-24; up to 2012-12-11T09:51:12Z!dmantipov@yandex.ru

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

diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index ce72f752d4265174183b9df34a9cd4d25d0769f3..d795b8226caf546940ceb96030bcb2ad95c93924 100644 (file)
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -1,7 +1,6 @@
 ;;; em-basic.el --- basic shell builtin commands
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -67,14 +66,15 @@
 (require 'esh-opt)
 
 ;;;###autoload
-(eshell-defgroup eshell-basic nil
+(progn
+(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
 not really builtins at all, but offer a command-oriented way to do the
 same thing."
   :tag "Basic shell commands"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 (defcustom eshell-plain-echo-behavior nil
   "If non-nil, `echo' tries to behave like an ordinary shell echo.
@@ -184,5 +184,4 @@ or `eshell-printn' for display."
 ;; generated-autoload-file: "esh-groups.el"
 ;; End:
 
-;; arch-tag: 385a31b1-cb95-46f0-9829-9d352ee77db8
 ;;; em-basic.el ends here