changeset 80854:d8b83b3e09a2

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
author Miles Bader <miles@gnu.org>
date Fri, 04 May 2007 23:08:42 +0000
parents a4968dc96cb3 (current diff) 6187b5730b6e (diff)
children 502b804290b5
files admin/FOR-RELEASE lispref/ChangeLog lispref/elisp.texi man/ChangeLog man/emacs.texi
diffstat 5 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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
--- 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
--- 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.
--- 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