summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-09-04 16:58:01 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-09-04 16:58:01 -0700
commit1c262cae409ec55a234c89b3b74a13a77c7f595a (patch)
tree2780610d6227a3b1f64aa9398f21501ce3de774e /doc
parent7f59d9c856de33b97bc3f2708dcc8dadf24ee040 (diff)
parent052bd38a56ad14a7f311677051e778de6c4bdc1c (diff)
downloademacs-1c262cae409ec55a234c89b3b74a13a77c7f595a.tar.gz
Merge from trunk.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/basic.texi4
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2407d7dd18f..56958417300 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-04 Eli Zaretskii <eliz@gnu.org>
+
+ * basic.texi (Inserting Text): Add index entries. (Bug#9433)
+
2011-08-29 Chong Yidong <cyd@stupidchicken.com>
* modes.texi (Choosing Modes): auto-mode-case-fold is now t.
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index edf07859e52..b06391f004c 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -101,7 +101,9 @@ character to insert (@pxref{Arguments}).
@findex ucs-insert
@kindex C-x 8 RET
-@cindex Unicode
+@cindex Unicode characters, inserting
+@cindex insert Unicode character
+@cindex characters, inserting by name or code-point
Instead of @kbd{C-q}, you can use @kbd{C-x 8 @key{RET}}
(@code{ucs-insert}) to insert a character based on its Unicode name or
code-point. This command prompts for a character to insert, using