diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-05-06 00:20:35 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-05-06 00:20:35 -0700 |
| commit | 16e343d68693a1cf92a9f7cefffcf221d9950df8 (patch) | |
| tree | ddde216510391c60fcdba50653e736fc45020f0a /lisp | |
| parent | 7d889a47ec1e7853cb122fd526510df90cd9fa53 (diff) | |
| download | emacs-16e343d68693a1cf92a9f7cefffcf221d9950df8.tar.gz emacs-16e343d68693a1cf92a9f7cefffcf221d9950df8.tar.bz2 emacs-16e343d68693a1cf92a9f7cefffcf221d9950df8.zip | |
* 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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/eshell/em-cmpl.el | 3 |
2 files changed, 5 insertions, 2 deletions
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 <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 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) |