aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-07-25 04:50:21 +0000
committerGlenn Morris2007-07-25 04:50:21 +0000
commitb4aa60262c04e987eac02418262939cdefb8b7dc (patch)
tree40ec4316cea9a9b0dacff008c45db648d507a398
parent74ce2879de24e78f75c2de963f5debc42e293f5d (diff)
downloademacs-b4aa60262c04e987eac02418262939cdefb8b7dc.tar.gz
emacs-b4aa60262c04e987eac02418262939cdefb8b7dc.zip
Switch license to GPLv3 or later.
-rw-r--r--admin/notes/copyright2
-rwxr-xr-xadmin/nt/makedist.bat2
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/ChangeLog.12
-rw-r--r--lisp/ChangeLog.102
-rw-r--r--lisp/ChangeLog.112
-rw-r--r--lisp/ChangeLog.22
-rw-r--r--lisp/ChangeLog.32
-rw-r--r--lisp/ChangeLog.42
-rw-r--r--lisp/ChangeLog.52
-rw-r--r--lisp/ChangeLog.62
-rw-r--r--lisp/ChangeLog.72
-rw-r--r--lisp/ChangeLog.82
-rw-r--r--lisp/ChangeLog.92
-rw-r--r--lisp/Makefile.in2
-rw-r--r--lisp/abbrev.el2
-rw-r--r--lisp/abbrevlist.el2
-rw-r--r--lisp/add-log.el2
-rw-r--r--lisp/align.el2
-rw-r--r--lisp/allout.el2
-rw-r--r--lisp/ansi-color.el2
-rw-r--r--lisp/apropos.el2
-rw-r--r--lisp/arc-mode.el2
-rw-r--r--lisp/array.el2
-rw-r--r--lisp/autoarg.el2
-rw-r--r--lisp/autoinsert.el2
-rw-r--r--lisp/autorevert.el2
-rw-r--r--lisp/avoid.el2
-rw-r--r--lisp/battery.el2
-rw-r--r--lisp/bindings.el2
-rw-r--r--lisp/bookmark.el2
-rw-r--r--lisp/bs.el2
-rw-r--r--lisp/buff-menu.el2
-rw-r--r--lisp/button.el2
-rw-r--r--lisp/calculator.el2
-rw-r--r--lisp/case-table.el2
-rw-r--r--lisp/cdl.el2
-rw-r--r--lisp/chistory.el2
-rw-r--r--lisp/cmuscheme.el2
-rw-r--r--lisp/comint.el2
-rw-r--r--lisp/compare-w.el2
-rw-r--r--lisp/complete.el2
-rw-r--r--lisp/completion.el2
-rw-r--r--lisp/cus-dep.el2
-rw-r--r--lisp/cus-edit.el2
-rw-r--r--lisp/cus-face.el2
-rw-r--r--lisp/cus-start.el2
-rw-r--r--lisp/cus-theme.el2
-rw-r--r--lisp/custom.el2
-rw-r--r--lisp/cvs-status.el2
-rw-r--r--lisp/dabbrev.el2
-rw-r--r--lisp/delim-col.el2
-rw-r--r--lisp/delsel.el2
-rw-r--r--lisp/descr-text.el2
-rw-r--r--lisp/desktop.el2
-rw-r--r--lisp/dframe.el2
-rw-r--r--lisp/diff-mode.el2
-rw-r--r--lisp/diff.el2
-rw-r--r--lisp/dired-aux.el2
-rw-r--r--lisp/dired-x.el2
-rw-r--r--lisp/dired.el2
-rw-r--r--lisp/dirtrack.el2
-rw-r--r--lisp/disp-table.el2
-rw-r--r--lisp/dnd.el2
-rw-r--r--lisp/dos-fns.el2
-rw-r--r--lisp/dos-vars.el2
-rw-r--r--lisp/dos-w32.el2
-rw-r--r--lisp/double.el2
-rw-r--r--lisp/ebuff-menu.el2
-rw-r--r--lisp/echistory.el2
-rw-r--r--lisp/ediff-diff.el2
-rw-r--r--lisp/ediff-help.el2
-rw-r--r--lisp/ediff-hook.el2
-rw-r--r--lisp/ediff-init.el2
-rw-r--r--lisp/ediff-merg.el2
-rw-r--r--lisp/ediff-mult.el2
-rw-r--r--lisp/ediff-ptch.el2
-rw-r--r--lisp/ediff-util.el2
-rw-r--r--lisp/ediff-vers.el2
-rw-r--r--lisp/ediff-wind.el2
-rw-r--r--lisp/ediff.el2
-rw-r--r--lisp/edmacro.el2
-rw-r--r--lisp/ehelp.el2
-rw-r--r--lisp/electric.el2
-rw-r--r--lisp/elide-head.el2
-rw-r--r--lisp/emacs-lock.el2
-rw-r--r--lisp/env.el2
-rw-r--r--lisp/expand.el2
-rw-r--r--lisp/ezimage.el2
-rw-r--r--lisp/facemenu.el2
-rw-r--r--lisp/faces.el2
-rw-r--r--lisp/ffap.el2
-rw-r--r--lisp/filecache.el2
-rw-r--r--lisp/files.el2
-rw-r--r--lisp/filesets.el2
-rw-r--r--lisp/find-dired.el2
-rw-r--r--lisp/find-file.el2
-rw-r--r--lisp/find-lisp.el2
-rw-r--r--lisp/finder.el2
-rw-r--r--lisp/flow-ctrl.el2
-rw-r--r--lisp/foldout.el2
-rw-r--r--lisp/follow.el2
-rw-r--r--lisp/font-core.el2
-rw-r--r--lisp/font-lock.el2
-rw-r--r--lisp/format.el2
-rw-r--r--lisp/forms.el2
-rw-r--r--lisp/frame.el2
-rw-r--r--lisp/fringe.el2
-rw-r--r--lisp/generic-x.el2
-rw-r--r--lisp/gs.el2
-rw-r--r--lisp/help-at-pt.el2
-rw-r--r--lisp/help-fns.el2
-rw-r--r--lisp/help-macro.el2
-rw-r--r--lisp/help-mode.el2
-rw-r--r--lisp/help.el2
-rw-r--r--lisp/hexl.el2
-rw-r--r--lisp/hi-lock.el2
-rw-r--r--lisp/hilit-chg.el2
-rw-r--r--lisp/hippie-exp.el2
-rw-r--r--lisp/hl-line.el2
-rw-r--r--lisp/ibuf-ext.el2
-rw-r--r--lisp/ibuf-macs.el2
-rw-r--r--lisp/ibuffer.el2
-rw-r--r--lisp/icomplete.el2
-rw-r--r--lisp/ido.el2
-rw-r--r--lisp/ielm.el2
-rw-r--r--lisp/iimage.el2
-rw-r--r--lisp/image-dired.el2
-rw-r--r--lisp/image-file.el2
-rw-r--r--lisp/image-mode.el2
-rw-r--r--lisp/image.el2
-rw-r--r--lisp/imenu.el2
-rw-r--r--lisp/indent.el2
-rw-r--r--lisp/info-look.el2
-rw-r--r--lisp/info-xref.el2
-rw-r--r--lisp/info.el2
-rw-r--r--lisp/informat.el2
-rw-r--r--lisp/isearch.el2
-rw-r--r--lisp/isearchb.el2
-rw-r--r--lisp/iswitchb.el2
-rw-r--r--lisp/jit-lock.el2
-rw-r--r--lisp/jka-cmpr-hook.el2
-rw-r--r--lisp/jka-compr.el2
-rw-r--r--lisp/kermit.el2
-rw-r--r--lisp/kmacro.el2
-rw-r--r--lisp/language/cyril-util.el2
-rw-r--r--lisp/language/czech.el2
-rw-r--r--lisp/language/devanagari.el2
-rw-r--r--lisp/language/georgian.el2
-rw-r--r--lisp/language/ind-util.el2
-rw-r--r--lisp/language/kannada.el2
-rw-r--r--lisp/language/knd-util.el2
-rw-r--r--lisp/language/malayalam.el2
-rw-r--r--lisp/language/mlm-util.el2
-rw-r--r--lisp/language/romanian.el2
-rw-r--r--lisp/language/slovak.el2
-rw-r--r--lisp/language/tamil.el2
-rw-r--r--lisp/language/tml-util.el2
-rw-r--r--lisp/language/utf-8-lang.el2
-rw-r--r--lisp/ledit.el2
-rw-r--r--lisp/loadhist.el2
-rw-r--r--lisp/loadup.el2
-rw-r--r--lisp/locate.el2
-rw-r--r--lisp/log-edit.el2
-rw-r--r--lisp/log-view.el2
-rw-r--r--lisp/longlines.el2
-rw-r--r--lisp/lpr.el2
-rw-r--r--lisp/ls-lisp.el2
-rw-r--r--lisp/macros.el2
-rw-r--r--lisp/makefile.w32-in2
-rw-r--r--lisp/makesum.el2
-rw-r--r--lisp/man.el2
-rw-r--r--lisp/master.el2
-rw-r--r--lisp/menu-bar.el2
-rw-r--r--lisp/midnight.el2
-rw-r--r--lisp/minibuf-eldef.el2
-rw-r--r--lisp/misc.el2
-rw-r--r--lisp/mouse-copy.el2
-rw-r--r--lisp/mouse-drag.el2
-rw-r--r--lisp/mouse-sel.el2
-rw-r--r--lisp/mouse.el2
-rw-r--r--lisp/msb.el2
-rw-r--r--lisp/mwheel.el2
-rw-r--r--lisp/newcomment.el2
-rw-r--r--lisp/novice.el2
-rw-r--r--lisp/outline.el2
-rw-r--r--lisp/paren.el2
-rw-r--r--lisp/paths.el2
-rw-r--r--lisp/pcmpl-cvs.el2
-rw-r--r--lisp/pcmpl-gnu.el2
-rw-r--r--lisp/pcmpl-linux.el2
-rw-r--r--lisp/pcmpl-rpm.el2
-rw-r--r--lisp/pcmpl-unix.el2
-rw-r--r--lisp/pcomplete.el2
-rw-r--r--lisp/pcvs-defs.el2
-rw-r--r--lisp/pcvs-info.el2
-rw-r--r--lisp/pcvs-parse.el2
-rw-r--r--lisp/pcvs-util.el2
-rw-r--r--lisp/pcvs.el2
-rw-r--r--lisp/pgg-def.el2
-rw-r--r--lisp/pgg-gpg.el2
-rw-r--r--lisp/pgg-parse.el2
-rw-r--r--lisp/pgg-pgp.el2
-rw-r--r--lisp/pgg-pgp5.el2
-rw-r--r--lisp/pgg.el2
-rw-r--r--lisp/printing.el2
-rw-r--r--lisp/ps-mule.el2
-rw-r--r--lisp/ps-print.el2
-rw-r--r--lisp/recentf.el2
-rw-r--r--lisp/rect.el2
-rw-r--r--lisp/register.el2
-rw-r--r--lisp/repeat.el2
-rw-r--r--lisp/replace.el2
-rw-r--r--lisp/reposition.el2
-rw-r--r--lisp/resume.el2
-rw-r--r--lisp/reveal.el2
-rw-r--r--lisp/rfn-eshadow.el2
-rw-r--r--lisp/rot13.el2
-rw-r--r--lisp/ruler-mode.el2
-rw-r--r--lisp/s-region.el2
-rw-r--r--lisp/savehist.el2
-rw-r--r--lisp/saveplace.el2
-rw-r--r--lisp/sb-image.el2
-rw-r--r--lisp/scroll-all.el2
-rw-r--r--lisp/scroll-bar.el2
-rw-r--r--lisp/scroll-lock.el2
-rw-r--r--lisp/select.el2
-rw-r--r--lisp/server.el2
-rw-r--r--lisp/ses.el2
-rw-r--r--lisp/shadowfile.el2
-rw-r--r--lisp/shell.el2
-rw-r--r--lisp/simple.el2
-rw-r--r--lisp/skeleton.el2
-rw-r--r--lisp/smerge-mode.el2
-rw-r--r--lisp/sort.el2
-rw-r--r--lisp/soundex.el2
-rw-r--r--lisp/speedbar.el2
-rw-r--r--lisp/startup.el2
-rw-r--r--lisp/strokes.el2
-rw-r--r--lisp/subr.el2
-rw-r--r--lisp/t-mouse.el2
-rw-r--r--lisp/tabify.el2
-rw-r--r--lisp/talk.el2
-rw-r--r--lisp/tar-mode.el2
-rw-r--r--lisp/tempo.el2
-rw-r--r--lisp/term.el2
-rw-r--r--lisp/terminal.el2
-rw-r--r--lisp/thingatpt.el2
-rw-r--r--lisp/thumbs.el2
-rw-r--r--lisp/time-stamp.el2
-rw-r--r--lisp/time.el2
-rw-r--r--lisp/timezone.el2
-rw-r--r--lisp/tmm.el2
-rw-r--r--lisp/tool-bar.el2
-rw-r--r--lisp/tooltip.el2
-rw-r--r--lisp/tree-widget.el2
-rw-r--r--lisp/tutorial.el2
-rw-r--r--lisp/type-break.el2
-rw-r--r--lisp/uniquify.el2
-rw-r--r--lisp/userlock.el2
-rw-r--r--lisp/vc-arch.el2
-rw-r--r--lisp/vc-cvs.el2
-rw-r--r--lisp/vc-hg.el2
-rw-r--r--lisp/vc-hooks.el2
-rw-r--r--lisp/vc-mcvs.el2
-rw-r--r--lisp/vc-rcs.el2
-rw-r--r--lisp/vc-sccs.el2
-rw-r--r--lisp/vc-svn.el2
-rw-r--r--lisp/vc.el2
-rw-r--r--lisp/vcursor.el2
-rw-r--r--lisp/version.el2
-rw-r--r--lisp/view.el2
-rw-r--r--lisp/vms-patch.el2
-rw-r--r--lisp/vmsproc.el2
-rw-r--r--lisp/vt-control.el2
-rw-r--r--lisp/vt100-led.el2
-rw-r--r--lisp/w32-fns.el2
-rw-r--r--lisp/w32-vars.el2
-rw-r--r--lisp/wdired.el2
-rw-r--r--lisp/whitespace.el2
-rw-r--r--lisp/wid-browse.el2
-rw-r--r--lisp/wid-edit.el2
-rw-r--r--lisp/widget.el2
-rw-r--r--lisp/windmove.el2
-rw-r--r--lisp/window.el2
-rw-r--r--lisp/winner.el2
-rw-r--r--lisp/woman.el2
-rw-r--r--lisp/x-dnd.el2
-rw-r--r--lisp/xml.el2
-rw-r--r--lisp/xt-mouse.el2
290 files changed, 290 insertions, 290 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 6c9a7382c33..30abdd09a91 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -603,7 +603,7 @@ This file is part of GNU Emacs.
603 603
604GNU Emacs is free software; you can redistribute it and/or modify 604GNU Emacs is free software; you can redistribute it and/or modify
605it under the terms of the GNU General Public License as published by 605it under the terms of the GNU General Public License as published by
606the Free Software Foundation; either version 2, or (at your option) 606the Free Software Foundation; either version 3, or (at your option)
607any later version. 607any later version.
608 608
609GNU Emacs is distributed in the hope that it will be useful, 609GNU Emacs is distributed in the hope that it will be useful,
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index 484ab88004c..87e151dd06a 100755
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -12,7 +12,7 @@ rem This file is part of GNU Emacs.
12rem 12rem
13rem GNU Emacs is free software; you can redistribute it and/or modify 13rem GNU Emacs is free software; you can redistribute it and/or modify
14rem it under the terms of the GNU General Public License as published by 14rem it under the terms of the GNU General Public License as published by
15rem the Free Software Foundation; either version 2, or (at your option) 15rem the Free Software Foundation; either version 3, or (at your option)
16rem any later version. 16rem any later version.
17rem 17rem
18rem GNU Emacs is distributed in the hope that it will be useful, 18rem GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a7931fe6be..1bf1dd1464f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -34287,7 +34287,7 @@ See ChangeLog.11 for earlier changes.
34287 34287
34288 GNU Emacs is free software; you can redistribute it and/or modify 34288 GNU Emacs is free software; you can redistribute it and/or modify
34289 it under the terms of the GNU General Public License as published by 34289 it under the terms of the GNU General Public License as published by
34290 the Free Software Foundation; either version 2, or (at your option) 34290 the Free Software Foundation; either version 3, or (at your option)
34291 any later version. 34291 any later version.
34292 34292
34293 GNU Emacs is distributed in the hope that it will be useful, 34293 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1
index e068ee4cffb..b3ed7422399 100644
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@@ -3253,7 +3253,7 @@
3253 3253
3254 GNU Emacs is free software; you can redistribute it and/or modify 3254 GNU Emacs is free software; you can redistribute it and/or modify
3255 it under the terms of the GNU General Public License as published by 3255 it under the terms of the GNU General Public License as published by
3256 the Free Software Foundation; either version 2, or (at your option) 3256 the Free Software Foundation; either version 3, or (at your option)
3257 any later version. 3257 any later version.
3258 3258
3259 GNU Emacs is distributed in the hope that it will be useful, 3259 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index d63ef8fbbd7..884a583b752 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -23541,7 +23541,7 @@ See ChangeLog.9 for earlier changes.
23541 23541
23542 GNU Emacs is free software; you can redistribute it and/or modify 23542 GNU Emacs is free software; you can redistribute it and/or modify
23543 it under the terms of the GNU General Public License as published by 23543 it under the terms of the GNU General Public License as published by
23544 the Free Software Foundation; either version 2, or (at your option) 23544 the Free Software Foundation; either version 3, or (at your option)
23545 any later version. 23545 any later version.
23546 23546
23547 GNU Emacs is distributed in the hope that it will be useful, 23547 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index 0ef83a0ed9d..c92bdec978f 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -14343,7 +14343,7 @@ See ChangeLog.10 for earlier changes.
14343 14343
14344 GNU Emacs is free software; you can redistribute it and/or modify 14344 GNU Emacs is free software; you can redistribute it and/or modify
14345 it under the terms of the GNU General Public License as published by 14345 it under the terms of the GNU General Public License as published by
14346 the Free Software Foundation; either version 2, or (at your option) 14346 the Free Software Foundation; either version 3, or (at your option)
14347 any later version. 14347 any later version.
14348 14348
14349 GNU Emacs is distributed in the hope that it will be useful, 14349 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index fd3d0a16b47..a5e92db37af 100644
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -4001,7 +4001,7 @@ See ChangeLog.1 for earlier changes.
4001 4001
4002 GNU Emacs is free software; you can redistribute it and/or modify 4002 GNU Emacs is free software; you can redistribute it and/or modify
4003 it under the terms of the GNU General Public License as published by 4003 it under the terms of the GNU General Public License as published by
4004 the Free Software Foundation; either version 2, or (at your option) 4004 the Free Software Foundation; either version 3, or (at your option)
4005 any later version. 4005 any later version.
4006 4006
4007 GNU Emacs is distributed in the hope that it will be useful, 4007 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index c2379009c00..e2404780519 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -12622,7 +12622,7 @@ See ChangeLog.2 for earlier changes.
12622 12622
12623 GNU Emacs is free software; you can redistribute it and/or modify 12623 GNU Emacs is free software; you can redistribute it and/or modify
12624 it under the terms of the GNU General Public License as published by 12624 it under the terms of the GNU General Public License as published by
12625 the Free Software Foundation; either version 2, or (at your option) 12625 the Free Software Foundation; either version 3, or (at your option)
12626 any later version. 12626 any later version.
12627 12627
12628 GNU Emacs is distributed in the hope that it will be useful, 12628 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index 872a39fa4b2..1db8ba20a79 100644
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -8946,7 +8946,7 @@ See ChangeLog.3 for earlier changes.
8946 8946
8947 GNU Emacs is free software; you can redistribute it and/or modify 8947 GNU Emacs is free software; you can redistribute it and/or modify
8948 it under the terms of the GNU General Public License as published by 8948 it under the terms of the GNU General Public License as published by
8949 the Free Software Foundation; either version 2, or (at your option) 8949 the Free Software Foundation; either version 3, or (at your option)
8950 any later version. 8950 any later version.
8951 8951
8952 GNU Emacs is distributed in the hope that it will be useful, 8952 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index 10ac1321a35..5d2c4766d73 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -9268,7 +9268,7 @@ See ChangeLog.4 for earlier changes.
9268 9268
9269 GNU Emacs is free software; you can redistribute it and/or modify 9269 GNU Emacs is free software; you can redistribute it and/or modify
9270 it under the terms of the GNU General Public License as published by 9270 it under the terms of the GNU General Public License as published by
9271 the Free Software Foundation; either version 2, or (at your option) 9271 the Free Software Foundation; either version 3, or (at your option)
9272 any later version. 9272 any later version.
9273 9273
9274 GNU Emacs is distributed in the hope that it will be useful, 9274 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 5475a7ee100..502fb5245a8 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -8029,7 +8029,7 @@ See ChangeLog.5 for earlier changes.
8029 8029
8030 GNU Emacs is free software; you can redistribute it and/or modify 8030 GNU Emacs is free software; you can redistribute it and/or modify
8031 it under the terms of the GNU General Public License as published by 8031 it under the terms of the GNU General Public License as published by
8032 the Free Software Foundation; either version 2, or (at your option) 8032 the Free Software Foundation; either version 3, or (at your option)
8033 any later version. 8033 any later version.
8034 8034
8035 GNU Emacs is distributed in the hope that it will be useful, 8035 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 4124a1dd955..72cde28f158 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -23146,7 +23146,7 @@ See ChangeLog.6 for earlier changes.
23146 23146
23147 GNU Emacs is free software; you can redistribute it and/or modify 23147 GNU Emacs is free software; you can redistribute it and/or modify
23148 it under the terms of the GNU General Public License as published by 23148 it under the terms of the GNU General Public License as published by
23149 the Free Software Foundation; either version 2, or (at your option) 23149 the Free Software Foundation; either version 3, or (at your option)
23150 any later version. 23150 any later version.
23151 23151
23152 GNU Emacs is distributed in the hope that it will be useful, 23152 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 21ccff71d6f..6b770465df5 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -9995,7 +9995,7 @@ See ChangeLog.7 for earlier changes.
9995 9995
9996 GNU Emacs is free software; you can redistribute it and/or modify 9996 GNU Emacs is free software; you can redistribute it and/or modify
9997 it under the terms of the GNU General Public License as published by 9997 it under the terms of the GNU General Public License as published by
9998 the Free Software Foundation; either version 2, or (at your option) 9998 the Free Software Foundation; either version 3, or (at your option)
9999 any later version. 9999 any later version.
10000 10000
10001 GNU Emacs is distributed in the hope that it will be useful, 10001 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 8f6177e9fe9..4f0bfa6d2a4 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -20702,7 +20702,7 @@ See ChangeLog.8 for earlier changes.
20702 20702
20703 GNU Emacs is free software; you can redistribute it and/or modify 20703 GNU Emacs is free software; you can redistribute it and/or modify
20704 it under the terms of the GNU General Public License as published by 20704 it under the terms of the GNU General Public License as published by
20705 the Free Software Foundation; either version 2, or (at your option) 20705 the Free Software Foundation; either version 3, or (at your option)
20706 any later version. 20706 any later version.
20707 20707
20708 GNU Emacs is distributed in the hope that it will be useful, 20708 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index dff3009b215..81d7b1d184d 100644
--- a/lisp/Makefile.in
+++ b/lisp/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/lisp/abbrev.el b/lisp/abbrev.el
index 83a3fbbe49d..1471ca7bebd 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -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,
diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el
index faaceaf3113..e4107737d42 100644
--- a/lisp/abbrevlist.el
+++ b/lisp/abbrevlist.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 09368d08f9e..fd6089184c8 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -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,
diff --git a/lisp/align.el b/lisp/align.el
index 75046c147cb..fca00b301ad 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/allout.el b/lisp/allout.el
index 2330e6df121..f6598063e97 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -14,7 +14,7 @@
14 14
15;; GNU Emacs is free software; you can redistribute it and/or modify 15;; GNU Emacs is free software; you can redistribute it and/or modify
16;; it under the terms of the GNU General Public License as published by 16;; it under the terms of the GNU General Public License as published by
17;; the Free Software Foundation; either version 2, or (at your option) 17;; the Free Software Foundation; either version 3, or (at your option)
18;; any later version. 18;; any later version.
19 19
20;; GNU Emacs is distributed in the hope that it will be useful, 20;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index ad33ab2533d..769b21a38f3 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify it 13;; GNU Emacs is free software; you can redistribute it and/or modify it
14;; under the terms of the GNU General Public License as published by the 14;; under the terms of the GNU General Public License as published by the
15;; Free Software Foundation; either version 2, or (at your option) any 15;; Free Software Foundation; either version 3, or (at your option) any
16;; later version. 16;; later version.
17;; 17;;
18;; GNU Emacs is distributed in the hope that it will be useful, but 18;; GNU Emacs is distributed in the hope that it will be useful, but
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 8df7992230a..9e784e087e6 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 1a22ac628e6..39fd10c6b6f 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/array.el b/lisp/array.el
index 979101ef75d..bbb3d9d40bf 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/autoarg.el b/lisp/autoarg.el
index 39dd3219621..7f3412043ee 100644
--- a/lisp/autoarg.el
+++ b/lisp/autoarg.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 2dad1fc2ed9..805065ba009 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 170ca4b88c2..1f4ebc57b19 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/avoid.el b/lisp/avoid.el
index 22eb4aad9aa..341aaf0f7b8 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -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,
diff --git a/lisp/battery.el b/lisp/battery.el
index f10245f44ac..e1dbc183557 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -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,
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 5f3279a9ac4..4ce58c204eb 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -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,
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index d0c131e386e..5a173e6ba1a 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/bs.el b/lisp/bs.el
index 5951d129d96..9d89eb17b2d 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -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,
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index a6e24b5343e..51db6bc50d9 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -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,
diff --git a/lisp/button.el b/lisp/button.el
index ebc078f8193..3afe9302042 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -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,
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 53a3c96d948..80d68306c28 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify it 12;; GNU Emacs is free software; you can redistribute it and/or modify it
13;; under the terms of the GNU General Public License as published by the 13;; under the terms of the GNU General Public License as published by the
14;; Free Software Foundation; either version 2, or (at your option) any 14;; Free Software Foundation; either version 3, or (at your option) any
15;; later version. 15;; later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, but 17;; GNU Emacs is distributed in the hope that it will be useful, but
diff --git a/lisp/case-table.el b/lisp/case-table.el
index 64cf69ba2bf..33768bb2277 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/cdl.el b/lisp/cdl.el
index d238a42dd68..cf8afa70372 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/chistory.el b/lisp/chistory.el
index 286750418cf..4616fd4c1dd 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index 12840441a6a..dc8e6e8e81b 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/comint.el b/lisp/comint.el
index 43d12946fce..2abb362a157 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index 19ad84e11c0..91edf4c3755 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -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,
diff --git a/lisp/complete.el b/lisp/complete.el
index b1bb36f9dfa..4b4e4784b3f 100644
--- a/lisp/complete.el
+++ b/lisp/complete.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/completion.el b/lisp/completion.el
index 25b95852536..2180e2dace8 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 713b84f8bc0..ed248ac8bda 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -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,
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 0984fc73e43..b75f780097b 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index de5633525eb..be88b499fef 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -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,
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 76a4710b846..27d72d4e049 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -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,
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 5dc34410815..1c80d7977cf 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/custom.el b/lisp/custom.el
index f5028ddc0d5..c50fcb05f42 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el
index 428b2887db5..55fc52544b1 100644
--- a/lisp/cvs-status.el
+++ b/lisp/cvs-status.el
@@ -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,
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 3e65f056932..0fa23db84d4 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 9e143dc0b09..6be6a785c2b 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 7028bad9ad4..e33dac6c2f9 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 8b36270f46c..d14aba7ae6f 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/desktop.el b/lisp/desktop.el
index cafa1868b33..0fa38ed3c91 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/dframe.el b/lisp/dframe.el
index eda6d45bf21..b90d15e74db 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 3cd2fb37dbb..3f96ba6e453 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -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,
diff --git a/lisp/diff.el b/lisp/diff.el
index 83de826bd03..c612b2fb77c 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -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,
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 4bad556e015..fd57c4b8885 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 75b6456a5cf..b06ca1b0908 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -14,7 +14,7 @@
14 14
15;; GNU Emacs is free software; you can redistribute it and/or modify 15;; GNU Emacs is free software; you can redistribute it and/or modify
16;; it under the terms of the GNU General Public License as published by 16;; it under the terms of the GNU General Public License as published by
17;; the Free Software Foundation; either version 2, or (at your option) 17;; the Free Software Foundation; either version 3, or (at your option)
18;; any later version. 18;; any later version.
19 19
20;; GNU Emacs is distributed in the hope that it will be useful, 20;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/dired.el b/lisp/dired.el
index ba488fc9c6a..3639f44b553 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el
index 36009d16172..11442d8f6f5 100644
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 2a4dd01897d..5a9a69680bf 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 193fa962ea7..72ce4c6d777 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -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,
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index cf626185e99..c66cbc7933a 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -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,
diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el
index f0b6c82f839..ef2fd5e422d 100644
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@@ -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,
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index b1dc399418a..0de7f096507 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -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,
diff --git a/lisp/double.el b/lisp/double.el
index dc91d4be53f..4b1d59ff1ec 100644
--- a/lisp/double.el
+++ b/lisp/double.el
@@ -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,
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index 9323c8133e5..744a7ba4617 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/echistory.el b/lisp/echistory.el
index 02fde15266f..8d5b5e2beea 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -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,
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index f1fbc5eea61..48cd7c79d4e 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -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/lisp/ediff-help.el b/lisp/ediff-help.el
index c3aa34e3c69..fdc15ee2f80 100644
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@@ -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/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 17df800acc8..951abc20f73 100644
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -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/lisp/ediff-init.el b/lisp/ediff-init.el
index 0ecc809797f..88438379273 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -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/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 79a9c48718a..d9d19f17630 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -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/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 8fdd319746c..5b8b8d8ec44 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -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/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index c8a8b70f162..89d08932b58 100644
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -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/lisp/ediff-util.el b/lisp/ediff-util.el
index 7483128b71a..1b1db4a60cf 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -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/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 9bbcf99d788..d0a323980c2 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -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/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 829ba1051be..897845c182a 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -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/lisp/ediff.el b/lisp/ediff.el
index c5f5c48f8da..82a70e64b49 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -15,7 +15,7 @@
15 15
16;; GNU Emacs is free software; you can redistribute it and/or modify 16;; GNU Emacs is free software; you can redistribute it and/or modify
17;; it under the terms of the GNU General Public License as published by 17;; it under the terms of the GNU General Public License as published by
18;; the Free Software Foundation; either version 2, or (at your option) 18;; the Free Software Foundation; either version 3, or (at your option)
19;; any later version. 19;; any later version.
20 20
21;; GNU Emacs is distributed in the hope that it will be useful, 21;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 0842d63836f..d914d409d05 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 80242ff2b03..ee4be24f3c1 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -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,
diff --git a/lisp/electric.el b/lisp/electric.el
index f9699b29869..445efe76de4 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index dd211900345..ccbedfe7d0b 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -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,
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index dc93f093f9e..8ebf2f54a2e 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/env.el b/lisp/env.el
index 167bc0f2f2b..d04df5e48b6 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -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,
diff --git a/lisp/expand.el b/lisp/expand.el
index c34c18b4483..1ab71111f68 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index aaf9cabb480..53b92c5172f 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -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,
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 44f184b12ee..26a0231bf1a 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -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,
diff --git a/lisp/faces.el b/lisp/faces.el
index a8c92ab9a75..090fbdba035 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -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,
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 5bba729fce3..e9ef3e10237 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/filecache.el b/lisp/filecache.el
index 10942c77f5e..baa171d535a 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/files.el b/lisp/files.el
index 706b810fb0b..444e402f438 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -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,
diff --git a/lisp/filesets.el b/lisp/filesets.el
index e13c4a321dd..5554e26bc06 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -10,7 +10,7 @@
10 10
11;; This program is free software; you can redistribute it and/or modify 11;; This program 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;; This program is distributed in the hope that it will be useful, 16;; This program is distributed in the hope that it will be useful,
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 47655129e29..0a3de850762 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 5b15e0d1692..accf918aada 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el
index 0dd35f23514..9b1f3275dfc 100644
--- a/lisp/find-lisp.el
+++ b/lisp/find-lisp.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/finder.el b/lisp/finder.el
index 96a806a2e1e..26830ae1c3a 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index 5ba5aa6be20..af70c78cf26 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 73c8556ad5b..2f73b2ccf15 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/follow.el b/lisp/follow.el
index 9654e294d13..598db2eabea 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/font-core.el b/lisp/font-core.el
index 3edf2140393..7d7a65e83cc 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -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,
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 265cc4bf682..9eb4fdde2df 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/format.el b/lisp/format.el
index 287f2d7ce72..d029e3d4683 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -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/lisp/forms.el b/lisp/forms.el
index 9f37ce04463..e06599a3073 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -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/lisp/frame.el b/lisp/frame.el
index 4ff87efc4e1..13c42ed5ad1 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -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,
diff --git a/lisp/fringe.el b/lisp/fringe.el
index 9f4ec90a13a..3160d960ffd 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -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,
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index b60c59c0f70..fbabf6e6996 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/gs.el b/lisp/gs.el
index ca58ce9c642..036eafbdcca 100644
--- a/lisp/gs.el
+++ b/lisp/gs.el
@@ -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,
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index 562102217da..ee35e04dec0 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -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/lisp/help-fns.el b/lisp/help-fns.el
index dab6bdb157c..d84a861a019 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -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,
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index e76eaaa9191..eac7d442c7b 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 3da2a23efc4..5344d750eef 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -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,
diff --git a/lisp/help.el b/lisp/help.el
index 926c43c300d..f75e26f93e6 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -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,
diff --git a/lisp/hexl.el b/lisp/hexl.el
index f63ed0aafa5..17d2d83b681 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 62f92409bde..522a50b9a7f 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -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,
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index 19cecb1c8be..b1238b66419 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -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,
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 49d77543123..f1a58f12c6b 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 54f2e00b0ae..6a988d47c49 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 6628a07bd29..4f510472d54 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -12,7 +12,7 @@
12 12
13;; This program is free software; you can redistribute it and/or 13;; This program is free software; you can redistribute it and/or
14;; modify it under the terms of the GNU General Public License as 14;; modify it under the terms of the GNU General Public License as
15;; published by the Free Software Foundation; either version 2, or (at 15;; published by the Free Software Foundation; either version 3, or (at
16;; your option) any later version. 16;; your option) any later version.
17 17
18;; This program is distributed in the hope that it will be useful, but 18;; This program is distributed in the hope that it will be useful, but
diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el
index f84b84cfd4d..ffab61688f2 100644
--- a/lisp/ibuf-macs.el
+++ b/lisp/ibuf-macs.el
@@ -12,7 +12,7 @@
12 12
13;; This program is free software; you can redistribute it and/or 13;; This program is free software; you can redistribute it and/or
14;; modify it under the terms of the GNU General Public License as 14;; modify it under the terms of the GNU General Public License as
15;; published by the Free Software Foundation; either version 2, or (at 15;; published by the Free Software Foundation; either version 3, or (at
16;; your option) any later version. 16;; your option) any later version.
17 17
18;; This program is distributed in the hope that it will be useful, but 18;; This program is distributed in the hope that it will be useful, but
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index cdb00ef2fba..c4842b9d982 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -12,7 +12,7 @@
12 12
13;; This program is free software; you can redistribute it and/or 13;; This program is free software; you can redistribute it and/or
14;; modify it under the terms of the GNU General Public License as 14;; modify it under the terms of the GNU General Public License as
15;; published by the Free Software Foundation; either version 2, or (at 15;; published by the Free Software Foundation; either version 3, or (at
16;; your option) any later version. 16;; your option) any later version.
17 17
18;; This program is distributed in the hope that it will be useful, but 18;; This program is distributed in the hope that it will be useful, but
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 6599c1442bc..d1e8f9cc3f8 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ido.el b/lisp/ido.el
index 0808075b495..e5c4b644f95 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ielm.el b/lisp/ielm.el
index cceef70b37a..98df0d1e3d4 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/iimage.el b/lisp/iimage.el
index 76e01614f6e..29d98cbda69 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -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,
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index db6415977b4..65ee12a1e07 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -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,
diff --git a/lisp/image-file.el b/lisp/image-file.el
index 5251a2c3ebe..db6c925520a 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -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,
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 18246b8dc90..deacf38c48d 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -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/lisp/image.el b/lisp/image.el
index 60d9c4db39c..cf909da0e95 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -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,
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 5644c517395..9aa1f5ea088 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/indent.el b/lisp/indent.el
index 0b0588ab515..a005abebee5 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -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/lisp/info-look.el b/lisp/info-look.el
index a4280e97c99..8ace7730a12 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 61bfcc09260..e2d08a0f991 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -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/lisp/info.el b/lisp/info.el
index 3b709abca37..e77aeab6b8f 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -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,
diff --git a/lisp/informat.el b/lisp/informat.el
index ea32343430e..18a459ba0fe 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -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,
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 00e7f1cc306..7b90e319766 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index 3d8af066395..ff2d47f4a50 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index 98fad7bf824..068f5fff2cd 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 0471edb7891..d32f150058f 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -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,
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index b13ca7181ec..7e15af0d75f 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 32df6ce53f9..33d3fe379d8 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/kermit.el b/lisp/kermit.el
index 5d892999781..0716957a846 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 4dc06a4ada3..c9c5066f88c 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -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,
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index 3395ce4d1ac..aa22584d6ce 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -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/lisp/language/czech.el b/lisp/language/czech.el
index 43dff0d57ba..982fa964583 100644
--- a/lisp/language/czech.el
+++ b/lisp/language/czech.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el
index c337ecb2a4f..c348a936f50 100644
--- a/lisp/language/devanagari.el
+++ b/lisp/language/devanagari.el
@@ -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,
diff --git a/lisp/language/georgian.el b/lisp/language/georgian.el
index 21b61b2667c..9fd25ae5ed3 100644
--- a/lisp/language/georgian.el
+++ b/lisp/language/georgian.el
@@ -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,
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 521fc252372..d33c1ee4a9b 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -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,
diff --git a/lisp/language/kannada.el b/lisp/language/kannada.el
index 309f2785f5f..f720a9c7367 100644
--- a/lisp/language/kannada.el
+++ b/lisp/language/kannada.el
@@ -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/lisp/language/knd-util.el b/lisp/language/knd-util.el
index dd8a722c706..abb887347e7 100644
--- a/lisp/language/knd-util.el
+++ b/lisp/language/knd-util.el
@@ -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/lisp/language/malayalam.el b/lisp/language/malayalam.el
index bc2a9614714..731a9ae67af 100644
--- a/lisp/language/malayalam.el
+++ b/lisp/language/malayalam.el
@@ -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/lisp/language/mlm-util.el b/lisp/language/mlm-util.el
index aac0951eaec..c5244279837 100644
--- a/lisp/language/mlm-util.el
+++ b/lisp/language/mlm-util.el
@@ -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/lisp/language/romanian.el b/lisp/language/romanian.el
index 9776fe23464..80e27b3b8f0 100644
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -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,
diff --git a/lisp/language/slovak.el b/lisp/language/slovak.el
index 06d10731e85..6b7fa1f6653 100644
--- a/lisp/language/slovak.el
+++ b/lisp/language/slovak.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/language/tamil.el b/lisp/language/tamil.el
index e4a495ca635..08f16e273c8 100644
--- a/lisp/language/tamil.el
+++ b/lisp/language/tamil.el
@@ -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/lisp/language/tml-util.el b/lisp/language/tml-util.el
index 31e2e97d434..ebc7b1f01f7 100644
--- a/lisp/language/tml-util.el
+++ b/lisp/language/tml-util.el
@@ -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/lisp/language/utf-8-lang.el b/lisp/language/utf-8-lang.el
index 2bd3419ecc8..a4bd6fbf7b0 100644
--- a/lisp/language/utf-8-lang.el
+++ b/lisp/language/utf-8-lang.el
@@ -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,
diff --git a/lisp/ledit.el b/lisp/ledit.el
index 52ddc2c55a0..5d035f93512 100644
--- a/lisp/ledit.el
+++ b/lisp/ledit.el
@@ -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,
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 84a865573af..70f2ee20646 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 6a8d5b263eb..7c144bf8315 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -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,
diff --git a/lisp/locate.el b/lisp/locate.el
index 58ec48c55c4..95060d36197 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -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,
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 8f63635ee49..94d97abc8a5 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -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,
diff --git a/lisp/log-view.el b/lisp/log-view.el
index b9368e24ebf..6a1fc9a11b1 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -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,
diff --git a/lisp/longlines.el b/lisp/longlines.el
index b75adb4f0d9..fa73ef7057d 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 9775abc74f9..4df98d6d751 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -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,
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index b4cd485d7a0..a016b8369bf 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/macros.el b/lisp/macros.el
index 66cc4bba28c..23d0a33fde1 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -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,
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 55b9f9ed5e2..1da46b7684e 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/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/lisp/makesum.el b/lisp/makesum.el
index a2b5c00aa91..d3eaa18008f 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -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,
diff --git a/lisp/man.el b/lisp/man.el
index e74f9734e51..56539072439 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/master.el b/lisp/master.el
index e2fdbfa559a..caa48d1171f 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 7ad91dffa9f..a0044dcc2da 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/midnight.el b/lisp/midnight.el
index b20d7eed339..7529cd412cc 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 7d6442f6b0d..52bab8f1f27 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -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,
diff --git a/lisp/misc.el b/lisp/misc.el
index a9636a62f16..d3c1a46dfdf 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -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,
diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el
index 880bdbb9029..5f8a9a235f4 100644
--- a/lisp/mouse-copy.el
+++ b/lisp/mouse-copy.el
@@ -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,
diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index 0e4857658eb..f1d56eccc66 100644
--- a/lisp/mouse-drag.el
+++ b/lisp/mouse-drag.el
@@ -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,
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index a421c8bb10b..2343b0c4cda 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -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,
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 5577b94d01a..e35bea81748 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -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,
diff --git a/lisp/msb.el b/lisp/msb.el
index ab25a339110..8dfe31c99d2 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 7996554a9ec..b8e407483a5 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -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/lisp/newcomment.el b/lisp/newcomment.el
index b0a166465fa..63ceacb0440 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/novice.el b/lisp/novice.el
index f5c3019dfc2..c547b4744b5 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -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,
diff --git a/lisp/outline.el b/lisp/outline.el
index d0c121a12c4..6eabd8f3d02 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -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,
diff --git a/lisp/paren.el b/lisp/paren.el
index 95f718d5683..7deb9172a39 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/paths.el b/lisp/paths.el
index 2e2ab6584fe..113bf2ec91e 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -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,
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index 912cd6caca7..84915a78cff 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -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/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index b413ca99231..6431e36f5ad 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -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/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index ed21d8c337c..c2b2fcb8dae 100644
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -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/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index b84bc28f194..4fe7f22c46d 100644
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -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/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index 9cd5de1e4d1..cb1866df2ea 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -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/lisp/pcomplete.el b/lisp/pcomplete.el
index c1da9fb9132..206fb7bd3da 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -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,
diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index 2641c1cb959..5798be4b14d 100644
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -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,
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index 880972bff9d..25fe2069909 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -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,
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el
index d9e2f2411a1..c26a27ed008 100644
--- a/lisp/pcvs-parse.el
+++ b/lisp/pcvs-parse.el
@@ -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,
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 58c605a19d2..6991f796526 100644
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -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,
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 50cad7e7c14..c2f7cb79102 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -19,7 +19,7 @@
19 19
20;; GNU Emacs is free software; you can redistribute it and/or modify 20;; GNU Emacs is free software; you can redistribute it and/or modify
21;; it under the terms of the GNU General Public License as published by 21;; it under the terms of the GNU General Public License as published by
22;; the Free Software Foundation; either version 2, or (at your option) 22;; the Free Software Foundation; either version 3, or (at your option)
23;; any later version. 23;; any later version.
24 24
25;; GNU Emacs is distributed in the hope that it will be useful, 25;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el
index 208f10b0a8e..e6c309b648a 100644
--- a/lisp/pgg-def.el
+++ b/lisp/pgg-def.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 014357aa4e6..df98e94e305 100644
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/pgg-parse.el b/lisp/pgg-parse.el
index 4262300aeda..11d0c652d34 100644
--- a/lisp/pgg-parse.el
+++ b/lisp/pgg-parse.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el
index 9bc494a5ef7..36f72eff8e1 100644
--- a/lisp/pgg-pgp.el
+++ b/lisp/pgg-pgp.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/pgg-pgp5.el b/lisp/pgg-pgp5.el
index 7525ee3d981..05274d16e36 100644
--- a/lisp/pgg-pgp5.el
+++ b/lisp/pgg-pgp5.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/pgg.el b/lisp/pgg.el
index eabc4f47408..13a5148d5cd 100644
--- a/lisp/pgg.el
+++ b/lisp/pgg.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/printing.el b/lisp/printing.el
index 50d158c3d29..f84a2112661 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -20,7 +20,7 @@ Please send all bug fixes and enhancements to
20 20
21;; GNU Emacs is free software; you can redistribute it and/or modify it under 21;; GNU Emacs is free software; you can redistribute it and/or modify it under
22;; the terms of the GNU General Public License as published by the Free 22;; the terms of the GNU General Public License as published by the Free
23;; Software Foundation; either version 2, or (at your option) any later 23;; Software Foundation; either version 3, or (at your option) any later
24;; version. 24;; version.
25 25
26;; GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY 26;; GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index ec9a66d1d35..2c3eb7207ef 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 32a41252abb..a2346b8f76b 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -27,7 +27,7 @@ Please send all bug fixes and enhancements to
27 27
28;; GNU Emacs is free software; you can redistribute it and/or modify it under 28;; GNU Emacs is free software; you can redistribute it and/or modify it under
29;; the terms of the GNU General Public License as published by the Free 29;; the terms of the GNU General Public License as published by the Free
30;; Software Foundation; either version 2, or (at your option) any later 30;; Software Foundation; either version 3, or (at your option) any later
31;; version. 31;; version.
32 32
33;; GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY 33;; GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY
diff --git a/lisp/recentf.el b/lisp/recentf.el
index c55f15c69e9..86263ae4924 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published 13;; it under the terms of the GNU General Public License as published
14;; by the Free Software Foundation; either version 2, or (at your 14;; by the Free Software Foundation; either version 3, or (at your
15;; option) any later version. 15;; option) any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/rect.el b/lisp/rect.el
index 5910c69bab9..9655c09b80f 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -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,
diff --git a/lisp/register.el b/lisp/register.el
index 8f8b786cb9e..1f0811561c2 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -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,
diff --git a/lisp/repeat.el b/lisp/repeat.el
index 46099b664d9..ad8c4d818f8 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/replace.el b/lisp/replace.el
index 5d4c2a2eba6..8d8d9fc7af5 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -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/lisp/reposition.el b/lisp/reposition.el
index 3fa4445f73c..3a5f24cbe8f 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/resume.el b/lisp/resume.el
index bb92ced271c..d7dfb6ab43e 100644
--- a/lisp/resume.el
+++ b/lisp/resume.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/reveal.el b/lisp/reveal.el
index 098033d9e59..130511d7666 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -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,
diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index 6798b0f8733..daa66118b38 100644
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -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,
diff --git a/lisp/rot13.el b/lisp/rot13.el
index fbc5eceea24..a536193c4b5 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -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,
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 13895aea2eb..156625bd41a 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -13,7 +13,7 @@
13 13
14;; This program is free software; you can redistribute it and/or 14;; This program is free software; you can redistribute it and/or
15;; modify it under the terms of the GNU General Public License as 15;; modify it under the terms of the GNU General Public License as
16;; published by the Free Software Foundation; either version 2, or (at 16;; published by the Free Software Foundation; either version 3, or (at
17;; your option) any later version. 17;; your option) any later version.
18 18
19;; This program is distributed in the hope that it will be useful, but 19;; This program is distributed in the hope that it will be useful, but
diff --git a/lisp/s-region.el b/lisp/s-region.el
index 363f47eaa75..92e992bc611 100644
--- a/lisp/s-region.el
+++ b/lisp/s-region.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 9555bce9bd4..83b46e5e04f 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -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,
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 08e79baaf9e..b6f3a76ff23 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/sb-image.el b/lisp/sb-image.el
index d7d435642d8..7f3d0cac7f5 100644
--- a/lisp/sb-image.el
+++ b/lisp/sb-image.el
@@ -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,
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index b62246e3b3d..7d6a08b2092 100644
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -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,
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index ccda2a56b07..770e01ccbca 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -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,
diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el
index 5896d6478eb..e5d6fcad868 100644
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -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,
diff --git a/lisp/select.el b/lisp/select.el
index d96038bd256..b1fa729a664 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/server.el b/lisp/server.el
index 690f51034f2..1b64e443752 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/ses.el b/lisp/ses.el
index c729ca4b432..e19b177ef42 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -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,
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index af7356db71f..ee6dcc15b7e 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -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,
diff --git a/lisp/shell.el b/lisp/shell.el
index a218981256a..d43fcdc8fca 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/simple.el b/lisp/simple.el
index daedae6100c..6148a917f59 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -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,
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 9e2dacd2201..33e223e4b2b 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 8e239ab5a26..ef80ef81679 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -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,
diff --git a/lisp/sort.el b/lisp/sort.el
index fb96a3ef1c9..eb8de8243fc 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/soundex.el b/lisp/soundex.el
index 2133f1cf381..6e727172e6a 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 4ecb0ec7dd3..c51d2ef9a80 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -17,7 +17,7 @@ this version is not backward compatible to 0.14 or earlier.")
17 17
18;; GNU Emacs is free software; you can redistribute it and/or modify 18;; GNU Emacs is free software; you can redistribute it and/or modify
19;; it under the terms of the GNU General Public License as published by 19;; it under the terms of the GNU General Public License as published by
20;; the Free Software Foundation; either version 2, or (at your option) 20;; the Free Software Foundation; either version 3, or (at your option)
21;; any later version. 21;; any later version.
22 22
23;; GNU Emacs is distributed in the hope that it will be useful, 23;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/startup.el b/lisp/startup.el
index 37336d45e29..3853ba4fe80 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -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,
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 5886f3d1810..528ea477363 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/subr.el b/lisp/subr.el
index 0849403bd51..84f216b0861 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -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,
diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index 0da957ec3f8..12129d93602 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -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,
diff --git a/lisp/tabify.el b/lisp/tabify.el
index d0d65efcf9c..3711b4d56c7 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -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/lisp/talk.el b/lisp/talk.el
index cb4043ee1ac..8af1577ac37 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -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,
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 684396f1692..77b62a19289 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/tempo.el b/lisp/tempo.el
index f12c126c349..261dac71818 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/term.el b/lisp/term.el
index 4ec195662ca..c7b5ee249d1 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/terminal.el b/lisp/terminal.el
index cf31afd09a7..7814978dcc1 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index fd387a22c0f..35b60e4d3bd 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 7df2d295c9e..6aa81268f12 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -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,
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 973ff972af0..7316e6db75a 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/time.el b/lisp/time.el
index 660413369f9..2b6a671c6bd 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -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/lisp/timezone.el b/lisp/timezone.el
index 005e1f928d0..69f6131b1b2 100644
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/tmm.el b/lisp/tmm.el
index f70a8cd2ea2..b6b5e46aa27 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 1dffbd2265a..768fee70411 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -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,
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index f57758b9b48..a5d0309f125 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -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,
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 54bbbc9b1dd..8b429ac3a66 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -11,7 +11,7 @@
11 11
12;; This program is free software; you can redistribute it and/or 12;; This program is free software; you can redistribute it and/or
13;; modify it under the terms of the GNU General Public License as 13;; modify it under the terms of the GNU General Public License as
14;; published by the Free Software Foundation; either version 2, or (at 14;; published by the Free Software Foundation; either version 3, or (at
15;; your option) any later version. 15;; your option) any later version.
16 16
17;; This program is distributed in the hope that it will be useful, but 17;; This program is distributed in the hope that it will be useful, but
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index feaabbbb19e..bfa7f42d8ab 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -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/lisp/type-break.el b/lisp/type-break.el
index e065e32df54..59b49f7092c 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index d79add6899f..1c00d1edadb 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/userlock.el b/lisp/userlock.el
index 329d46c2124..17cbc0c3e55 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -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,
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index 488f9108d36..b0cdea9d31f 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -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/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 583e02efd5d..0c9615e6469 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 02f6e460f71..ea32c4a33b6 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -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/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 29c827852fb..a47637d37ee 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index 7e5dbd47a70..0007aa45ea4 100644
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -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/lisp/vc-rcs.el b/lisp/vc-rcs.el
index a4b3b11301e..d73f8522115 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index bad1c2b3099..f7a0f027a4c 100644
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 1538a2a1ab3..ceb1df52eaf 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -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/lisp/vc.el b/lisp/vc.el
index 37b7b46b603..c3c03131caa 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -13,7 +13,7 @@
13 13
14;; GNU Emacs is free software; you can redistribute it and/or modify 14;; GNU Emacs is free software; you can redistribute it and/or modify
15;; it under the terms of the GNU General Public License as published by 15;; it under the terms of the GNU General Public License as published by
16;; the Free Software Foundation; either version 2, or (at your option) 16;; the Free Software Foundation; either version 3, or (at your option)
17;; any later version. 17;; any later version.
18 18
19;; GNU Emacs is distributed in the hope that it will be useful, 19;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index f8812f8723d..b8c93f64ff5 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/version.el b/lisp/version.el
index 0ed3927d0fc..1657dc0e270 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -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,
diff --git a/lisp/view.el b/lisp/view.el
index 57d264d2b8e..2f541fbf360 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el
index d848f2246ae..acc76c27171 100644
--- a/lisp/vms-patch.el
+++ b/lisp/vms-patch.el
@@ -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,
diff --git a/lisp/vmsproc.el b/lisp/vmsproc.el
index 71bb5e01574..e36400476f4 100644
--- a/lisp/vmsproc.el
+++ b/lisp/vmsproc.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/vt-control.el b/lisp/vt-control.el
index 4b78be36f4e..d7a7909c5a7 100644
--- a/lisp/vt-control.el
+++ b/lisp/vt-control.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index 5d25eb104df..d3ebbfc0afc 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index fc5afd76664..f37b4dcb789 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -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,
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 81d15c9ae1e..5eaac3ac3cb 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -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/lisp/wdired.el b/lisp/wdired.el
index 4cc5a3c48c0..37dc73dd408 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or 12;; GNU Emacs is free software; you can redistribute it and/or
13;; modify it under the terms of the GNU General Public License as 13;; modify it under the terms of the GNU General Public License as
14;; published by the Free Software Foundation; either version 2, or (at 14;; published by the Free Software Foundation; either version 3, or (at
15;; your option) any later version. 15;; your option) any later version.
16 16
17;; This program is distributed in the hope that it will be useful, but 17;; This program is distributed in the hope that it will be useful, but
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 1c670d77458..c38b6563592 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -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,
diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el
index 799d9ae760e..ec702f7b45c 100644
--- a/lisp/wid-browse.el
+++ b/lisp/wid-browse.el
@@ -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,
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 4c560918594..04d91998e2a 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/widget.el b/lisp/widget.el
index cfdb92eaa0f..b44d3735bb6 100644
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/windmove.el b/lisp/windmove.el
index 79e87e0d36c..f462c353694 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -11,7 +11,7 @@
11;; 11;;
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16;; 16;;
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/window.el b/lisp/window.el
index 921d84d6e7d..508d78caeb4 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -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,
diff --git a/lisp/winner.el b/lisp/winner.el
index 033876a5883..bc7503b963c 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -12,7 +12,7 @@
12 12
13;; GNU Emacs is free software; you can redistribute it and/or modify 13;; GNU Emacs is free software; you can redistribute it and/or modify
14;; it under the terms of the GNU General Public License as published by 14;; it under the terms of the GNU General Public License as published by
15;; the Free Software Foundation; either version 2, or (at your option) 15;; the Free Software Foundation; either version 3, or (at your option)
16;; any later version. 16;; any later version.
17 17
18;; GNU Emacs is distributed in the hope that it will be useful, 18;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/woman.el b/lisp/woman.el
index 43ebd8df013..4d50b5d3f2e 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -14,7 +14,7 @@
14 14
15;; GNU Emacs is free software; you can redistribute it and/or modify 15;; GNU Emacs is free software; you can redistribute it and/or modify
16;; it under the terms of the GNU General Public License as published by 16;; it under the terms of the GNU General Public License as published by
17;; the Free Software Foundation; either version 2, or (at your option) 17;; the Free Software Foundation; either version 3, or (at your option)
18;; any later version. 18;; any later version.
19 19
20;; GNU Emacs is distributed in the hope that it will be useful, 20;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index c3a9e7910a6..08fca38aab2 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -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,
diff --git a/lisp/xml.el b/lisp/xml.el
index f7045779ca4..6ea6dd4f56c 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -11,7 +11,7 @@
11 11
12;; GNU Emacs is free software; you can redistribute it and/or modify 12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by 13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option) 14;; the Free Software Foundation; either version 3, or (at your option)
15;; any later version. 15;; any later version.
16 16
17;; GNU Emacs is distributed in the hope that it will be useful, 17;; GNU Emacs is distributed in the hope that it will be useful,
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index a4779053937..b9d711a3e4b 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -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,