* lisp/eshell/em-cmpl.el: Simply require pcomplete;

eg we use a bunch of its defcustom properties.
(eshell-cmpl-initialize): No need to load pcomplete.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 84f80c330f33816c8d3f69aa560e24463008b6d3..9da2195fe0706ee68652292c9b01a6d4cf9f18d4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2013-05-06  Glenn Morris  <rgm@gnu.org>
 
+       * eshell/em-cmpl.el: Simply require pcomplete; eg we use a bunch
+       of its defcustom properties.
+       (eshell-cmpl-initialize): No need to load pcomplete.
+
        * generic-x.el: No need to require comint when compiling.
 
        * net/eudc-export.el: Make it loadable without bbdb.

diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index 91311deffcffa3f8e65df4f6e3cefa58bad92867..4f4b8dd3276b4b93e94bb2f2550670689cec11fc 100644 (file)
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -68,6 +68,7 @@
 ;; with sufficient pointers to locate the relevant help text.
 
 ;;; Code:
+(require 'pcomplete)
 
 (eval-when-compile
   (require 'cl-lib)
@@ -242,8 +243,6 @@ to writing a completion function."
 
 (defun eshell-cmpl-initialize ()
   "Initialize the completions module."
-  (unless (fboundp 'pcomplete)
-    (load "pcmpl-auto" t t))
   (set (make-local-variable 'pcomplete-command-completion-function)
        eshell-command-completion-function)
   (set (make-local-variable 'pcomplete-command-name-function)