diff options
Diffstat (limited to 'lisp/eshell/esh-opt.el')
| -rw-r--r-- | lisp/eshell/esh-opt.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el index 0439f21a7c6..54137ee8cd2 100644 --- a/lisp/eshell/esh-opt.el +++ b/lisp/eshell/esh-opt.el @@ -22,9 +22,11 @@ ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. +;;; Commentary: + (provide 'esh-opt) -(eval-when-compile (require 'esh-maint)) +(eval-when-compile (require 'esh-ext)) (defgroup eshell-opt nil "The options processing code handles command argument parsing for @@ -32,8 +34,6 @@ Eshell commands implemented in Lisp." :tag "Command options processing" :group 'eshell) -;;; Commentary: - ;;; User Functions: (defmacro eshell-eval-using-options (name macro-args @@ -58,6 +58,7 @@ BODY-FORMS. If instead an external command is run, the tag Lastly, any remaining arguments will be available in a locally interned variable `args' (created using a `let' form)." + (declare (debug (form form sexp body))) `(let ((temp-args ,(if (memq ':preserve-args (cadr options)) macro-args @@ -101,7 +102,7 @@ This code doesn't really need to be macro expanded everywhere." nil)) (error "%s" usage-msg)))) (throw 'eshell-external - (eshell-external-command ext-command args)) + (eshell-external-command ext-command args)) last-value)) (defun eshell-show-usage (name options) @@ -195,7 +196,7 @@ switch is unrecognized." (setq extcmd (eshell-search-path (cadr extcmd))) (if extcmd (throw 'eshell-ext-command extcmd) - (if (char-valid-p switch) + (if (characterp switch) (error "%s: unrecognized option -%c" name switch) (error "%s: unrecognized option --%s" name switch)))))))) |