from trunk

5 files changed, 25 insertions, 17 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 9fbdeabb6cd..b45e48a7edb 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-06  Glenn Morris  <rgm@gnu.org>
+
+        * srecode/default.srt (COPYRIGHT): Update template copyright to GPLv3+.
+
+2010-03-05  Glenn Morris  <rgm@gnu.org>
+
+        * refcards/orgcard.tex: Use pdflayout.sty.
+        * refcards/Makefile (orgcard.pdf): Special rule no longer needed.
+
 2010-03-02  Glenn Morris  <rgm@gnu.org>
 
         * refcards/Makefile: For cs- and sk-, use pdfcsplain if available.
diff --git a/etc/NEWS b/etc/NEWS
index ecff7f0342e..00c4765f822 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -123,11 +123,6 @@ international/ucs-normalize.el.
 ** Function arguments in *Help* buffers are now shown in upper-case.
 Customize `help-downcase-arguments' to t to show them in lower-case.
 
-** Delete Auto Composition Mode.  Now the variable
-`auto-composition-mode' is simply a buffer local variable.  The
-commands `auto-composition-mode' and `global-auto-composition-mode'
-still works as before.
-
 
 * Editing Changes in Emacs 23.2
 
@@ -437,6 +432,14 @@ System (CLOS).  It is used by the other CEDET packages.
 
 * Incompatible Lisp Changes in Emacs 23.2
 
++++
+** The Lisp reader turns integers that are too large/small into floats.
+For instance, on machines where `536870911' is the largest integer,
+reading `536870912' gives the floating-point object `536870912.0'.
+
+This change only concerns the Lisp reader; it does not affect how
+actual integer objects overflow.
+
 ---
 ** Several obsolete functions removed.
 The functions have been obsolete since Emacs 19, and are unlikely to
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index c08a9b2cfab..c1bddd124d7 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -81,16 +81,11 @@ gnus-refcard.pdf: %.pdf: %.tex gnus-logo.pdf
 gnus-booklet.pdf: gnus-refcard.tex gnus-logo.pdf
         pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
 
-## FIXME just pdftex produces portrait rather than landscape.
-orgcard.pdf: orgcard.ps
-        ps2pdf $<
-
 ## Everything not explicitly listed above.
 %.pdf: %.tex
         pdftex $<
 
 
-
 ## dvi files.
 
 cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index ff498236467..c35cafbba52 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -9,14 +9,17 @@
 
 % This file can be printed with 1, 2, or 3 columns per page (see below).
 % Specify how many you want here.
-
 \columnsperpage=3
 
 % Set letterpaper to 0 for A4 paper, 1 for letter (US) paper.  Useful
 % only when columnsperpage is 2 or 3.
-
 \letterpaper=0
 
+% PDF output layout.  0 for A4, 1 for letter (US), a `l' is added for
+% a landscape layout.
+\input pdflayout.sty
+\pdflayout=(0l)
+
 % Nothing else needs to be changed below this line.
 % Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005,
 %   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt
index 7d83d550f10..b42de2f7835 100644
--- a/etc/srecode/default.srt
+++ b/etc/srecode/default.srt
@@ -25,8 +25,8 @@ set comment_start  "#"
 
 set COPYRIGHT "This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2, or (at
-your option) any later version.
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,9 +34,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA."
+along with this program.  If not, see http://www.gnu.org/licenses/."
 
 set DOLLAR "$"