Commit 1d77e15a authored by Jason Rumney's avatar Jason Rumney
Browse files

(set-default-coding-systems, reset-language-environment): Preserve

eols on default-process-coding-system.
(coding-system-change-text-conversion): Fix case where CODING is nil.
parent cf6f437f
2002-04-07 Jason Rumney <jasonr@gnu.org>
* international/mule-cmds.el (set-default-coding-systems)
(reset-language-environment): Preserve eols on
default-process-coding-system.
(coding-system-change-text-conversion): Fix case where CODING is
nil.
2002-04-07 Pavel Jan,Bm(Bk <Pavel@Janik.cz> 2002-04-07 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
* subr.el (play-sound): Move here from simple.el. * subr.el (play-sound): Move here from simple.el.
......
...@@ -211,12 +211,10 @@ The returned coding system converts text by CODING ...@@ -211,12 +211,10 @@ The returned coding system converts text by CODING
but end-of-line as the same way as CODING-SYSTEM. but end-of-line as the same way as CODING-SYSTEM.
If CODING is nil, the returned coding system detects If CODING is nil, the returned coding system detects
how text is formatted automatically while decoding." how text is formatted automatically while decoding."
(if (not coding) (let ((eol-type (coding-system-eol-type coding-system)))
(coding-system-base coding-system) (coding-system-change-eol-conversion
(let ((eol-type (coding-system-eol-type coding-system))) (if coding coding 'undecided)
(coding-system-change-eol-conversion (if (numberp eol-type) (aref [unix dos mac] eol-type)))))
coding
(if (numberp eol-type) (aref [unix dos mac] eol-type))))))
(defun toggle-enable-multibyte-characters (&optional arg) (defun toggle-enable-multibyte-characters (&optional arg)
"Change whether this buffer uses multibyte characters. "Change whether this buffer uses multibyte characters.
...@@ -311,7 +309,19 @@ This also sets the following values: ...@@ -311,7 +309,19 @@ This also sets the following values:
(unless (and (eq window-system 'pc) coding-system) (unless (and (eq window-system 'pc) coding-system)
(setq default-terminal-coding-system coding-system)) (setq default-terminal-coding-system coding-system))
(setq default-keyboard-coding-system coding-system) (setq default-keyboard-coding-system coding-system)
(setq default-process-coding-system (cons coding-system coding-system))) ;; Preserve eol-type from existing default-process-coding-systems.
;; On non-unix-like systems in particular, these may have been set
;; carefully by the user, or by the startup code, to deal with the
;; users shell appropriately, so should not be altered by changing
;; language environment.
(let ((output-coding
(coding-system-change-text-conversion
(car default-process-coding-system) coding-system))
(input-coding
(coding-system-change-text-conversion
(cdr default-process-coding-system) coding-system)))
(setq default-process-coding-system
(cons output-coding input-coding))))
(defalias 'update-iso-coding-systems 'update-coding-systems-internal) (defalias 'update-iso-coding-systems 'update-coding-systems-internal)
(make-obsolete 'update-iso-coding-systems 'update-coding-systems-internal "20.3") (make-obsolete 'update-iso-coding-systems 'update-coding-systems-internal "20.3")
...@@ -1399,7 +1409,19 @@ The default status is as follows: ...@@ -1399,7 +1409,19 @@ The default status is as follows:
(set-default-coding-systems nil) (set-default-coding-systems nil)
(setq default-sendmail-coding-system 'iso-latin-1) (setq default-sendmail-coding-system 'iso-latin-1)
(setq default-process-coding-system '(undecided . iso-latin-1)) ;; Preserve eol-type from existing default-process-coding-systems.
;; On non-unix-like systems in particular, these may have been set
;; carefully by the user, or by the startup code, to deal with the
;; users shell appropriately, so should not be altered by changing
;; language environment.
(let ((output-coding
(coding-system-change-text-conversion
(car default-process-coding-system) 'undecided))
(input-coding
(coding-system-change-text-conversion
(cdr default-process-coding-system) 'iso-latin-1)))
(setq default-process-coding-system
(cons output-coding input-coding)))
;; Don't alter the terminal and keyboard coding systems here. ;; Don't alter the terminal and keyboard coding systems here.
;; The terminal still supports the same coding system ;; The terminal still supports the same coding system
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment