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

admin/FOR-RELEASE

@@ -50,6 +50,9 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00732.html
 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
 

lispref/ChangeLog

@@ -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

lispref/elisp.texi

@@ -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

man/ChangeLog

@@ -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.

man/emacs.texi

@@ -51,7 +51,7 @@ Software Foundation raise funds for GNU development.''
 @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