diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-15 02:05:20 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-15 02:05:20 +0000 |
| commit | 7eb1e4534e88a32fe5e549e630fdabf3e062be2b (patch) | |
| tree | 34fc72789f1cfbfeb067cf507f8871c322df300a /lisp/w32-fns.el | |
| parent | 76d11d2cf9623e9f4c38e8239c4444ffc1fae485 (diff) | |
| parent | 6f8a87c027ebd6f9cfdac5c0df97d651227bec62 (diff) | |
| download | emacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.tar.gz emacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.tar.bz2 emacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 803-813)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 51-58)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-236)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
Diffstat (limited to 'lisp/w32-fns.el')
| -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")))) (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) |