From: Miles Bader <miles@gnu.org>
Date: Fri, 4 May 2007 01:05:55 +0000 (+0000)
Subject: Merge from emacs--rel--22
X-Git-Tag: emacs-pretest-23.0.90~12737
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e83b91a268e0e769e37c6250f7d1816cba64549;p=emacs.git

Merge from emacs--rel--22

Patches applied:

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

   - Update from CVS

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

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

   * man/texinfo.tex: update from current version for better pdf generation.

   * man/emacs.texi (\urlcolor, \linkcolor) [smallbook]: \let to \Black
     for printing.

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

   * lispref/emacs.texi (EMACSVER) [smallbook]: 22 for printed version.

2007-05-01  Richard M. Stallman  <rms@gnu.org>

   * man/cmdargs.texi (Initial Options): Under --batch, mention --eval.

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

9e83b91a268e0e769e37c6250f7d1816cba64549
diff --cc lispref/ChangeLog
index 7cec6e3b011,c22f8e66f0f..da308a7fa41
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@@ -1,16 -1,12 +1,16 @@@
 -2007-05-03  Karl Berry  <karl@tug.org>
 +2007-05-03  Karl Berry  <karl@gnu.org>
  
  	* elisp.texi (\urlcolor, \linkcolor) [smallbook]: \Black for printing.
+ 	 (EMACSVER) [smallbook]: 22 for printed version.
  
  	* control.texi (Signaling Errors) <signal>: texinfo.tex is fixed,
- 	so restore anchor to normal position after defun.  Found by Kevin
- 	Ryde.
+ 	so restore anchor to normal position after defun.  Found by Kevin Ryde.
  
 +2007-04-26  Glenn Morris  <rgm@gnu.org>
 +
 +	* elisp.texi (EMACSVER): Increase to 22.1.50.
 +
- 2007-04-25  Karl Berry  <karl@gnu.org>
+ 2007-04-28  Karl Berry  <karl@gnu.org>
  
  	* elisp.texi: Improve line breaks on copyright page,
  	similar layout to emacs manual, 8.5x11 by default.
diff --cc lispref/elisp.texi
index 3099c88c4e5,1860ae710a0..5d73a38e3fc
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@@ -30,10 -29,11 +29,13 @@@
  @tex
  @ifset smallbook
  @fonttextsize 10
+ @set EMACSVER 22
+ \global\let\urlcolor=\Black % don't print links in grayscale
+ \global\let\linkcolor=\Black
  @end ifset
  \global\hbadness=6666 % don't worry about not-too-underfull boxes
 +\global\let\urlcolor=\Black % don't print links in grayscale
 +\global\let\linkcolor=\Black
  @end tex
  
  @c Combine indices.
diff --cc man/ChangeLog
index 0c0e022084f,a960322f17e..c3b306a0b7a
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@@ -1,11 -1,18 +1,22 @@@
 -2007-05-03  Karl Berry  <karl@tug.org>
 +2007-05-03  Karl Berry  <karl@gnu.org>
  
+ 	* emacs.texi (EMACSVER) [smallbook]: 22 for printed version.
+ 
  	* .cvsignore (*.pdf): new entry.
  
+ 	* texinfo.tex: update from current version for better pdf generation.
+ 
+ 	* emacs.texi (\urlcolor, \linkcolor) [smallbook]: \let to \Black
+ 	for printing.
+ 
+ 2007-05-01  Richard Stallman  <rms@gnu.org>
+ 
+ 	* cmdargs.texi (Initial Options): Under --batch, mention --eval.
+ 
 +2007-04-30  Reiner Steib  <Reiner.Steib@gmx.de>
 +
 +	* gnus.texi (Article Highlighting): Clarify gnus-cite-parse-max-size.
 +
  2007-04-28  Glenn Morris  <rgm@gnu.org>
  
  	* ack.texi (Acknowledgments):