(BASE_PURESIZE): Increase to 1140000.

[gnu-emacs] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index 828b188e6a74c5767ec41d25148462ebcd244e7f..bd8e4ac1eb9532dc19d9a2fe8ef7cf7c6062c5cd 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,13 +1,16 @@
 /* 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) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+     Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+     2005, 2006, 2007, 2008
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -17,8 +20,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
-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 */
 
@@ -497,7 +500,7 @@ free_face_fontset (f, face)
 }
 
 
-/* Return 1 iff FACE is suitable for displaying character C.
+/* Return 1 if FACE is suitable for displaying character C.
    Otherwise return 0.  Called from the macro FACE_SUITABLE_FOR_CHAR_P
    when C is not a single byte character..  */
 
@@ -1620,6 +1623,8 @@ It is intended that this function is called only from
       elt = Fcons (target, Fcons (Qnil, Fcons (Qnil, elt)));
       XSETCAR (tail, elt);
     }
+  if (! NILP (Fequal (fontlist, Voverriding_fontspec_alist)))
+    return Qnil;
   Voverriding_fontspec_alist = fontlist;
   clear_face_cache (0);
   ++windows_or_buffers_changed;