aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-02-27 05:03:06 +0000
committerGlenn Morris2008-02-27 05:03:06 +0000
commit88ddede6eee21ccb4da9cfec1e0e47356b7ab44b (patch)
tree69a4b8e19dd86525ef4a64a838c4d0e023ee9ace
parent253ed25e06c08e75a3fec99f8cc849148f43ebc3 (diff)
downloademacs-88ddede6eee21ccb4da9cfec1e0e47356b7ab44b.tar.gz
emacs-88ddede6eee21ccb4da9cfec1e0e47356b7ab44b.zip
(auto-insert-alist): Change permission text to match FSF's GPLv3 form.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/autoinsert.el12
2 files changed, 8 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b36e66f8f0e..e4ab2ba690f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12008-02-27 Glenn Morris <rgm@gnu.org> 12008-02-27 Glenn Morris <rgm@gnu.org>
2 2
3 * autoinsert.el (auto-insert-alist): Change permission text to
4 match FSF's GPLv3 form.
5
3 * mail/supercite.el (sc-cite-original): Doc fix. 6 * mail/supercite.el (sc-cite-original): Doc fix.
4 (sc-version): Make obsolete. 7 (sc-version): Make obsolete.
5 (sc-describe): Show the SC info page. Make obsolete. 8 (sc-describe): Show the SC info page. Make obsolete.
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index e7dc061168e..04c59441047 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -186,20 +186,18 @@ If this contains a %s, that will be replaced by the matching rule."
186 (completing-read "Keyword, C-h: " v1 nil t)) 186 (completing-read "Keyword, C-h: " v1 nil t))
187 str ", ") & -2 " 187 str ", ") & -2 "
188 188
189\;; This file is free software; you can redistribute it and/or modify 189\;; This program is free software; you can redistribute it and/or modify
190\;; it under the terms of the GNU General Public License as published by 190\;; it under the terms of the GNU General Public License as published by
191\;; the Free Software Foundation; either version 3, or (at your option) 191\;; the Free Software Foundation, either version 3 of the License, or
192\;; any later version. 192\;; (at your option) any later version.
193 193
194\;; This file is distributed in the hope that it will be useful, 194\;; This program is distributed in the hope that it will be useful,
195\;; but WITHOUT ANY WARRANTY; without even the implied warranty of 195\;; but WITHOUT ANY WARRANTY; without even the implied warranty of
196\;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 196\;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
197\;; GNU General Public License for more details. 197\;; GNU General Public License for more details.
198 198
199\;; You should have received a copy of the GNU General Public License 199\;; You should have received a copy of the GNU General Public License
200\;; along with GNU Emacs; see the file COPYING. If not, write to 200\;; along with this program. If not, see <http://www.gnu.org/licenses/>.
201\;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
202\;; Boston, MA 02110-1301, USA.
203 201
204\;;; Commentary: 202\;;; Commentary:
205 203