(Character Type, String Type): Merge in some menu descriptions from elisp.texi.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b5f5a8fb0fbc2c3853f021f865c66d94b11df34e..ec0c588cb5660bc3c3b2dd5a2618e2f95394f0b5 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -2,6 +2,7 @@
 
        * customize.texi (Customization Types):
        * display.texi (Abstract Display):
+       * objects.texi (Character Type, String Type):
        Merge in some menu descriptions from elisp.texi.
 
        * hash.texi (Hash Tables):

diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 9910740f8af2d92bfc4d3e21c9fb0cf38d92b30c..cbfafdbb309e723d190c4e73c8ae2b526d16df0f 100644 (file)
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1,7 +1,8 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
-@c   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+@c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/objects
 @node Lisp Data Types, Numbers, Introduction, Top
@@ -243,11 +244,11 @@ description of a character for the sake of messages.  @xref{Describing
 Characters}.
 
 @menu
-* Basic Char Syntax::
-* General Escape Syntax::
-* Ctl-Char Syntax::
-* Meta-Char Syntax::
-* Other Char Bits::
+* Basic Char Syntax::      Syntax for regular characters.
+* General Escape Syntax::  How to specify characters by their codes.
+* Ctl-Char Syntax::        Syntax for control characters.
+* Meta-Char Syntax::       Syntax for meta-characters.
+* Other Char Bits::        Syntax for hyper-, super-, and alt-characters.
 @end menu
 
 @node Basic Char Syntax
@@ -975,10 +976,10 @@ of a string returns the same string.
   @xref{Strings and Characters}, for functions that operate on strings.
 
 @menu
-* Syntax for Strings::
-* Non-ASCII in Strings::
-* Nonprinting Characters::
-* Text Props and Strings::
+* Syntax for Strings::      How to specify Lisp strings.
+* Non-ASCII in Strings::    International characters in strings.
+* Nonprinting Characters::  Literal unprintable characters in strings.
+* Text Props and Strings::  Strings with text properties.
 @end menu
 
 @node Syntax for Strings