From: Glenn Morris Date: Mon, 6 May 2013 07:20:35 +0000 (-0700) Subject: * lisp/eshell/em-cmpl.el: Simply require pcomplete; X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~288 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=16e343d68693a1cf92a9f7cefffcf221d9950df8;p=emacs.git * 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 84f80c330f3..9da2195fe07 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2013-05-06 Glenn Morris + * 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 91311deffcf..4f4b8dd3276 100644 --- 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)