diff options
| author | Miles Bader | 2007-07-26 05:28:10 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-26 05:28:10 +0000 |
| commit | 9aecacd08a93bffb529cee59d74477890ce96f37 (patch) | |
| tree | 149d4cef4deb6e93e300b6ef89322181a3d29ce4 /lib-src | |
| parent | 9ee365d565205366d61d9b50dd2a15ef903be983 (diff) | |
| parent | ef2805c29bb03f0c8c0d4b37a65f511123dcab1c (diff) | |
| download | emacs-9aecacd08a93bffb529cee59d74477890ce96f37.tar.gz emacs-9aecacd08a93bffb529cee59d74477890ce96f37.zip | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 70-73)
- Update from CVS
2007-07-25 Glenn Morris <rgm@gnu.org>
* Relicense all FSF files to GPLv3 or later.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 8 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 2 | ||||
| -rw-r--r-- | lib-src/b2m.pl | 10 | ||||
| -rw-r--r-- | lib-src/cvtmail.c | 2 | ||||
| -rw-r--r-- | lib-src/digest-doc.c | 2 | ||||
| -rw-r--r-- | lib-src/ebrowse.c | 2 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 2 | ||||
| -rw-r--r-- | lib-src/emacstool.c | 2 | ||||
| -rw-r--r-- | lib-src/etags.c | 9 | ||||
| -rw-r--r-- | lib-src/fakemail.c | 2 | ||||
| -rw-r--r-- | lib-src/getopt.c | 2 | ||||
| -rw-r--r-- | lib-src/getopt1.c | 2 | ||||
| -rw-r--r-- | lib-src/getopt_.h | 2 | ||||
| -rw-r--r-- | lib-src/getopt_int.h | 2 | ||||
| -rw-r--r-- | lib-src/gettext.h | 2 | ||||
| -rwxr-xr-x | lib-src/grep-changelog | 2 | ||||
| -rw-r--r-- | lib-src/hexl.c | 9 | ||||
| -rw-r--r-- | lib-src/make-docfile.c | 2 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 | ||||
| -rw-r--r-- | lib-src/movemail.c | 2 | ||||
| -rw-r--r-- | lib-src/ntlib.c | 2 | ||||
| -rw-r--r-- | lib-src/ntlib.h | 2 | ||||
| -rw-r--r-- | lib-src/pop.c | 2 | ||||
| -rw-r--r-- | lib-src/pop.h | 2 | ||||
| -rw-r--r-- | lib-src/profile.c | 2 | ||||
| -rwxr-xr-x | lib-src/rcs-checkin | 2 | ||||
| -rwxr-xr-x | lib-src/rcs2log | 2 | ||||
| -rw-r--r-- | lib-src/sorted-doc.c | 2 | ||||
| -rw-r--r-- | lib-src/test-distrib.c | 2 | ||||
| -rw-r--r-- | lib-src/update-game-score.c | 2 | ||||
| -rwxr-xr-x | lib-src/vcdiff | 2 |
31 files changed, 49 insertions, 41 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 693d28e9ac9..2f4b58ab7a6 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2007-07-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Relicense all FSF files to GPLv3 or later. | ||
| 4 | |||
| 5 | * COPYING: Switch to GPLv3. | ||
| 6 | |||
| 1 | 2007-07-17 Francesco Potort,Al(B <pot@gnu.org> | 7 | 2007-07-17 Francesco Potort,Al(B <pot@gnu.org> |
| 2 | 8 | ||
| 3 | * etags.c (C_entries): Reset the fvdef machine when out of function. | 9 | * etags.c (C_entries): Reset the fvdef machine when out of function. |
| @@ -6257,7 +6263,7 @@ | |||
| 6257 | 6263 | ||
| 6258 | GNU Emacs is free software; you can redistribute it and/or modify | 6264 | GNU Emacs is free software; you can redistribute it and/or modify |
| 6259 | it under the terms of the GNU General Public License as published by | 6265 | it under the terms of the GNU General Public License as published by |
| 6260 | the Free Software Foundation; either version 2, or (at your option) | 6266 | the Free Software Foundation; either version 3, or (at your option) |
| 6261 | any later version. | 6267 | any later version. |
| 6262 | 6268 | ||
| 6263 | GNU Emacs is distributed in the hope that it will be useful, | 6269 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index bef8f1b9c29..1482ea6c5df 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | # GNU Emacs is free software; you can redistribute it and/or modify | 7 | # GNU Emacs is free software; you can redistribute it and/or modify |
| 8 | # it under the terms of the GNU General Public License as published by | 8 | # it under the terms of the GNU General Public License as published by |
| 9 | # the Free Software Foundation; either version 2, or (at your option) | 9 | # the Free Software Foundation; either version 3, or (at your option) |
| 10 | # any later version. | 10 | # any later version. |
| 11 | 11 | ||
| 12 | # GNU Emacs is distributed in the hope that it will be useful, | 12 | # GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl index 39c5901348f..96f1643891f 100644 --- a/lib-src/b2m.pl +++ b/lib-src/b2m.pl | |||
| @@ -7,8 +7,8 @@ | |||
| 7 | 7 | ||
| 8 | # This program is free software; you can redistribute it and/or modify | 8 | # This program is free software; you can redistribute it and/or modify |
| 9 | # it under the terms of the GNU General Public License as published by | 9 | # it under the terms of the GNU General Public License as published by |
| 10 | # the Free Software Foundation; either version 2 of the License, or | 10 | # the Free Software Foundation; either version 3, or (at your option) |
| 11 | # (at your option) any later version. | 11 | # any later version. |
| 12 | 12 | ||
| 13 | # This program is distributed in the hope that it will be useful, but | 13 | # This program is distributed in the hope that it will be useful, but |
| 14 | # WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | # WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -16,9 +16,9 @@ | |||
| 16 | # General Public License for more details. | 16 | # General Public License for more details. |
| 17 | 17 | ||
| 18 | # You should have received a copy of the GNU General Public License | 18 | # You should have received a copy of the GNU General Public License |
| 19 | # along with this program; if not, write to the Free Software | 19 | # along with this program; see the file COPYING. If not, write to the |
| 20 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 | 20 | # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 21 | # USA. | 21 | # Boston, MA 02110-1301 USA. |
| 22 | 22 | ||
| 23 | # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>. | 23 | # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>. |
| 24 | 24 | ||
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c index f82f877923e..d892d77dc5a 100644 --- a/lib-src/cvtmail.c +++ b/lib-src/cvtmail.c | |||
| @@ -5,7 +5,7 @@ This file is part of GNU Emacs. | |||
| 5 | 5 | ||
| 6 | GNU Emacs is free software; you can redistribute it and/or modify | 6 | GNU Emacs is free software; you can redistribute it and/or modify |
| 7 | it under the terms of the GNU General Public License as published by | 7 | it under the terms of the GNU General Public License as published by |
| 8 | the Free Software Foundation; either version 2, or (at your option) | 8 | the Free Software Foundation; either version 3, or (at your option) |
| 9 | any later version. | 9 | any later version. |
| 10 | 10 | ||
| 11 | GNU Emacs is distributed in the hope that it will be useful, | 11 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c index 16d386f5b4e..08e5d813361 100644 --- a/lib-src/digest-doc.c +++ b/lib-src/digest-doc.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | GNU Emacs is free software; you can redistribute it and/or modify | 9 | GNU Emacs is free software; you can redistribute it and/or modify |
| 10 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
| 11 | the Free Software Foundation; either version 2, or (at your option) | 11 | the Free Software Foundation; either version 3, or (at your option) |
| 12 | any later version. | 12 | any later version. |
| 13 | 13 | ||
| 14 | GNU Emacs is distributed in the hope that it will be useful, | 14 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index b1348f8e841..ea230a9c3cd 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | GNU Emacs is free software; you can redistribute it and/or modify | 8 | GNU Emacs is free software; you can redistribute it and/or modify |
| 9 | it under the terms of the GNU General Public License as published by | 9 | it under the terms of the GNU General Public License as published by |
| 10 | the Free Software Foundation; either version 2, or (at your option) | 10 | the Free Software Foundation; either version 3, or (at your option) |
| 11 | any later version. | 11 | any later version. |
| 12 | 12 | ||
| 13 | GNU Emacs is distributed in the hope that it will be useful, | 13 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index ea1e6cd7af8..9edba132134 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -6,7 +6,7 @@ This file is part of GNU Emacs. | |||
| 6 | 6 | ||
| 7 | GNU Emacs is free software; you can redistribute it and/or modify | 7 | GNU Emacs is free software; you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation; either version 2, or (at your option) | 9 | the Free Software Foundation; either version 3, or (at your option) |
| 10 | any later version. | 10 | any later version. |
| 11 | 11 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | 12 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c index f04a8b3f545..7b39d2ed8fd 100644 --- a/lib-src/emacstool.c +++ b/lib-src/emacstool.c | |||
| @@ -6,7 +6,7 @@ This file is part of GNU Emacs. | |||
| 6 | 6 | ||
| 7 | GNU Emacs is free software; you can redistribute it and/or modify | 7 | GNU Emacs is free software; you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation; either version 2, or (at your option) | 9 | the Free Software Foundation; either version 3, or (at your option) |
| 10 | any later version. | 10 | any later version. |
| 11 | 11 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | 12 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/etags.c b/lib-src/etags.c index fded69c50b0..f4322e8c0f8 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c | |||
| @@ -36,8 +36,8 @@ This file is not considered part of GNU Emacs. | |||
| 36 | 36 | ||
| 37 | This program is free software; you can redistribute it and/or modify | 37 | This program is free software; you can redistribute it and/or modify |
| 38 | it under the terms of the GNU General Public License as published by | 38 | it under the terms of the GNU General Public License as published by |
| 39 | the Free Software Foundation; either version 2 of the License, or | 39 | the Free Software Foundation; either version 3, or (at your option) |
| 40 | (at your option) any later version. | 40 | any later version. |
| 41 | 41 | ||
| 42 | This program is distributed in the hope that it will be useful, | 42 | This program is distributed in the hope that it will be useful, |
| 43 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 43 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -45,8 +45,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 45 | GNU General Public License for more details. | 45 | GNU General Public License for more details. |
| 46 | 46 | ||
| 47 | You should have received a copy of the GNU General Public License | 47 | You should have received a copy of the GNU General Public License |
| 48 | along with this program; if not, write to the Free Software Foundation, | 48 | along with this program; see the file COPYING. If not, write to the |
| 49 | Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ | 49 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 50 | Boston, MA 02110-1301, USA. */ | ||
| 50 | 51 | ||
| 51 | 52 | ||
| 52 | /* NB To comply with the above BSD license, copyright information is | 53 | /* NB To comply with the above BSD license, copyright information is |
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c index e35c0f8a072..003f2da886c 100644 --- a/lib-src/fakemail.c +++ b/lib-src/fakemail.c | |||
| @@ -6,7 +6,7 @@ This file is part of GNU Emacs. | |||
| 6 | 6 | ||
| 7 | GNU Emacs is free software; you can redistribute it and/or modify | 7 | GNU Emacs is free software; you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation; either version 2, or (at your option) | 9 | the Free Software Foundation; either version 3, or (at your option) |
| 10 | any later version. | 10 | any later version. |
| 11 | 11 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | 12 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/getopt.c b/lib-src/getopt.c index b6d6b881de7..587c2e0f618 100644 --- a/lib-src/getopt.c +++ b/lib-src/getopt.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | This program is free software; you can redistribute it and/or modify | 10 | This program is free software; you can redistribute it and/or modify |
| 11 | it under the terms of the GNU General Public License as published by | 11 | it under the terms of the GNU General Public License as published by |
| 12 | the Free Software Foundation; either version 2, or (at your option) | 12 | the Free Software Foundation; either version 3, or (at your option) |
| 13 | any later version. | 13 | any later version. |
| 14 | 14 | ||
| 15 | This program is distributed in the hope that it will be useful, | 15 | This program is distributed in the hope that it will be useful, |
diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c index c2bec4f8e9a..25f616250c1 100644 --- a/lib-src/getopt1.c +++ b/lib-src/getopt1.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | This program is free software; you can redistribute it and/or modify | 6 | This program is free software; you can redistribute it and/or modify |
| 7 | it under the terms of the GNU General Public License as published by | 7 | it under the terms of the GNU General Public License as published by |
| 8 | the Free Software Foundation; either version 2, or (at your option) | 8 | the Free Software Foundation; either version 3, or (at your option) |
| 9 | any later version. | 9 | any later version. |
| 10 | 10 | ||
| 11 | This program is distributed in the hope that it will be useful, | 11 | This program is distributed in the hope that it will be useful, |
diff --git a/lib-src/getopt_.h b/lib-src/getopt_.h index 377c4837548..7cccef3eeea 100644 --- a/lib-src/getopt_.h +++ b/lib-src/getopt_.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | This program is free software; you can redistribute it and/or modify | 6 | This program is free software; you can redistribute it and/or modify |
| 7 | it under the terms of the GNU General Public License as published by | 7 | it under the terms of the GNU General Public License as published by |
| 8 | the Free Software Foundation; either version 2, or (at your option) | 8 | the Free Software Foundation; either version 3, or (at your option) |
| 9 | any later version. | 9 | any later version. |
| 10 | 10 | ||
| 11 | This program is distributed in the hope that it will be useful, | 11 | This program is distributed in the hope that it will be useful, |
diff --git a/lib-src/getopt_int.h b/lib-src/getopt_int.h index 25df3bbcfdc..049f4762900 100644 --- a/lib-src/getopt_int.h +++ b/lib-src/getopt_int.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | This program is free software; you can redistribute it and/or modify | 6 | This program is free software; you can redistribute it and/or modify |
| 7 | it under the terms of the GNU General Public License as published by | 7 | it under the terms of the GNU General Public License as published by |
| 8 | the Free Software Foundation; either version 2, or (at your option) | 8 | the Free Software Foundation; either version 3, or (at your option) |
| 9 | any later version. | 9 | any later version. |
| 10 | 10 | ||
| 11 | This program is distributed in the hope that it will be useful, | 11 | This program is distributed in the hope that it will be useful, |
diff --git a/lib-src/gettext.h b/lib-src/gettext.h index ed329003843..4a5941f86dc 100644 --- a/lib-src/gettext.h +++ b/lib-src/gettext.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
| 6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
| 7 | the Free Software Foundation; either version 2, or (at your option) | 7 | the Free Software Foundation; either version 3, or (at your option) |
| 8 | any later version. | 8 | any later version. |
| 9 | 9 | ||
| 10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog index d2e9ecfd7ee..1dff1e3e6b7 100755 --- a/lib-src/grep-changelog +++ b/lib-src/grep-changelog | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | # | 7 | # |
| 8 | # GNU Emacs is free software; you can redistribute it and/or modify | 8 | # GNU Emacs is free software; you can redistribute it and/or modify |
| 9 | # it under the terms of the GNU General Public License as published by | 9 | # it under the terms of the GNU General Public License as published by |
| 10 | # the Free Software Foundation; either version 2, or (at your option) | 10 | # the Free Software Foundation; either version 3, or (at your option) |
| 11 | # any later version. | 11 | # any later version. |
| 12 | # | 12 | # |
| 13 | # GNU Emacs is distributed in the hope that it will be useful, | 13 | # GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/hexl.c b/lib-src/hexl.c index 7cabdc95a66..98561cf604d 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c | |||
| @@ -6,8 +6,8 @@ This file is not considered part of GNU Emacs. | |||
| 6 | 6 | ||
| 7 | This program is free software; you can redistribute it and/or modify | 7 | This program is free software; you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation; either version 2 of the License, or | 9 | the Free Software Foundation; either version 3, or (at your option) |
| 10 | (at your option) any later version. | 10 | any later version. |
| 11 | 11 | ||
| 12 | This program is distributed in the hope that it will be useful, | 12 | This program is distributed in the hope that it will be useful, |
| 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -15,8 +15,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 15 | GNU General Public License for more details. | 15 | GNU General Public License for more details. |
| 16 | 16 | ||
| 17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
| 18 | along with this program; if not, write to the Free Software Foundation, | 18 | along with this program; see the file COPYING. If not, write to the |
| 19 | Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ | 19 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 20 | Boston, MA 02110-1301, USA. */ | ||
| 20 | 21 | ||
| 21 | #ifdef HAVE_CONFIG_H | 22 | #ifdef HAVE_CONFIG_H |
| 22 | #include <config.h> | 23 | #include <config.h> |
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index d76bdd527cf..3f3da3e7007 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c | |||
| @@ -6,7 +6,7 @@ This file is part of GNU Emacs. | |||
| 6 | 6 | ||
| 7 | GNU Emacs is free software; you can redistribute it and/or modify | 7 | GNU Emacs is free software; you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation; either version 2, or (at your option) | 9 | the Free Software Foundation; either version 3, or (at your option) |
| 10 | any later version. | 10 | any later version. |
| 11 | 11 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | 12 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index b552160c759..3076b85dbd8 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | # | 6 | # |
| 7 | # GNU Emacs is free software; you can redistribute it and/or modify | 7 | # GNU Emacs is free software; you can redistribute it and/or modify |
| 8 | # it under the terms of the GNU General Public License as published by | 8 | # it under the terms of the GNU General Public License as published by |
| 9 | # the Free Software Foundation; either version 2, or (at your option) | 9 | # the Free Software Foundation; either version 3, or (at your option) |
| 10 | # any later version. | 10 | # any later version. |
| 11 | # | 11 | # |
| 12 | # GNU Emacs is distributed in the hope that it will be useful, | 12 | # GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 84d4f949b2f..aaaf91b1b1f 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c | |||
| @@ -7,7 +7,7 @@ This file is part of GNU Emacs. | |||
| 7 | 7 | ||
| 8 | GNU Emacs is free software; you can redistribute it and/or modify | 8 | GNU Emacs is free software; you can redistribute it and/or modify |
| 9 | it under the terms of the GNU General Public License as published by | 9 | it under the terms of the GNU General Public License as published by |
| 10 | the Free Software Foundation; either version 2, or (at your option) | 10 | the Free Software Foundation; either version 3, or (at your option) |
| 11 | any later version. | 11 | any later version. |
| 12 | 12 | ||
| 13 | GNU Emacs is distributed in the hope that it will be useful, | 13 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c index 5f6c12abceb..e11733f9605 100644 --- a/lib-src/ntlib.c +++ b/lib-src/ntlib.c | |||
| @@ -6,7 +6,7 @@ This file is part of GNU Emacs. | |||
| 6 | 6 | ||
| 7 | GNU Emacs is free software; you can redistribute it and/or modify | 7 | GNU Emacs is free software; you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation; either version 2, or (at your option) | 9 | the Free Software Foundation; either version 3, or (at your option) |
| 10 | any later version. | 10 | any later version. |
| 11 | 11 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | 12 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h index a5655519fe1..267e8ba5a04 100644 --- a/lib-src/ntlib.h +++ b/lib-src/ntlib.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | GNU Emacs is free software; you can redistribute it and/or modify it | 7 | GNU Emacs is free software; you can redistribute it and/or modify it |
| 8 | under the terms of the GNU General Public License as published by the | 8 | under the terms of the GNU General Public License as published by the |
| 9 | Free Software Foundation; either version 2, or (at your option) any later | 9 | Free Software Foundation; either version 3, or (at your option) any later |
| 10 | version. | 10 | version. |
| 11 | 11 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, but WITHOUT | 12 | GNU Emacs is distributed in the hope that it will be useful, but WITHOUT |
diff --git a/lib-src/pop.c b/lib-src/pop.c index a829607faa5..9fcbe4b370c 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c | |||
| @@ -7,7 +7,7 @@ This file is part of GNU Emacs. | |||
| 7 | 7 | ||
| 8 | GNU Emacs is free software; you can redistribute it and/or modify | 8 | GNU Emacs is free software; you can redistribute it and/or modify |
| 9 | it under the terms of the GNU General Public License as published by | 9 | it under the terms of the GNU General Public License as published by |
| 10 | the Free Software Foundation; either version 2, or (at your option) | 10 | the Free Software Foundation; either version 3, or (at your option) |
| 11 | any later version. | 11 | any later version. |
| 12 | 12 | ||
| 13 | GNU Emacs is distributed in the hope that it will be useful, | 13 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/pop.h b/lib-src/pop.h index 664fb26f7db..85b666c652f 100644 --- a/lib-src/pop.h +++ b/lib-src/pop.h | |||
| @@ -7,7 +7,7 @@ This file is part of GNU Emacs. | |||
| 7 | 7 | ||
| 8 | GNU Emacs is free software; you can redistribute it and/or modify | 8 | GNU Emacs is free software; you can redistribute it and/or modify |
| 9 | it under the terms of the GNU General Public License as published by | 9 | it under the terms of the GNU General Public License as published by |
| 10 | the Free Software Foundation; either version 2, or (at your option) | 10 | the Free Software Foundation; either version 3, or (at your option) |
| 11 | any later version. | 11 | any later version. |
| 12 | 12 | ||
| 13 | GNU Emacs is distributed in the hope that it will be useful, | 13 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/profile.c b/lib-src/profile.c index 1174666da78..628b72ddcfe 100644 --- a/lib-src/profile.c +++ b/lib-src/profile.c | |||
| @@ -8,7 +8,7 @@ This file is part of GNU Emacs. | |||
| 8 | 8 | ||
| 9 | GNU Emacs is free software; you can redistribute it and/or modify | 9 | GNU Emacs is free software; you can redistribute it and/or modify |
| 10 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
| 11 | the Free Software Foundation; either version 2, or (at your option) | 11 | the Free Software Foundation; either version 3, or (at your option) |
| 12 | any later version. | 12 | any later version. |
| 13 | 13 | ||
| 14 | GNU Emacs is distributed in the hope that it will be useful, | 14 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin index 1ec783934e6..94396709e65 100755 --- a/lib-src/rcs-checkin +++ b/lib-src/rcs-checkin | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | # | 9 | # |
| 10 | # GNU Emacs is free software; you can redistribute it and/or modify | 10 | # GNU Emacs is free software; you can redistribute it and/or modify |
| 11 | # it under the terms of the GNU General Public License as published by | 11 | # it under the terms of the GNU General Public License as published by |
| 12 | # the Free Software Foundation; either version 2, or (at your option) | 12 | # the Free Software Foundation; either version 3, or (at your option) |
| 13 | # any later version. | 13 | # any later version. |
| 14 | # | 14 | # |
| 15 | # GNU Emacs is distributed in the hope that it will be useful, | 15 | # GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/rcs2log b/lib-src/rcs2log index 371a52de66c..c81f51d4d60 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log | |||
| @@ -59,7 +59,7 @@ Id='$Id$' | |||
| 59 | 59 | ||
| 60 | # This program is free software; you can redistribute it and/or modify | 60 | # This program is free software; you can redistribute it and/or modify |
| 61 | # it under the terms of the GNU General Public License as published by | 61 | # it under the terms of the GNU General Public License as published by |
| 62 | # the Free Software Foundation; either version 2, or (at your option) | 62 | # the Free Software Foundation; either version 3, or (at your option) |
| 63 | # any later version. | 63 | # any later version. |
| 64 | # | 64 | # |
| 65 | # This program is distributed in the hope that it will be useful, | 65 | # This program is distributed in the hope that it will be useful, |
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c index 28f736ab843..e239eaab428 100644 --- a/lib-src/sorted-doc.c +++ b/lib-src/sorted-doc.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | GNU Emacs is free software; you can redistribute it and/or modify | 9 | GNU Emacs is free software; you can redistribute it and/or modify |
| 10 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
| 11 | the Free Software Foundation; either version 2, or (at your option) | 11 | the Free Software Foundation; either version 3, or (at your option) |
| 12 | any later version. | 12 | any later version. |
| 13 | 13 | ||
| 14 | GNU Emacs is distributed in the hope that it will be useful, | 14 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c index cd504c8c538..4913f094614 100644 --- a/lib-src/test-distrib.c +++ b/lib-src/test-distrib.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | GNU Emacs is free software; you can redistribute it and/or modify | 8 | GNU Emacs is free software; you can redistribute it and/or modify |
| 9 | it under the terms of the GNU General Public License as published by | 9 | it under the terms of the GNU General Public License as published by |
| 10 | the Free Software Foundation; either version 2, or (at your option) | 10 | the Free Software Foundation; either version 3, or (at your option) |
| 11 | any later version. | 11 | any later version. |
| 12 | 12 | ||
| 13 | GNU Emacs is distributed in the hope that it will be useful, | 13 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index 9f1c011ce79..3ccfecdb7d7 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c | |||
| @@ -5,7 +5,7 @@ This file is part of GNU Emacs. | |||
| 5 | 5 | ||
| 6 | GNU Emacs is free software; you can redistribute it and/or modify | 6 | GNU Emacs is free software; you can redistribute it and/or modify |
| 7 | it under the terms of the GNU General Public License as published by | 7 | it under the terms of the GNU General Public License as published by |
| 8 | the Free Software Foundation; either version 2, or (at your option) | 8 | the Free Software Foundation; either version 3, or (at your option) |
| 9 | any later version. | 9 | any later version. |
| 10 | 10 | ||
| 11 | GNU Emacs is distributed in the hope that it will be useful, | 11 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/lib-src/vcdiff b/lib-src/vcdiff index 21c6e70e9d8..4fd6fb47226 100755 --- a/lib-src/vcdiff +++ b/lib-src/vcdiff | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | # | 10 | # |
| 11 | # GNU Emacs is free software; you can redistribute it and/or modify | 11 | # GNU Emacs is free software; you can redistribute it and/or modify |
| 12 | # it under the terms of the GNU General Public License as published by | 12 | # it under the terms of the GNU General Public License as published by |
| 13 | # the Free Software Foundation; either version 2, or (at your option) | 13 | # the Free Software Foundation; either version 3, or (at your option) |
| 14 | # any later version. | 14 | # any later version. |
| 15 | # | 15 | # |
| 16 | # GNU Emacs is distributed in the hope that it will be useful, | 16 | # GNU Emacs is distributed in the hope that it will be useful, |