[jim@meyering.net: copyright.el vs. version "3"]

[Richard Stallman <rms@gnu.org>]

Would someone please install this in Emacs 22 and the trunk?
It is a tiny change.

------- Start of forwarded message -------
X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_PASS,UNPARSEABLE_RELAY 
	autolearn=failed version=3.1.0
To: emacs-pretest-bug@gnu.org
From: Jim Meyering <jim@meyering.net>
Date: Tue, 10 Jul 2007 14:50:56 +0200
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: copyright.el vs. version "3"

Now that I've switched coreutils to GPL V3, I find the default behavior
(asking me if I want to downgrade to version 2) to be annoying -- and ironic.
This is against emacs built from cvs (git, actually :-) today.

Here's the patch I'm using:

2007-07-10  Jim Meyering  <jim@meyering.net>

	GPL v3 is the latest: copyright.el should not prompt for a v3 comment
	* emacs-lisp/copyright.el (copyright-current-gpl-version): Set to 3.
	* autoinsert.el (auto-insert-alist): s/2/3/ in the generated comment.

diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 3f615dc..dcacc6a 100644
- --- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -188,7 +188,7 @@ If this contains a %s, that will be replaced by the matching rule."

 \;; This file is free software; you can redistribute it and/or modify
 \;; it under the terms of the GNU General Public License as published by
- -\;; the 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 file is distributed in the hope that it will be useful,
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index ac61c5a..facdf9e 100644
- --- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -79,7 +79,7 @@ When this is `function', only ask when called non-interactively."


 ;; when modifying this, also modify the comment generated by autoinsert.el
- -(defconst copyright-current-gpl-version "2"
+(defconst copyright-current-gpl-version "3"
   "String representing the current version of the GPL or nil.")

 (defvar copyright-update t)


_______________________________________________
emacs-pretest-bug mailing list
emacs-pretest-bug@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-pretest-bug
------- End of forwarded message -------