aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/m/7300.h2
-rw-r--r--src/m/alliant.h2
-rw-r--r--src/m/altos.h2
-rw-r--r--src/m/amdahl.h2
-rw-r--r--src/m/apollo.h2
-rw-r--r--src/m/att3b.h2
-rw-r--r--src/m/aviion.h2
-rw-r--r--src/m/celerity.h2
-rw-r--r--src/m/clipper.h2
-rw-r--r--src/m/cnvrgnt.h2
-rw-r--r--src/m/convex.h2
-rw-r--r--src/m/cydra5.h2
-rw-r--r--src/m/dual.h2
-rw-r--r--src/m/elxsi.h2
-rw-r--r--src/m/gec63.h2
-rw-r--r--src/m/gould.h2
-rw-r--r--src/m/hp800.h2
-rw-r--r--src/m/hp9000s300.h2
-rw-r--r--src/m/i860.h109
-rw-r--r--src/m/ibmps2-aix.h2
-rw-r--r--src/m/ibmrs6000.h2
-rw-r--r--src/m/ibmrt-aix.h2
-rw-r--r--src/m/ibmrt.h2
-rw-r--r--src/m/intel386.h2
-rw-r--r--src/m/iris4d.h2
-rw-r--r--src/m/iris5d.h2
-rw-r--r--src/m/irist.h2
-rw-r--r--src/m/isi-ov.h2
-rw-r--r--src/m/masscomp.h2
-rw-r--r--src/m/mega68.h2
-rw-r--r--src/m/mg1.h2
-rw-r--r--src/m/news.h2
-rw-r--r--src/m/next.h2
-rw-r--r--src/m/ns16000.h2
-rw-r--r--src/m/nu.h2
-rw-r--r--src/m/orion.h2
-rw-r--r--src/m/orion105.h2
-rw-r--r--src/m/plexus.h2
-rw-r--r--src/m/pyramid.h2
-rw-r--r--src/m/sequent.h2
-rw-r--r--src/m/sps7.h2
-rw-r--r--src/m/stride.h2
-rw-r--r--src/m/sun1.h2
-rw-r--r--src/m/sun2.h2
-rw-r--r--src/m/sun386.h2
-rw-r--r--src/m/symmetry.h2
-rw-r--r--src/m/tad68k.h2
-rw-r--r--src/m/tahoe.h2
-rw-r--r--src/m/targon31.h2
-rw-r--r--src/m/tek4300.h2
-rw-r--r--src/m/template.h2
-rw-r--r--src/m/tower32.h2
-rw-r--r--src/m/ustation.h2
-rw-r--r--src/m/vax.h2
-rw-r--r--src/m/wicat.h2
-rw-r--r--src/m/xps100.h2
-rw-r--r--src/mach2.h2
-rw-r--r--src/s/aix3-1.h2
-rw-r--r--src/s/bsd4-1.h2
-rw-r--r--src/s/bsd4-2.h2
-rw-r--r--src/s/bsd4-3.h2
-rw-r--r--src/s/dgux.h2
-rw-r--r--src/s/hpux.h2
-rw-r--r--src/s/iris3-5.h2
-rw-r--r--src/s/iris3-6.h2
-rw-r--r--src/s/irix3-3.h2
-rw-r--r--src/s/newsos5.h2
-rw-r--r--src/s/rtu.h2
-rw-r--r--src/s/umax.h2
-rw-r--r--src/s/unipl5-0.h2
-rw-r--r--src/s/unipl5-2.h2
-rw-r--r--src/s/usg5-0.h2
-rw-r--r--src/s/usg5-2-2.h2
-rw-r--r--src/s/usg5-2.h2
-rw-r--r--src/s/usg5-3.h2
-rw-r--r--src/s/usg5-4.h2
-rw-r--r--src/s/vms.h2
-rw-r--r--src/s/xenix.h2
78 files changed, 186 insertions, 77 deletions
diff --git a/src/m/7300.h b/src/m/7300.h
index ecac4f6190..ae03027ed5 100644
--- a/src/m/7300.h
+++ b/src/m/7300.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/alliant.h b/src/m/alliant.h
index 73dce58217..82fb7b2581 100644
--- a/src/m/alliant.h
+++ b/src/m/alliant.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/altos.h b/src/m/altos.h
index 0941f25370..b69e6c1da3 100644
--- a/src/m/altos.h
+++ b/src/m/altos.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index 957816995b..f70852cecb 100644
--- a/src/m/amdahl.h
+++ b/src/m/amdahl.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/apollo.h b/src/m/apollo.h
index e878939370..84b027e5d8 100644
--- a/src/m/apollo.h
+++ b/src/m/apollo.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/att3b.h b/src/m/att3b.h
index 838a5b867b..7774da4e78 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/aviion.h b/src/m/aviion.h
index a4cfb9ea65..b468e72a37 100644
--- a/src/m/aviion.h
+++ b/src/m/aviion.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/celerity.h b/src/m/celerity.h
index f515010eaa..f485b94400 100644
--- a/src/m/celerity.h
+++ b/src/m/celerity.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/clipper.h b/src/m/clipper.h
index 86d3e8709e..dc859e8c54 100644
--- a/src/m/clipper.h
+++ b/src/m/clipper.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index dac44ac41c..7935e9d4a0 100644
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/convex.h b/src/m/convex.h
index 7ca4c336f5..add31659d0 100644
--- a/src/m/convex.h
+++ b/src/m/convex.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index b93f1725ca..1fcdb2fdfa 100644
--- a/src/m/cydra5.h
+++ b/src/m/cydra5.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/dual.h b/src/m/dual.h
index 2110c4d485..8606e3fed7 100644
--- a/src/m/dual.h
+++ b/src/m/dual.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/elxsi.h b/src/m/elxsi.h
index fccc25a5d5..d86697b57d 100644
--- a/src/m/elxsi.h
+++ b/src/m/elxsi.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/gec63.h b/src/m/gec63.h
index 3db1da1be8..49213f6a42 100644
--- a/src/m/gec63.h
+++ b/src/m/gec63.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/gould.h b/src/m/gould.h
index 32d89e28a5..a5ad974002 100644
--- a/src/m/gould.h
+++ b/src/m/gould.h
@@ -11,7 +11,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/hp800.h b/src/m/hp800.h
index 2173d5309e..1b0e8143d8 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index eaf7436a54..194bcf4436 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/i860.h b/src/m/i860.h
new file mode 100644
index 0000000000..5dc302a5cd
--- /dev/null
+++ b/src/m/i860.h
@@ -0,0 +1,109 @@
+/* machine description file for i860.
+ Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs 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.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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 GNU Emacs; see the file COPYING. If not, write to
+the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+
+/* The following line tells the configuration script what sort of
+ operating system this machine is likely to run.
+ USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */
+
+/* The following three symbols give information on
+ the size of various data types. */
+
+#define SHORTBITS 16 /* Number of bits in a short */
+
+#define INTBITS 32 /* Number of bits in an int */
+
+#define LONGBITS 32 /* Number of bits in a long */
+
+/* Define BIG_ENDIAN iff lowest-numbered byte in a word
+ is the most significant byte. */
+
+/* i860 is not big-endian: lowest numbered byte is least significant. */
+
+#undef BIG_ENDIAN
+
+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
+ * group of arguments and treat it as an array of the arguments. */
+
+#define NO_ARG_ARRAY
+
+/* Define WORD_MACHINE if addresses and such have
+ * to be corrected before they can be used as byte counts. */
+
+/* #define WORD_MACHINE */
+
+/* Now define a symbol for the cpu type, if your compiler
+ does not define it automatically:
+ Ones defined so far include vax, m68000, ns16000, pyramid,
+ orion, tahoe, APOLLO and many others */
+
+#define INTEL860
+
+/* Use type int rather than a union, to represent Lisp_Object */
+/* This is desirable for most machines. */
+
+#define NO_UNION_TYPE
+
+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
+ the 24-bit bit field into an int. In other words, if bit fields
+ are always unsigned.
+
+ If you use NO_UNION_TYPE, this flag does not matter. */
+
+#define EXPLICIT_SIGN_EXTEND
+
+/* Data type of load average, as read out of kmem. */
+
+#define LOAD_AVE_TYPE long
+
+/* Convert that into an integer that is 100 for a load average of 1.0 */
+
+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
+
+/* Define CANNOT_DUMP on machines where unexec does not work.
+ Then the function dump-emacs will not be defined
+ and temacs will do (load "loadup") automatically unless told otherwise. */
+
+/* #define CANNOT_DUMP */
+
+/* Define VIRT_ADDR_VARIES if the virtual addresses of
+ pure and impure space as loaded can vary, and even their
+ relative order cannot be relied on.
+
+ Otherwise Emacs assumes that text space precedes data space,
+ numerically. */
+
+/* #define VIRT_ADDR_VARIES */
+
+/* Define C_ALLOCA if this machine does not support a true alloca
+ and the one written in C should be used instead.
+ Define HAVE_ALLOCA to say that the system provides a properly
+ working alloca function and it should be used.
+ Define neither one if an assembler-language alloca
+ in the file alloca.s should be used. */
+
+#define C_ALLOCA
+/* #define HAVE_ALLOCA */
+
+/* Define NO_REMAP if memory segmentation makes it not work well
+ to change the boundary between the text section and data section
+ when Emacs is dumped. If you define this, the preloaded Lisp
+ code will not be sharable; but that's better than failing completely. */
+
+#define NO_REMAP
diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index 5004def6e1..cd31da40ac 100644
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 135ef516ee..9bf1953ee1 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
index 83f122051c..5c2b1d1289 100644
--- a/src/m/ibmrt-aix.h
+++ b/src/m/ibmrt-aix.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index 0f8342679c..d22d5bfeb6 100644
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/intel386.h b/src/m/intel386.h
index aa1bf29504..546e8a16b6 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index e90381d868..f12581f33e 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/iris5d.h b/src/m/iris5d.h
index da163e6259..25a4b1ee04 100644
--- a/src/m/iris5d.h
+++ b/src/m/iris5d.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/irist.h b/src/m/irist.h
index 25f1550a09..a5bf7fb4a7 100644
--- a/src/m/irist.h
+++ b/src/m/irist.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h
index 2a41da70bd..84d1a2a38d 100644
--- a/src/m/isi-ov.h
+++ b/src/m/isi-ov.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/masscomp.h b/src/m/masscomp.h
index d10df6b380..4862670149 100644
--- a/src/m/masscomp.h
+++ b/src/m/masscomp.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/mega68.h b/src/m/mega68.h
index a15fd2b290..46fab8a0ad 100644
--- a/src/m/mega68.h
+++ b/src/m/mega68.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/mg1.h b/src/m/mg1.h
index 34e22def47..8956c9aae7 100644
--- a/src/m/mg1.h
+++ b/src/m/mg1.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/news.h b/src/m/news.h
index b3e60b3022..81eafa16d8 100644
--- a/src/m/news.h
+++ b/src/m/news.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/next.h b/src/m/next.h
index 37c525cccc..9c018c62d4 100644
--- a/src/m/next.h
+++ b/src/m/next.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ns16000.h b/src/m/ns16000.h
index 69982fae4f..080dc25b93 100644
--- a/src/m/ns16000.h
+++ b/src/m/ns16000.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/nu.h b/src/m/nu.h
index 3e79496b45..ad234fa726 100644
--- a/src/m/nu.h
+++ b/src/m/nu.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/orion.h b/src/m/orion.h
index cbd0b3027a..d2cf184851 100644
--- a/src/m/orion.h
+++ b/src/m/orion.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/orion105.h b/src/m/orion105.h
index 48cfe7a50b..e053266785 100644
--- a/src/m/orion105.h
+++ b/src/m/orion105.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/plexus.h b/src/m/plexus.h
index 48a56e0ef4..47f6788107 100644
--- a/src/m/plexus.h
+++ b/src/m/plexus.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/pyramid.h b/src/m/pyramid.h
index ae3c4920a1..b41c0b24d1 100644
--- a/src/m/pyramid.h
+++ b/src/m/pyramid.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sequent.h b/src/m/sequent.h
index 280dabc80e..c39d765194 100644
--- a/src/m/sequent.h
+++ b/src/m/sequent.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sps7.h b/src/m/sps7.h
index 0408ed0e02..f95e2979e9 100644
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/stride.h b/src/m/stride.h
index 69aba3797b..77067dcf67 100644
--- a/src/m/stride.h
+++ b/src/m/stride.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sun1.h b/src/m/sun1.h
index f4dca832da..109c3bcdc3 100644
--- a/src/m/sun1.h
+++ b/src/m/sun1.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sun2.h b/src/m/sun2.h
index bb3f829fe6..7484a8b5f6 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/sun386.h b/src/m/sun386.h
index 1daf25601b..a7537f43e8 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -8,7 +8,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/symmetry.h b/src/m/symmetry.h
index fc1de91bde..63cd9b35ff 100644
--- a/src/m/symmetry.h
+++ b/src/m/symmetry.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index 73d6aad267..6088f49566 100644
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/tahoe.h b/src/m/tahoe.h
index 0bf5f123d9..5bb3016baa 100644
--- a/src/m/tahoe.h
+++ b/src/m/tahoe.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/targon31.h b/src/m/targon31.h
index 3246780c6e..a302caa473 100644
--- a/src/m/targon31.h
+++ b/src/m/targon31.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/tek4300.h b/src/m/tek4300.h
index 14aa45db4a..5d1eaac040 100644
--- a/src/m/tek4300.h
+++ b/src/m/tek4300.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/template.h b/src/m/template.h
index 2b2fc915a2..efc3333050 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/tower32.h b/src/m/tower32.h
index 4a017b328c..e6383232d7 100644
--- a/src/m/tower32.h
+++ b/src/m/tower32.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/ustation.h b/src/m/ustation.h
index c8ef493ece..c69b31112a 100644
--- a/src/m/ustation.h
+++ b/src/m/ustation.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/vax.h b/src/m/vax.h
index 31d6060075..303d8d76b0 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/wicat.h b/src/m/wicat.h
index 978018fb49..f55c3149a2 100644
--- a/src/m/wicat.h
+++ b/src/m/wicat.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/m/xps100.h b/src/m/xps100.h
index d6e8bef715..b2329c99ef 100644
--- a/src/m/xps100.h
+++ b/src/m/xps100.h
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/mach2.h b/src/mach2.h
index f9b1d7c42b..c941c5ff2c 100644
--- a/src/mach2.h
+++ b/src/mach2.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index d7e20a4eaf..3cfb0398aa 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index 6a4d8408dd..b5c0896073 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
index ab8b7fbdd9..cfd31726a6 100644
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h
index 4eb66dc4ff..b71f9f9b69 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/dgux.h b/src/s/dgux.h
index 2c7478d9e0..1f7a347f6d 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/hpux.h b/src/s/hpux.h
index 03dd183618..58fdf6ff11 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index 3b175fa550..a01ba137c5 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index a385d8623f..a4e424b7c8 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index 252fc3a7b1..fa2e45e8a9 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index 8a37cb0f68..de78c6d7f0 100644
--- a/src/s/newsos5.h
+++ b/src/s/newsos5.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/rtu.h b/src/s/rtu.h
index f2ef555d1f..f3fb292b0e 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/umax.h b/src/s/umax.h
index 2bbd333d7d..966948dde1 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/unipl5-0.h b/src/s/unipl5-0.h
index 9cf3652fb9..d908b6c14a 100644
--- a/src/s/unipl5-0.h
+++ b/src/s/unipl5-0.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index f9e3979b92..94d7ebfe05 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index a6eeb26342..d849ce7331 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index 3227700c10..e08a0b7624 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index d4a82ab6d0..09d436f3c7 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index 2a14523bde..53d47a3a05 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index c599ec0f84..30b3acb62a 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/vms.h b/src/s/vms.h
index e2a9af5d9f..58d81a22e4 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
diff --git a/src/s/xenix.h b/src/s/xenix.h
index 3560e172c6..a93cd1906d 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
GNU Emacs 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,