Merge from emacs--devo--0

[gnu-emacs] / lisp / eshell / esh-mode.el

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 9620d30bcd517a88fd25ca9dece6e34dd9a83cb0..789af2605f992b5f6bc6c274dd8edc038f375676 100644 (file)
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -276,8 +276,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)))))