Merge from origin/emacs-24

8b5f2f4 * doc/emacs/emacs.texi: Update the ISBN of the Emacs manual.

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 21f645e1570cd21332544038fca9ba95bfc5a340..713bf8b9f898e190c10ce1fcc8eabac50fb47c23 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -93,7 +93,7 @@ developing GNU and promoting software freedom.''
 Published by the Free Software Foundation @*
 51 Franklin Street, Fifth Floor @*
 Boston, MA 02110-1301 USA @*
-ISBN 978-0-9831592-4-7
+ISBN 978-0-9831592-5-4
 
 @sp 2
 Cover art by Etienne Suvasa; cover design by Matt Lee.