Merge from emacs--rel--22

[bpt/emacs.git] / lisp / eshell / esh-maint.el

diff --git a/lisp/eshell/esh-maint.el b/lisp/eshell/esh-maint.el
index 090e86f..3398014 100644 (file)
--- a/lisp/eshell/esh-maint.el
+++ b/lisp/eshell/esh-maint.el
@@ -1,12 +1,15 @@
-;;; esh-maint --- init code for building eshell
+;;; esh-maint.el --- init code for building eshell -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1999, 2000 Free Software Foundation
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 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
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -16,13 +19,15 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
 ;;; Code:
 
+;; This cannot be moved to the end of the file without causing a
+;; recursive require during bootstrap.
 (provide 'esh-maint)
 
 (and (fboundp 'font-lock-add-keywords)
@@ -32,11 +37,7 @@
        ("(eshell-deftest\\>"        . font-lock-keyword-face)
        ("(eshell-condition-case\\>" . font-lock-keyword-face))))
 
-(if (file-directory-p "../pcomplete")
-    (add-to-list 'load-path "../pcomplete"))
-
-(if (locate-library "pcomplete")
-    (require 'pcomplete))
+(require 'pcomplete nil t)              ; why?
 
 (eval-when-compile
   (require 'cl)
@@ -46,7 +47,7 @@
 ;;   (interactive)
 ;;   (require 'autoload)
 ;;   (setq generated-autoload-file
-;;     (expand-file-name (car command-line-args-left)))
+;;     (expand-file-name (car command-line-args-left)))
 ;;   (setq command-line-args-left (cdr command-line-args-left))
 ;;   (batch-update-autoloads))
 
@@ -63,23 +64,23 @@
 ;; Core Functionality\n")
 ;;   (eshell-for module
 ;;       (sort (eshell-subgroups 'eshell)
-;;         (function
-;;          (lambda (a b)
-;;            (string-lessp (symbol-name a)
-;;                          (symbol-name b)))))
+;;         (function
+;;          (lambda (a b)
+;;            (string-lessp (symbol-name a)
+;;                          (symbol-name b)))))
 ;;     (insert (format "* %-34s"
-;;                 (concat (get module 'custom-tag) "::"))
-;;         (symbol-name module) ".\n"))
+;;                 (concat (get module 'custom-tag) "::"))
+;;         (symbol-name module) ".\n"))
 ;;   (insert "\nOptional Functionality\n")
 ;;   (eshell-for module
 ;;       (sort (eshell-subgroups 'eshell-module)
-;;         (function
-;;          (lambda (a b)
-;;            (string-lessp (symbol-name a)
-;;                          (symbol-name b)))))
+;;         (function
+;;          (lambda (a b)
+;;            (string-lessp (symbol-name a)
+;;                          (symbol-name b)))))
 ;;     (insert (format "* %-34s"
-;;                 (concat (get module 'custom-tag) "::"))
-;;         (symbol-name module) ".\n"))
+;;                 (concat (get module 'custom-tag) "::"))
+;;         (symbol-name module) ".\n"))
 ;;   (insert "@end menu\n"))
 
 ;; (defun eshell-make-texi ()
@@ -89,27 +90,27 @@
 ;;   (require 'texidoc)
 ;;   (require 'pcomplete)
 ;;   (apply 'texidoc-files 'eshell-generate-main-menu "eshell.doci"
-;;      (append
-;;       (list "eshell.el")
-;;       (sort (mapcar
-;;              (function
-;;               (lambda (sym)
-;;                 (let ((name (symbol-name sym)))
-;;                   (if (string-match "\\`eshell-\\(.*\\)" name)
-;;                       (setq name (concat "esh-" (match-string 1 name))))
-;;                   (concat name ".el"))))
-;;              (eshell-subgroups 'eshell))
-;;             'string-lessp)
-;;       (sort (mapcar
-;;              (function
-;;               (lambda (sym)
-;;                 (let ((name (symbol-name sym)))
-;;                   (if (string-match "\\`eshell-\\(.*\\)" name)
-;;                       (setq name (concat "em-" (match-string 1 name))))
-;;                   (concat name ".el"))))
-;;              (eshell-subgroups 'eshell-module))
-;;             'string-lessp)
-;;       (list "eshell.texi"))))
+;;      (append
+;;       (list "eshell.el")
+;;       (sort (mapcar
+;;              (function
+;;               (lambda (sym)
+;;                 (let ((name (symbol-name sym)))
+;;                   (if (string-match "\\`eshell-\\(.*\\)" name)
+;;                       (setq name (concat "esh-" (match-string 1 name))))
+;;                   (concat name ".el"))))
+;;              (eshell-subgroups 'eshell))
+;;             'string-lessp)
+;;       (sort (mapcar
+;;              (function
+;;               (lambda (sym)
+;;                 (let ((name (symbol-name sym)))
+;;                   (if (string-match "\\`eshell-\\(.*\\)" name)
+;;                       (setq name (concat "em-" (match-string 1 name))))
+;;                   (concat name ".el"))))
+;;              (eshell-subgroups 'eshell-module))
+;;             'string-lessp)
+;;       (list "eshell.texi"))))
 
 ;; (defun eshell-make-readme ()
 ;;   "Make the README file from eshell.el."
@@ -139,4 +140,5 @@
 ;;   (delete-file "README.texi")
 ;;   (kill-buffer "README.texi"))
 
+;;; arch-tag: 662089b6-78ec-48c5-b94f-d212279e8902
 ;;; esh-maint.el ends here