diff options
| author | Eli Zaretskii | 2009-01-24 15:55:55 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2009-01-24 15:55:55 +0000 |
| commit | d8cb7e3da48c23d0199275f21ef5a50302049f55 (patch) | |
| tree | 5a1ab7ecccd8a9037a28361475767833aa875d5f | |
| parent | 6c60bbdbb3beafe96cadfa2856e006b4e3602f17 (diff) | |
| download | emacs-d8cb7e3da48c23d0199275f21ef5a50302049f55.tar.gz emacs-d8cb7e3da48c23d0199275f21ef5a50302049f55.zip | |
(prefer-coding-system, set-default-coding-systems): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 27ec14a138b..d397d380ab1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * international/mule-cmds.el (set-language-environment-coding-systems): If | 3 | * international/mule-cmds.el (set-language-environment-coding-systems): If |
| 4 | default-buffer-file-coding-system is nil, set up to have EOLs that | 4 | default-buffer-file-coding-system is nil, set up to have EOLs that |
| 5 | are native for the underlying system-type. | 5 | are native for the underlying system-type. |
| 6 | (prefer-coding-system, set-default-coding-systems): Doc fix. | ||
| 6 | 7 | ||
| 7 | 2009-01-24 Juanma Barranquero <lekktu@gmail.com> | 8 | 2009-01-24 Juanma Barranquero <lekktu@gmail.com> |
| 8 | 9 | ||
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 4ec283386a9..a354a10850e 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el | |||
| @@ -330,7 +330,7 @@ This sets the following coding systems: | |||
| 330 | This also sets the following values: | 330 | This also sets the following values: |
| 331 | o default value used as `file-name-coding-system' for converting file names | 331 | o default value used as `file-name-coding-system' for converting file names |
| 332 | if CODING-SYSTEM is ASCII-compatible | 332 | if CODING-SYSTEM is ASCII-compatible |
| 333 | o default value for the command `set-terminal-coding-system' (not on MS-DOS) | 333 | o default value for the command `set-terminal-coding-system' |
| 334 | o default value for the command `set-keyboard-coding-system' | 334 | o default value for the command `set-keyboard-coding-system' |
| 335 | if CODING-SYSTEM is ASCII-compatible" | 335 | if CODING-SYSTEM is ASCII-compatible" |
| 336 | (check-coding-system coding-system) | 336 | (check-coding-system coding-system) |
| @@ -370,17 +370,12 @@ This also sets the following coding systems: | |||
| 370 | o default coding system for subprocess I/O | 370 | o default coding system for subprocess I/O |
| 371 | This also sets the following values: | 371 | This also sets the following values: |
| 372 | o default value used as `file-name-coding-system' for converting file names | 372 | o default value used as `file-name-coding-system' for converting file names |
| 373 | o default value for the command `set-terminal-coding-system' (not on MS-DOS) | 373 | o default value for the command `set-terminal-coding-system' |
| 374 | o default value for the command `set-keyboard-coding-system' | 374 | o default value for the command `set-keyboard-coding-system' |
| 375 | 375 | ||
| 376 | If CODING-SYSTEM specifies a certain type of EOL conversion, the coding | 376 | If CODING-SYSTEM specifies a certain type of EOL conversion, the coding |
| 377 | systems set by this function will use that type of EOL conversion. | 377 | systems set by this function will use that type of EOL conversion. |
| 378 | 378 | ||
| 379 | This command does not change the default value of terminal coding system | ||
| 380 | for MS-DOS terminal, because DOS terminals only support a single coding | ||
| 381 | system, and Emacs automatically sets the default to that coding system at | ||
| 382 | startup. | ||
| 383 | |||
| 384 | A coding system that requires automatic detection of text+encoding | 379 | A coding system that requires automatic detection of text+encoding |
| 385 | \(e.g. undecided, unix) can't be preferred." | 380 | \(e.g. undecided, unix) can't be preferred." |
| 386 | (interactive "zPrefer coding system: ") | 381 | (interactive "zPrefer coding system: ") |