(archive-add-new-member): Use `derived-mode-p'.

[bpt/emacs.git] / src / ChangeLog.4

diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index e611bd5..80cd2d7 100644 (file)
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6903,15 +6903,15 @@
 
 See ChangeLog.3 for earlier changes.
 
-    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
        Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
-  GNU Emacs is free software; you can redistribute it and/or modify
+  GNU Emacs is free software: you can redistribute it and/or modify
   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 version.
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -6919,8 +6919,6 @@ See ChangeLog.3 for earlier changes.
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with GNU Emacs; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301, USA.
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; arch-tag: 2e44924a-e45a-4129-ad93-1f7bb410b609