diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/eshell/esh-maint.el | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 702e434452e..60301eae597 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2007-11-25 Glenn Morris <rgm@gnu.org> + * eshell/esh-maint.el (top-level): Move provide statement to the + end of the file. Use require with NOERROR for pcomplete. Don't + mess with load-path. + * eshell/eshell.el (eshell-report-bug-address): Remove. (eshell-report-bug): Redefine as an alias for report-emacs-bug. diff --git a/lisp/eshell/esh-maint.el b/lisp/eshell/esh-maint.el index 61a4ef9510d..c74ec4d25f2 100644 --- a/lisp/eshell/esh-maint.el +++ b/lisp/eshell/esh-maint.el @@ -26,8 +26,6 @@ ;;; Code: -(provide 'esh-maint) - (and (fboundp 'font-lock-add-keywords) (font-lock-add-keywords 'emacs-lisp-mode @@ -35,11 +33,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) @@ -142,5 +136,7 @@ ;; (delete-file "README.texi") ;; (kill-buffer "README.texi")) +(provide 'esh-maint) + ;;; arch-tag: 662089b6-78ec-48c5-b94f-d212279e8902 ;;; esh-maint.el ends here |