(set-default-process-coding-system): Use dos line ends

for input to cmdproxy on all versions of Windows.
Use dos line ends for input to plink.

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"))))
         (if default-enable-multibyte-characters
             '(undecided-dos . undecided-unix)
           '(raw-text-dos . raw-text-unix)))
-  (or (w32-using-nt)
-      ;; On Windows 9x, make cmdproxy default to using DOS line endings
-      ;; for input, because command.com requires this.
-      (setq process-coding-system-alist
-            `(("[cC][mM][dD][pP][rR][oO][xX][yY]"
-               . ,(if default-enable-multibyte-characters
-                      '(undecided-dos . undecided-dos)
-                    '(raw-text-dos . raw-text-dos)))))))
+  ;; Make cmdproxy default to using DOS line endings for input,
+  ;; because some Windows programs (including command.com) require it.
+  (add-to-list 'process-coding-system-alist
+               `("[cC][mM][dD][pP][rR][oO][xX][yY]"
+                 . ,(if default-enable-multibyte-characters
+                        '(undecided-dos . undecided-dos)
+                      '(raw-text-dos . raw-text-dos))))
+  ;; plink needs DOS input when entering the password.
+  (add-to-list 'process-coding-system-alist
+               `("[pP][lL][iI][nN][kK]"
+                 . ,(if default-enable-multibyte-characters
+                        '(undecided-dos . undecided-dos)
+                      '(raw-text-dos . raw-text-dos)))))
 
 (add-hook 'before-init-hook 'set-default-process-coding-system)