Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-305
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-306
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-307
   Update from CVS: lispref/display.texi (Forcing Redisplay): Fix typo.

 * emacs@sv.gnu.org/emacs--devo--0--patch-308
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-309
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-310
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-311
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-312
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-313
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-314
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-315
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-316
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-317
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-318
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-319
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-320
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-321
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-322
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-323
   lisp/play/cookie1.el (cookie): Work properly when there's only one entry

 * emacs@sv.gnu.org/emacs--devo--0--patch-324
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-325
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-326
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-327
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-328
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-329
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-330
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-105
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-106
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-107
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-108
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-109
   Clean up merge mistakes

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-110
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-571

1 files changed, 8 insertions, 4 deletions

diff --git a/lispref/objects.texi b/lispref/objects.texi
index 688fd0be398..ec4f30076c4 100644
--- a/lispref/objects.texi
+++ b/lispref/objects.texi
@@ -438,11 +438,12 @@ the Unicode code point @samp{U+@var{nnnn}}.  There is a slightly
 different syntax for specifying characters with code points above
 @code{#xFFFF}; @code{\U00@var{nnnnnn}} represents the character whose
 Unicode code point is @samp{U+@var{nnnnnn}}, if such a character
-is supported by Emacs.
+is supported by Emacs.  If the corresponding character is not
+supported, Emacs signals an error.
 
-  Unlike in some other programming languages, in Emacs Lisp this
-syntax is available for character literals, and (see later) in
-strings, but not elsewhere.
+  This peculiar and inconvenient syntax was adopted for compatibility
+with other programming languages.  Unlike some other languages, Emacs
+Lisp supports this syntax in only character literals and strings.
 
 @cindex @samp{\} in character constant
 @cindex backslash in character constant
@@ -1013,6 +1014,9 @@ this produces a unibyte string.  However, using any hex escape in a
 string (even for an @acronym{ASCII} character) forces the string to be
 multibyte.
 
+  You can also specify characters in a string by their numeric values
+in Unicode, using @samp{\u} and @samp{\U} (@pxref{Character Type}).
+
   @xref{Text Representations}, for more information about the two
 text representations.