diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/w32-fns.el | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 26aafeb27fc..fc5afd76664 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el | |||
| @@ -149,14 +149,19 @@ You should set this to t when using a non-system shell.\n\n")))) | |||
| 149 | (if default-enable-multibyte-characters | 149 | (if default-enable-multibyte-characters |
| 150 | '(undecided-dos . undecided-unix) | 150 | '(undecided-dos . undecided-unix) |
| 151 | '(raw-text-dos . raw-text-unix))) | 151 | '(raw-text-dos . raw-text-unix))) |
| 152 | (or (w32-using-nt) | 152 | ;; Make cmdproxy default to using DOS line endings for input, |
| 153 | ;; On Windows 9x, make cmdproxy default to using DOS line endings | 153 | ;; because some Windows programs (including command.com) require it. |
| 154 | ;; for input, because command.com requires this. | 154 | (add-to-list 'process-coding-system-alist |
| 155 | (setq process-coding-system-alist | 155 | `("[cC][mM][dD][pP][rR][oO][xX][yY]" |
| 156 | `(("[cC][mM][dD][pP][rR][oO][xX][yY]" | 156 | . ,(if default-enable-multibyte-characters |
| 157 | . ,(if default-enable-multibyte-characters | 157 | '(undecided-dos . undecided-dos) |
| 158 | '(undecided-dos . undecided-dos) | 158 | '(raw-text-dos . raw-text-dos)))) |
| 159 | '(raw-text-dos . raw-text-dos))))))) | 159 | ;; plink needs DOS input when entering the password. |
| 160 | (add-to-list 'process-coding-system-alist | ||
| 161 | `("[pP][lL][iI][nN][kK]" | ||
| 162 | . ,(if default-enable-multibyte-characters | ||
| 163 | '(undecided-dos . undecided-dos) | ||
| 164 | '(raw-text-dos . raw-text-dos))))) | ||
| 160 | 165 | ||
| 161 | (add-hook 'before-init-hook 'set-default-process-coding-system) | 166 | (add-hook 'before-init-hook 'set-default-process-coding-system) |
| 162 | 167 | ||