Mercurial > emacs

changeset 78236:9355f9b7bbff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch license to GPLv3 or later.
author Glenn Morris <rgm@gnu.org>
date Wed, 25 Jul 2007 04:47:42 +0000
parents 8b0dabde9595
children f0c94e8197f7
files lisp/ChangeLog lisp/ChangeLog.1 lisp/ChangeLog.10 lisp/ChangeLog.11 lisp/ChangeLog.2 lisp/ChangeLog.3 lisp/ChangeLog.4 lisp/ChangeLog.5 lisp/ChangeLog.6 lisp/ChangeLog.7 lisp/ChangeLog.8 lisp/ChangeLog.9 lisp/Makefile.in lisp/abbrev.el lisp/abbrevlist.el lisp/add-log.el lisp/align.el lisp/allout.el lisp/ansi-color.el lisp/apropos.el lisp/arc-mode.el lisp/array.el lisp/autoarg.el lisp/autoinsert.el lisp/autorevert.el lisp/avoid.el lisp/battery.el lisp/bindings.el lisp/bookmark.el lisp/bs.el lisp/buff-menu.el lisp/button.el lisp/calculator.el lisp/case-table.el lisp/cdl.el lisp/chistory.el lisp/cmuscheme.el lisp/comint.el lisp/compare-w.el lisp/complete.el lisp/completion.el lisp/cus-dep.el lisp/cus-edit.el lisp/cus-face.el lisp/cus-start.el lisp/cus-theme.el lisp/custom.el lisp/cvs-status.el lisp/dabbrev.el lisp/delim-col.el lisp/delsel.el lisp/descr-text.el lisp/desktop.el lisp/dframe.el lisp/diff-mode.el lisp/diff.el lisp/dired-aux.el lisp/dired-x.el lisp/dired.el lisp/dirtrack.el lisp/disp-table.el lisp/dnd.el lisp/dos-fns.el lisp/dos-vars.el lisp/dos-w32.el lisp/double.el lisp/ebuff-menu.el lisp/echistory.el lisp/ediff-diff.el lisp/ediff-help.el lisp/ediff-hook.el lisp/ediff-init.el lisp/ediff-merg.el lisp/ediff-mult.el lisp/ediff-ptch.el lisp/ediff-util.el lisp/ediff-vers.el lisp/ediff-wind.el lisp/ediff.el lisp/edmacro.el lisp/ehelp.el lisp/electric.el lisp/elide-head.el lisp/emacs-lock.el lisp/env.el lisp/expand.el lisp/ezimage.el lisp/facemenu.el lisp/faces.el lisp/ffap.el lisp/filecache.el lisp/files.el lisp/filesets.el lisp/find-dired.el lisp/find-file.el lisp/find-lisp.el lisp/finder.el lisp/flow-ctrl.el lisp/foldout.el lisp/follow.el lisp/font-core.el lisp/font-lock.el lisp/format.el lisp/forms.el lisp/frame.el lisp/fringe.el lisp/generic-x.el lisp/gs.el lisp/help-at-pt.el lisp/help-fns.el lisp/help-macro.el lisp/help-mode.el lisp/help.el lisp/hexl.el lisp/hi-lock.el lisp/hilit-chg.el lisp/hippie-exp.el lisp/hl-line.el lisp/ibuf-ext.el lisp/ibuf-macs.el lisp/ibuffer.el lisp/icomplete.el lisp/ido.el lisp/ielm.el lisp/iimage.el lisp/image-dired.el lisp/image-file.el lisp/image-mode.el lisp/image.el lisp/imenu.el lisp/indent.el lisp/info-look.el lisp/info-xref.el lisp/info.el lisp/informat.el lisp/isearch.el lisp/isearchb.el lisp/iswitchb.el lisp/jit-lock.el lisp/jka-cmpr-hook.el lisp/jka-compr.el lisp/kermit.el lisp/kmacro.el lisp/language/cyril-util.el lisp/language/czech.el lisp/language/devanagari.el lisp/language/georgian.el lisp/language/ind-util.el lisp/language/kannada.el lisp/language/knd-util.el lisp/language/malayalam.el lisp/language/mlm-util.el lisp/language/romanian.el lisp/language/slovak.el lisp/language/tamil.el lisp/language/tml-util.el lisp/language/utf-8-lang.el lisp/ledit.el lisp/loadhist.el lisp/loadup.el lisp/locate.el lisp/log-edit.el lisp/log-view.el lisp/longlines.el lisp/lpr.el lisp/ls-lisp.el lisp/macros.el lisp/makefile.w32-in lisp/makesum.el lisp/man.el lisp/master.el lisp/menu-bar.el lisp/midnight.el lisp/minibuf-eldef.el lisp/misc.el lisp/mouse-copy.el lisp/mouse-drag.el lisp/mouse-sel.el lisp/mouse.el lisp/msb.el lisp/mwheel.el lisp/newcomment.el lisp/novice.el lisp/outline.el lisp/paren.el lisp/paths.el lisp/pcmpl-cvs.el lisp/pcmpl-gnu.el lisp/pcmpl-linux.el lisp/pcmpl-rpm.el lisp/pcmpl-unix.el lisp/pcomplete.el lisp/pcvs-defs.el lisp/pcvs-info.el lisp/pcvs-parse.el lisp/pcvs-util.el lisp/pcvs.el lisp/pgg-def.el lisp/pgg-gpg.el lisp/pgg-parse.el lisp/pgg-pgp.el lisp/pgg-pgp5.el lisp/pgg.el lisp/printing.el lisp/ps-mule.el lisp/ps-print.el lisp/recentf.el lisp/rect.el lisp/register.el lisp/repeat.el lisp/replace.el lisp/reposition.el lisp/resume.el lisp/reveal.el lisp/rfn-eshadow.el lisp/rot13.el lisp/ruler-mode.el lisp/s-region.el lisp/savehist.el lisp/saveplace.el lisp/sb-image.el lisp/scroll-all.el lisp/scroll-bar.el lisp/scroll-lock.el lisp/select.el lisp/server.el lisp/ses.el lisp/shadowfile.el lisp/shell.el lisp/simple.el lisp/skeleton.el lisp/smerge-mode.el lisp/sort.el lisp/soundex.el lisp/speedbar.el lisp/startup.el lisp/strokes.el lisp/subr.el lisp/t-mouse.el lisp/tabify.el lisp/talk.el lisp/tar-mode.el lisp/tempo.el lisp/term.el lisp/terminal.el lisp/thingatpt.el lisp/thumbs.el lisp/time-stamp.el lisp/time.el lisp/timezone.el lisp/tmm.el lisp/tool-bar.el lisp/tooltip.el lisp/tree-widget.el lisp/tutorial.el lisp/type-break.el lisp/uniquify.el lisp/userlock.el lisp/vc-arch.el lisp/vc-cvs.el lisp/vc-hg.el lisp/vc-hooks.el lisp/vc-mcvs.el lisp/vc-rcs.el lisp/vc-sccs.el lisp/vc-svn.el lisp/vc.el lisp/vcursor.el lisp/version.el lisp/view.el lisp/vms-patch.el lisp/vmsproc.el lisp/vt-control.el lisp/vt100-led.el lisp/w32-fns.el lisp/w32-vars.el lisp/wdired.el lisp/whitespace.el lisp/wid-browse.el lisp/wid-edit.el lisp/widget.el lisp/windmove.el lisp/window.el lisp/winner.el lisp/woman.el lisp/x-dnd.el lisp/xml.el lisp/xt-mouse.el
diffstat 288 files changed, 288 insertions(+), 288 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog	Wed Jul 25 04:47:42 2007 +0000
@@ -34287,7 +34287,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ChangeLog.1	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog.1	Wed Jul 25 04:47:42 2007 +0000
@@ -3253,7 +3253,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ChangeLog.10	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog.10	Wed Jul 25 04:47:42 2007 +0000
@@ -23541,7 +23541,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ChangeLog.11	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog.11	Wed Jul 25 04:47:42 2007 +0000
@@ -14343,7 +14343,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ChangeLog.2	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog.2	Wed Jul 25 04:47:42 2007 +0000
@@ -4001,7 +4001,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ChangeLog.3	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog.3	Wed Jul 25 04:47:42 2007 +0000
@@ -12622,7 +12622,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ChangeLog.4	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog.4	Wed Jul 25 04:47:42 2007 +0000
@@ -8946,7 +8946,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ChangeLog.5	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog.5	Wed Jul 25 04:47:42 2007 +0000
@@ -9268,7 +9268,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ChangeLog.6	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog.6	Wed Jul 25 04:47:42 2007 +0000
@@ -8029,7 +8029,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ChangeLog.7	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog.7	Wed Jul 25 04:47:42 2007 +0000
@@ -23146,7 +23146,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ChangeLog.8	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog.8	Wed Jul 25 04:47:42 2007 +0000
@@ -9995,7 +9995,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ChangeLog.9	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ChangeLog.9	Wed Jul 25 04:47:42 2007 +0000
@@ -20702,7 +20702,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/Makefile.in	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/Makefile.in	Wed Jul 25 04:47:42 2007 +0000
@@ -6,7 +6,7 @@
 
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/abbrev.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/abbrev.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/abbrevlist.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/abbrevlist.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/add-log.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/add-log.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/align.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/align.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/allout.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/allout.el	Wed Jul 25 04:47:42 2007 +0000
@@ -14,7 +14,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ansi-color.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ansi-color.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
+;; Free Software Foundation; either version 3, or (at your option) any
 ;; later version.
 ;;
 ;; GNU Emacs is distributed in the hope that it will be useful, but
--- a/lisp/apropos.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/apropos.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/arc-mode.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/arc-mode.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/array.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/array.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/autoarg.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/autoarg.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/autoinsert.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/autoinsert.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/autorevert.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/autorevert.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/avoid.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/avoid.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/battery.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/battery.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/bindings.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/bindings.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/bookmark.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/bookmark.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/bs.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/bs.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/buff-menu.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/buff-menu.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/button.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/button.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 ;;
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 ;;
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/calculator.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/calculator.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by the
-;; Free Software Foundation; either version 2, or (at your option) any
+;; Free Software Foundation; either version 3, or (at your option) any
 ;; later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful, but
--- a/lisp/case-table.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/case-table.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/cdl.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/cdl.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/chistory.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/chistory.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/cmuscheme.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/cmuscheme.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/comint.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/comint.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/compare-w.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/compare-w.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/complete.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/complete.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/completion.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/completion.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/cus-dep.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/cus-dep.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/cus-edit.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/cus-edit.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/cus-face.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/cus-face.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/cus-start.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/cus-start.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/cus-theme.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/cus-theme.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/custom.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/custom.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/cvs-status.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/cvs-status.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/dabbrev.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/dabbrev.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/delim-col.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/delim-col.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/delsel.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/delsel.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/descr-text.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/descr-text.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/desktop.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/desktop.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/dframe.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/dframe.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/diff-mode.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/diff-mode.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/diff.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/diff.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/dired-aux.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/dired-aux.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/dired-x.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/dired-x.el	Wed Jul 25 04:47:42 2007 +0000
@@ -14,7 +14,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/dired.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/dired.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/dirtrack.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/dirtrack.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/disp-table.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/disp-table.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/dnd.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/dnd.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/dos-fns.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/dos-fns.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/dos-vars.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/dos-vars.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/dos-w32.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/dos-w32.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/double.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/double.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ebuff-menu.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ebuff-menu.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/echistory.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/echistory.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ediff-diff.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ediff-diff.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ediff-help.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ediff-help.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ediff-hook.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ediff-hook.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ediff-init.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ediff-init.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ediff-merg.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ediff-merg.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ediff-mult.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ediff-mult.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ediff-ptch.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ediff-ptch.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ediff-util.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ediff-util.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ediff-vers.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ediff-vers.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ediff-wind.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ediff-wind.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ediff.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ediff.el	Wed Jul 25 04:47:42 2007 +0000
@@ -15,7 +15,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/edmacro.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/edmacro.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ehelp.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ehelp.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/electric.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/electric.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/elide-head.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/elide-head.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/emacs-lock.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/emacs-lock.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/env.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/env.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/expand.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/expand.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ezimage.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ezimage.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/facemenu.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/facemenu.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/faces.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/faces.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ffap.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ffap.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/filecache.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/filecache.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/files.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/files.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/filesets.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/filesets.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; This program is distributed in the hope that it will be useful,
--- a/lisp/find-dired.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/find-dired.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/find-file.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/find-file.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/find-lisp.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/find-lisp.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/finder.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/finder.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/flow-ctrl.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/flow-ctrl.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/foldout.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/foldout.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/follow.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/follow.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/font-core.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/font-core.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/font-lock.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/font-lock.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/format.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/format.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/forms.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/forms.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/frame.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/frame.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/fringe.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/fringe.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/generic-x.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/generic-x.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/gs.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/gs.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/help-at-pt.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/help-at-pt.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/help-fns.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/help-fns.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/help-macro.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/help-macro.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/help-mode.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/help-mode.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/help.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/help.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/hexl.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/hexl.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/hi-lock.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/hi-lock.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/hilit-chg.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/hilit-chg.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/hippie-exp.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/hippie-exp.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/hl-line.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/hl-line.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ibuf-ext.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ibuf-ext.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/ibuf-macs.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ibuf-macs.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/ibuffer.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ibuffer.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/icomplete.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/icomplete.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ido.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ido.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ielm.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ielm.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/iimage.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/iimage.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/image-dired.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/image-dired.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/image-file.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/image-file.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/image-mode.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/image-mode.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/image.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/image.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/imenu.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/imenu.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/indent.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/indent.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/info-look.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/info-look.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/info-xref.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/info-xref.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/info.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/info.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/informat.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/informat.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/isearch.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/isearch.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/isearchb.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/isearchb.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/iswitchb.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/iswitchb.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/jit-lock.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/jit-lock.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/jka-cmpr-hook.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/jka-cmpr-hook.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/jka-compr.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/jka-compr.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/kermit.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/kermit.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/kmacro.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/kmacro.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/cyril-util.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/cyril-util.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/czech.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/czech.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/devanagari.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/devanagari.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/georgian.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/georgian.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/ind-util.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/ind-util.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/kannada.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/kannada.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/knd-util.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/knd-util.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/malayalam.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/malayalam.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/mlm-util.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/mlm-util.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/romanian.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/romanian.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/slovak.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/slovak.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/tamil.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/tamil.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/tml-util.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/tml-util.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/language/utf-8-lang.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/language/utf-8-lang.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ledit.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ledit.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/loadhist.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/loadhist.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/loadup.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/loadup.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/locate.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/locate.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/log-edit.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/log-edit.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/log-view.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/log-view.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/longlines.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/longlines.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/lpr.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/lpr.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ls-lisp.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ls-lisp.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/macros.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/macros.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/makefile.w32-in	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/makefile.w32-in	Wed Jul 25 04:47:42 2007 +0000
@@ -6,7 +6,7 @@
 #
 #  GNU Emacs is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
+#  the Free Software Foundation; either version 3, or (at your option)
 #  any later version.
 #
 #  GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/makesum.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/makesum.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/man.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/man.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/master.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/master.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/menu-bar.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/menu-bar.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/midnight.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/midnight.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/minibuf-eldef.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/minibuf-eldef.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/misc.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/misc.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/mouse-copy.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/mouse-copy.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/mouse-drag.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/mouse-drag.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/mouse-sel.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/mouse-sel.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/mouse.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/mouse.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/msb.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/msb.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/mwheel.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/mwheel.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/newcomment.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/newcomment.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/novice.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/novice.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/outline.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/outline.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/paren.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/paren.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/paths.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/paths.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pcmpl-cvs.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pcmpl-cvs.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pcmpl-gnu.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pcmpl-gnu.el	Wed Jul 25 04:47:42 2007 +0000
@@ -7,7 +7,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pcmpl-linux.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pcmpl-linux.el	Wed Jul 25 04:47:42 2007 +0000
@@ -7,7 +7,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pcmpl-rpm.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pcmpl-rpm.el	Wed Jul 25 04:47:42 2007 +0000
@@ -7,7 +7,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pcmpl-unix.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pcmpl-unix.el	Wed Jul 25 04:47:42 2007 +0000
@@ -7,7 +7,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pcomplete.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pcomplete.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pcvs-defs.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pcvs-defs.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pcvs-info.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pcvs-info.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pcvs-parse.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pcvs-parse.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pcvs-util.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pcvs-util.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pcvs.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pcvs.el	Wed Jul 25 04:47:42 2007 +0000
@@ -19,7 +19,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pgg-def.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pgg-def.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pgg-gpg.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pgg-gpg.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pgg-parse.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pgg-parse.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pgg-pgp.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pgg-pgp.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pgg-pgp5.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pgg-pgp5.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/pgg.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/pgg.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/printing.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/printing.el	Wed Jul 25 04:47:42 2007 +0000
@@ -20,7 +20,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify it under
 ;; the terms of the GNU General Public License as published by the Free
-;; Software Foundation; either version 2, or (at your option) any later
+;; Software Foundation; either version 3, or (at your option) any later
 ;; version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY
--- a/lisp/ps-mule.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ps-mule.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ps-print.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ps-print.el	Wed Jul 25 04:47:42 2007 +0000
@@ -27,7 +27,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify it under
 ;; the terms of the GNU General Public License as published by the Free
-;; Software Foundation; either version 2, or (at your option) any later
+;; Software Foundation; either version 3, or (at your option) any later
 ;; version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY
--- a/lisp/recentf.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/recentf.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published
-;; by the Free Software Foundation; either version 2, or (at your
+;; by the Free Software Foundation; either version 3, or (at your
 ;; option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/rect.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/rect.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/register.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/register.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/repeat.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/repeat.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/replace.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/replace.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/reposition.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/reposition.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/resume.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/resume.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/reveal.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/reveal.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/rfn-eshadow.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/rfn-eshadow.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/rot13.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/rot13.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ruler-mode.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ruler-mode.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/s-region.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/s-region.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/savehist.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/savehist.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/saveplace.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/saveplace.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/sb-image.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/sb-image.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/scroll-all.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/scroll-all.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/scroll-bar.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/scroll-bar.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/scroll-lock.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/scroll-lock.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/select.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/select.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/server.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/server.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/ses.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/ses.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/shadowfile.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/shadowfile.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/shell.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/shell.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/simple.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/simple.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/skeleton.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/skeleton.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/smerge-mode.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/smerge-mode.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/sort.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/sort.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/soundex.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/soundex.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/speedbar.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/speedbar.el	Wed Jul 25 04:47:42 2007 +0000
@@ -17,7 +17,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/startup.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/startup.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/strokes.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/strokes.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/subr.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/subr.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/t-mouse.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/t-mouse.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/tabify.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/tabify.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/talk.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/talk.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/tar-mode.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/tar-mode.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/tempo.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/tempo.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/term.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/term.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/terminal.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/terminal.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/thingatpt.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/thingatpt.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/thumbs.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/thumbs.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/time-stamp.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/time-stamp.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/time.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/time.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/timezone.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/timezone.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/tmm.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/tmm.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/tool-bar.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/tool-bar.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/tooltip.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/tooltip.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/tree-widget.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/tree-widget.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/tutorial.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/tutorial.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/type-break.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/type-break.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/uniquify.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/uniquify.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/userlock.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/userlock.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vc-arch.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vc-arch.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vc-cvs.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vc-cvs.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vc-hg.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vc-hg.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vc-hooks.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vc-hooks.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vc-mcvs.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vc-mcvs.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vc-rcs.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vc-rcs.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vc-sccs.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vc-sccs.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vc-svn.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vc-svn.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vc.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vc.el	Wed Jul 25 04:47:42 2007 +0000
@@ -13,7 +13,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vcursor.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vcursor.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/version.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/version.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/view.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/view.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vms-patch.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vms-patch.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vmsproc.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vmsproc.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vt-control.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vt-control.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/vt100-led.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/vt100-led.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/w32-fns.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/w32-fns.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/w32-vars.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/w32-vars.el	Wed Jul 25 04:47:42 2007 +0000
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/wdired.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/wdired.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
+;; published by the Free Software Foundation; either version 3, or (at
 ;; your option) any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
--- a/lisp/whitespace.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/whitespace.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/wid-browse.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/wid-browse.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/wid-edit.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/wid-edit.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/widget.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/widget.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/windmove.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/windmove.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 ;;
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 ;;
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/window.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/window.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/winner.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/winner.el	Wed Jul 25 04:47:42 2007 +0000
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/woman.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/woman.el	Wed Jul 25 04:47:42 2007 +0000
@@ -14,7 +14,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/x-dnd.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/x-dnd.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/xml.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/xml.el	Wed Jul 25 04:47:42 2007 +0000
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
--- a/lisp/xt-mouse.el	Wed Jul 25 04:35:16 2007 +0000
+++ b/lisp/xt-mouse.el	Wed Jul 25 04:47:42 2007 +0000
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,