summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2007-07-22 22:53:48 +0000
committerJason Rumney <jasonr@gnu.org>2007-07-22 22:53:48 +0000
commit15ba3e96a7dd5cea828b80be8384457bc96b659a (patch)
tree5a27fa37b2e46c7a4cc82aa120671703a918796e
parentcf0e67b1af141bc4e9d14d56d9fbbe19a1ab3114 (diff)
downloademacs-15ba3e96a7dd5cea828b80be8384457bc96b659a.tar.gz
(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.
-rw-r--r--lisp/w32-fns.el21
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)