summaryrefslogtreecommitdiff
path: root/doc/lispref/nonascii.texi
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2013-12-25 18:24:52 +0800
committerChong Yidong <cyd@gnu.org>2013-12-25 18:24:52 +0800
commitc93525876d67837669c5e8f89b6606b4cfb55ec4 (patch)
tree9518ab8234c570b12cdf9f6964c895e47c9a49e8 /doc/lispref/nonascii.texi
parentff1c842a9477dee39fa20f885d64288b4947a040 (diff)
downloademacs-c93525876d67837669c5e8f89b6606b4cfb55ec4.tar.gz
Doc updates for several Emacs 24.4 changes.
* doc/lispref/commands.texi (Event Input Misc): Document new arg to input-pending-p. * doc/lispref/display.texi (Font Selection): Tweak example. * doc/lispref/keymaps.texi (Active Keymaps): Re-organize the text. (Searching Keymaps): Rewrite the pseudo-code for 24.4 changes. (Controlling Active Maps): Note that set-transient-map uses overriding-terminal-local-map. * doc/lispref/nonascii.texi (Specifying Coding Systems): Don't refer to emacs-mule-dos. (Lisp and Coding Systems): Describe emacs-mule return value in modern terms. * doc/lispref/tips.texi (Coding Conventions): Tweak the coding system tip; Emacs now uses utf-8 by default for Emacs Lisp source files. * doc/emacs/glossary.texi (Glossary): Define MULE in modern terms. * src/keyboard.c (Voverriding_terminal_local_map): (Voverriding_local_map): Doc fix. * src/keymap.c (Vemulation_mode_map_alists): Doc fix.
Diffstat (limited to 'doc/lispref/nonascii.texi')
-rw-r--r--doc/lispref/nonascii.texi16
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index ddbb5aeaa6b..7b499159d93 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1289,17 +1289,18 @@ Sets}) supported by @var{coding-system}. Some coding systems that
support too many character sets to list them all yield special values:
@itemize @bullet
@item
-If @var{coding-system} supports all the ISO-2022 charsets, the value
-is @code{iso-2022}.
-@item
If @var{coding-system} supports all Emacs characters, the value is
@code{(emacs)}.
@item
-If @var{coding-system} supports all emacs-mule characters, the value
-is @code{emacs-mule}.
-@item
If @var{coding-system} supports all Unicode characters, the value is
@code{(unicode)}.
+@item
+If @var{coding-system} supports all ISO-2022 charsets, the value is
+@code{iso-2022}.
+@item
+If @var{coding-system} supports all the characters in the internal
+coding system used by Emacs version 21 (prior to the implementation of
+internal Unicode support), the value is @code{emacs-mule}.
@end itemize
@end defun
@@ -1617,8 +1618,7 @@ of the right way to use the variable:
@example
;; @r{Read the file with no character code conversion.}
-;; @r{Assume @acronym{crlf} represents end-of-line.}
-(let ((coding-system-for-read 'emacs-mule-dos))
+(let ((coding-system-for-read 'no-conversion))
(insert-file-contents filename))
@end example