* emacs-lisp-intro.texi (Syntax): Reword to avoid underfull hbox.

2 files changed, 14 insertions, 2 deletions

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index aae78b4aff1..5e81e4d080b 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-28  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp-intro.texi (Syntax): Reword to avoid underfull hbox.
+
 2012-04-07  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in: Replace non-portable use of $< in ordinary rules.
@@ -498,7 +502,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 6a9927b785f..b2b30978144 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -1084,6 +1084,14 @@ Robert J. Chassell
 \fi
 @end tex
 
+@c Note: this resetting of the page number back to 1 causes TeX to gripe
+@c about already having seen page numbers 1-4 before (in the preface):
+@c   pdfTeX warning (ext4): destination with the same identifier (name{1})
+@c   has been already used, duplicate ignored
+@c I guess that is harmless (what happens if a later part of the text
+@c makes a link to something in the first 4 pages though?).
+@c Note that eg the Emacs manual has a preface, but does not bother
+@c resetting the page numbers back to 1 after that.
 @iftex
 @headings off
 @evenheading @thispage @| @| @thischapter
@@ -14855,7 +14863,7 @@ action would serve our purpose, except that a hyphen is merely the
 most common character within symbols that is not typically a word
 constituent character; there are others, too.
 
-Alternatively, we can redefine the regular expression used in the
+Alternatively, we can redefine the regexp used in the
 @code{@value{COUNT-WORDS}} definition so as to include symbols.  This
 procedure has the merit of clarity, but the task is a little tricky.