[Emacs-diffs] /srv/bzr/emacs/trunk r112474: * lisp/eshell/em-cmpl.el: Simply require pcomplete;

[Glenn Morris]

------------------------------------------------------------
revno: 112474
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-05-06 00:20:35 -0700
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/eshell/em-cmpl.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-06 07:18:36 +0000
+++ b/lisp/ChangeLog    2013-05-06 07:20:35 +0000
@@ -1,5 +1,9 @@
 2013-05-06  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/eshell/em-cmpl.el'
--- a/lisp/eshell/em-cmpl.el    2013-02-24 05:34:22 +0000
+++ b/lisp/eshell/em-cmpl.el    2013-05-06 07:20:35 +0000
@@ -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 @@
 
 (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)