diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-04-09 14:57:29 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-04-09 14:57:29 -0400 |
| commit | a017927c9ff627a0adf19ac3720bf6b2e77e5da5 (patch) | |
| tree | 687b8337af5fdda2109168b200467b48609e3080 /lisp/eshell/em-pred.el | |
| parent | 1055eee692b2cdcee5ba7ee4ad8d92ead8fc30e5 (diff) | |
| download | emacs-a017927c9ff627a0adf19ac3720bf6b2e77e5da5.tar.gz emacs-a017927c9ff627a0adf19ac3720bf6b2e77e5da5.tar.bz2 emacs-a017927c9ff627a0adf19ac3720bf6b2e77e5da5.zip | |
Fix up Eshell 'require's after previous dependency reshuffle.
* lisp/eshell/em-unix.el:
* lisp/eshell/em-script.el:
* lisp/eshell/em-pred.el:
* lisp/eshell/em-dirs.el:
* lisp/eshell/em-alias.el:
Fix up 'require's to silence byte-compiler.
* lisp/eshell/esh-util.el (eshell-read-hosts-file): Don't limit number
of entries per line. Preserve the structure.
(eshell-read-hosts): Adjust accordingly.
Diffstat (limited to 'lisp/eshell/em-pred.el')
| -rw-r--r-- | lisp/eshell/em-pred.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index dd3351b14d3..9bc856a2966 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -46,9 +46,7 @@ ;;; Code: -(require 'esh-util) -(require 'esh-arg) -(eval-when-compile (require 'eshell)) +(require 'esh-mode) ;;;###autoload (progn @@ -247,10 +245,10 @@ EXAMPLES: (lambda () (insert eshell-modifier-help-string))))) -(defun eshell-pred-initialize () +(defun eshell-pred-initialize () ;Called from `eshell-mode' via intern-soft! "Initialize the predicate/modifier code." (add-hook 'eshell-parse-argument-hook - 'eshell-parse-arg-modifier t t) + #'eshell-parse-arg-modifier t t) (define-key eshell-command-map [(meta ?q)] 'eshell-display-predicate-help) (define-key eshell-command-map [(meta ?m)] 'eshell-display-modifier-help)) |