Merge from emacs-24; up to 2012-04-21T14:12:27Z!sdl.web@gmail.com

2 files changed, 11 insertions, 2 deletions

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 1191b0de919..e556fa7e998 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-09  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.
+        (Void Function, Wrong Type of Argument, Recursion with list)
+        (Simple Extension): Assume a non-ancient Emacs.
+        (Void Variable, Switching Buffers): Improve page breaks.
+
+        * emacs-lisp-intro.texi: Update GNU Press contact details.
+
 2012-05-05  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 1c9cd213830..9446333db2a 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -238,7 +238,7 @@ GNU Press,               @hfill @uref{http://www.fsf.org/campaigns/gnu-press/}@*
 a division of the               @hfill email: @email{sales@@fsf.org}@*
 Free Software Foundation, Inc.  @hfill Tel: +1 (617) 542-5942@*
 51 Franklin Street, Fifth Floor @hfill Fax: +1 (617) 542-2652@*
-Boston, MA 02110-1301 USA
+Boston, MA 02110-1301 USA       
 @end iftex
 
 @ifnottex
@@ -249,7 +249,7 @@ GNU Press,                        http://www.fsf.org/campaigns/gnu-press/
 a division of the                 email: sales@@fsf.org
 Free Software Foundation, Inc.    Tel: +1 (617) 542-5942
 51 Franklin Street, Fifth Floor   Fax: +1 (617) 542-2652
-Boston, MA 02110-1301 USA
+Boston, MA 02110-1301 USA          
 @end example
 @end ifnottex