diff options
| -rw-r--r-- | lisp/eshell/em-cmpl.el | 2 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el index 8afc57bd75e..0b19d1be698 100644 --- a/lisp/eshell/em-cmpl.el +++ b/lisp/eshell/em-cmpl.el @@ -380,7 +380,7 @@ to writing a completion function." (setq val (number-to-string val))) ;; expand .../ etc that only eshell understands to ;; standard ../../ - ((string-match "\\.\\.\\.+/" val) + ((and (stringp val)) (string-match "\\.\\.\\.+/" val) (setq val (eshell-expand-multiple-dots val)))) (or val ""))) args) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 7f9b14bdfd9..fa1381df094 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1874,7 +1874,7 @@ The default status is as follows: (set-default-coding-systems nil) (setq default-sendmail-coding-system 'utf-8) (setq default-file-name-coding-system (if (memq system-type - '(window-nt ms-dos)) + '(windows-nt ms-dos)) 'iso-latin-1-unix 'utf-8-unix)) ;; Preserve eol-type from existing default-process-coding-systems. @@ -1893,9 +1893,9 @@ The default status is as follows: (condition-case nil (coding-system-change-text-conversion (cdr default-process-coding-system) - (if (memq system-type '(window-nt ms-dos)) 'iso-latin-1 'utf-8)) + (if (memq system-type '(windows-nt ms-dos)) 'iso-latin-1 'utf-8)) (coding-system-error - (if (memq system-type '(window-nt ms-dos)) 'iso-latin-1 'utf-8))))) + (if (memq system-type '(windows-nt ms-dos)) 'iso-latin-1 'utf-8))))) (setq default-process-coding-system (cons output-coding input-coding))) |