(mm-inline-media-tests): Check presence of the diff-mode

[gnu-emacs] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index 828b188e6a74c5767ec41d25148462ebcd244e7f..130ab402cc71933a6f6f2d8ac0e2608d85e7b30c 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,7 +1,7 @@
 /* Fontset handler.
 /* Fontset handler.

-   Copyright (C) 2004  Free Software Foundation, Inc.

    Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
    Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.

+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 
 This file is part of GNU Emacs.
 


@@ -17,8 +17,8 @@ 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
 
 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., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 /* #define FONTSET_DEBUG */
 
 
 /* #define FONTSET_DEBUG */