diff options
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/esh-mode.el | 7 | ||||
| -rw-r--r-- | lisp/eshell/esh-opt.el | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 1ac74f3f52d..8b7338f8833 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -282,8 +282,11 @@ This is used by `eshell-watch-for-password-prompt'." (map-char-table (function (lambda (key val) - (and (>= key 256) - (/= (char-syntax key) ?w) + (and (if (consp key) + (and (>= (car key) 128) + (/= (char-syntax (car key)) ?w)) + (and (>= key 256) + (/= (char-syntax key) ?w))) (modify-syntax-entry key "_ " eshell-mode-syntax-table)))) (standard-syntax-table))))) diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el index 121f568a9c4..66310895131 100644 --- a/lisp/eshell/esh-opt.el +++ b/lisp/eshell/esh-opt.el @@ -196,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)))))))) |