# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1178320122 0
# Node ID d8b83b3e09a2f3ef06c8bf7176e4d95ff09abbcb
# Parent  a4968dc96cb38b18d5697c3943e19c3ce0edae80# Parent  6187b5730b6e7a5461c405b96cb80c7fa51e2bc3
Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 8)

   - Update from CVS

2007-05-04  Karl Berry  <karl@tug.org>

   * lispref/elisp.texi (EMACSVER) [smallbook]: 22.1, not 22.

2007-05-04  Karl Berry  <karl@gnu.org>

   * man/emacs.texi (EMACSVER) [smallbook]: 22.1 for printed version, not 22.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-731

diff -r a4968dc96cb3 -r d8b83b3e09a2 admin/FOR-RELEASE
--- a/admin/FOR-RELEASE	Fri May 04 20:40:48 2007 +0000
+++ b/admin/FOR-RELEASE	Fri May 04 23:08:42 2007 +0000
@@ -50,6 +50,9 @@
 http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
 
 ** Takaaki.Ota@am.sony.com, May 2: table cell menu does not appear at the menubar
+   Bug is intermittent.
+
+** david.reitter@gmail.com, May 4: Euro sign bound, Pound sign not bound. (Bug?)
 
 * DOCUMENTATION
 
diff -r a4968dc96cb3 -r d8b83b3e09a2 lispref/ChangeLog
--- a/lispref/ChangeLog	Fri May 04 20:40:48 2007 +0000
+++ b/lispref/ChangeLog	Fri May 04 23:08:42 2007 +0000
@@ -1,3 +1,7 @@
+2007-05-04  Karl Berry  <karl@tug.org>
+
+	* elisp.texi (EMACSVER) [smallbook]: 22.1, not 22.
+
 2007-05-04  Eli Zaretskii  <eliz@gnu.org>
 
 	* tips.texi (Documentation Tips): Rearrange items to place the
diff -r a4968dc96cb3 -r d8b83b3e09a2 lispref/elisp.texi
--- a/lispref/elisp.texi	Fri May 04 20:40:48 2007 +0000
+++ b/lispref/elisp.texi	Fri May 04 23:08:42 2007 +0000
@@ -29,7 +29,7 @@
 @tex
 @ifset smallbook
 @fonttextsize 10
-@set EMACSVER 22
+@set EMACSVER 22.1
 \global\let\urlcolor=\Black % don't print links in grayscale
 \global\let\linkcolor=\Black
 @end ifset
diff -r a4968dc96cb3 -r d8b83b3e09a2 man/ChangeLog
--- a/man/ChangeLog	Fri May 04 20:40:48 2007 +0000
+++ b/man/ChangeLog	Fri May 04 23:08:42 2007 +0000
@@ -1,3 +1,7 @@
+2007-05-04  Karl Berry  <karl@gnu.org>
+
+	* emacs.texi (EMACSVER) [smallbook]: 22.1 for printed version, not 22.
+
 2007-05-03  Karl Berry  <karl@gnu.org>
 
 	* emacs.texi (EMACSVER) [smallbook]: 22 for printed version.
diff -r a4968dc96cb3 -r d8b83b3e09a2 man/emacs.texi
--- a/man/emacs.texi	Fri May 04 20:40:48 2007 +0000
+++ b/man/emacs.texi	Fri May 04 23:08:42 2007 +0000
@@ -51,7 +51,7 @@
 @tex
 @ifset smallbook
 @fonttextsize 10
-@set EMACSVER 22
+@set EMACSVER 22.1
 \global\let\urlcolor=\Black % don't print links in grayscale
 \global\let\linkcolor=\Black
 @end ifset