Switch to recommended form of GPLv3 permissions notice.

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

diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index 427eed3..b3c3d1b 100644 (file)
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -1,15 +1,16 @@
 ;;; em-xtra.el --- extra alias functions
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008 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 2, 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
@@ -17,13 +18,16 @@
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-(provide 'em-xtra)
+;;; Commentary:
+
+;;; Code:
 
-(eval-when-compile (require 'esh-maint))
+(eval-when-compile
+  (require 'eshell)
+  (require 'pcomplete))
+(require 'compile)
 
 (defgroup eshell-xtra nil
   "This module defines some extra alias functions which are entirely
@@ -33,10 +37,6 @@ naturally accessible within Emacs."
   :tag "Extra alias functions"
   :group 'eshell-module)
 
-;;; Commentary:
-
-(require 'compile)
-
 ;;; Functions:
 
 (defun eshell/expr (&rest args)
@@ -116,6 +116,7 @@ naturally accessible within Emacs."
 
 (defalias 'pcomplete/bcc 'pcomplete/bcc32)
 
-;;; Code:
+(provide 'em-xtra)
 
+;; arch-tag: f944cfda-a118-470c-a0d6-b41a3a5c99c7
 ;;; em-xtra.el ends here