Mercurial > emacs
changeset 77597:a77effd5a7b5
propagate changes from trunk
| author | Karl Berry <karl@gnu.org> |
|---|---|
| date | Sat, 28 Apr 2007 17:45:50 +0000 |
| parents | a7e7fba52d2d |
| children | 2177f0100c5c |
| files | lispref/ChangeLog lispref/elisp.texi man/ChangeLog man/emacs.texi |
| diffstat | 4 files changed, 24 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lispref/ChangeLog Sat Apr 28 17:21:40 2007 +0000 +++ b/lispref/ChangeLog Sat Apr 28 17:45:50 2007 +0000 @@ -1,3 +1,8 @@ +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. + 2007-04-24 Richard Stallman <rms@gnu.org> * text.texi (Special Properties): Add xref to Overlay Properties.
--- a/lispref/elisp.texi Sat Apr 28 17:21:40 2007 +0000 +++ b/lispref/elisp.texi Sat Apr 28 17:45:50 2007 +0000 @@ -14,8 +14,10 @@ * Elisp: (elisp). The Emacs Lisp Reference Manual. @end direntry -@c for full 8.5x11, comment this out. -@set smallbook +@c in general, keep the following line commented out, unless doing a +@c copy of this manual that will be published. the manual should go +@c onto the distribution in the full, 8.5 x 11" size. +@c set smallbook @ifset smallbook @smallbook @@ -41,8 +43,8 @@ @c @syncodeindex tp fn @copying -This is edition @value{VERSION} of the GNU Emacs Lisp -Reference Manual, corresponding to Emacs version @value{EMACSVER}. +This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@* +corresponding to Emacs version @value{EMACSVER}. Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software @@ -74,14 +76,14 @@ @vskip 0pt plus 1filll @insertcopying -@sp 1 +@sp 2 Published by the Free Software Foundation @* 51 Franklin St, Fifth Floor @* Boston, MA 02110-1301 @* USA @* ISBN 1-882114-74-4 -@sp 1 +@sp 2 Cover art by Etienne Suvasa. @end titlepage
--- a/man/ChangeLog Sat Apr 28 17:21:40 2007 +0000 +++ b/man/ChangeLog Sat Apr 28 17:45:50 2007 +0000 @@ -1,3 +1,10 @@ +2007-04-28 Karl Berry <karl@gnu.org> + + * emacs.texi: Improve line breaks on copyright page, + similar layout to lispref, 8.5x11 by default. + + * dired.texi (Image-Dired): Improve line break, fix typo. + 2007-04-27 J.D. Smith <jdsmith@as.arizona.edu> * idlwave.texi: Minor updates for IDLWAVE 6.1.
--- a/man/emacs.texi Sat Apr 28 17:21:40 2007 +0000 +++ b/man/emacs.texi Sat Apr 28 17:45:50 2007 +0000 @@ -8,7 +8,7 @@ @set EMACSVER 22.0.99 @copying -This is the @value{EDITION} edition of the @cite{GNU Emacs Manual}, +This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* updated for Emacs version @value{EMACSVER}. Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, @@ -39,7 +39,7 @@ @c in general, keep the following line commented out, unless doing a @c copy of this manual that will be published. the manual should go @c onto the distribution in the full, 8.5 x 11" size. -@set smallbook +@c set smallbook @ifset smallbook @smallbook @@ -76,10 +76,10 @@ @insertcopying @sp 2 -ISBN 1-882114-86-8* Published by the Free Software Foundation @* 51 Franklin Street, Fifth Floor @* -Boston, MA 02110-1301 USA +Boston, MA 02110-1301 USA @* +ISBN 1-882114-86-8 @sp 2 Cover art by Etienne Suvasa.