summaryrefslogtreecommitdiff
path: root/doc/emacs
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/emacs
parentff1c842a9477dee39fa20f885d64288b4947a040 (diff)
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/emacs')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/glossary.texi12
-rw-r--r--doc/emacs/mule.texi1
3 files changed, 13 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 9b6868857e..96008f63e9 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-25 Chong Yidong <cyd@gnu.org>
+
+ * glossary.texi (Glossary): Define MULE in modern terms.
+
2013-12-25 Xue Fuqiao <xfq.free@gmail.com>
* files.texi (Diff Mode): Add an index.
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index c8b4b40416..d6c8477b1c 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -953,9 +953,15 @@ another. The usual way to move text is by killing (q.v.@:) it and then
yanking (q.v.@:) it. @xref{Killing}.
@item MULE
-MULE refers to the Emacs features for editing multilingual
-non-@acronym{ASCII} text using multibyte characters (q.v.).
-@xref{International}.
+@cindex MULE
+Prior to Emacs 23, @acronym{MULE} was the name of a software package
+which provided a @dfn{MULtilingual Enhancement} to Emacs, by adding
+support for multiple character sets (q.v.). @acronym{MULE} was later
+integrated into Emacs, and much of it was replaced when Emacs gained
+internal Unicode support in version 23.
+
+Some parts of Emacs that deal with character set support still use the
+@acronym{MULE} name. @xref{International}.
@item Multibyte Character
A multibyte character is a character that takes up several bytes in a
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 6efbc2b719..e0653c96f8 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -5,7 +5,6 @@
@chapter International Character Set Support
@c This node is referenced in the tutorial. When renaming or deleting
@c it, the tutorial needs to be adjusted. (TUTORIAL.de)
-@cindex MULE
@cindex international scripts
@cindex multibyte characters
@cindex encoding of characters