(compilation-directory-matcher): Doc fix (Nil -> nil).

[gnu-emacs] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index c1de33fcf066db372154c4aa2f46ecc0137b60ff..c8679a7b7e2ae5693869338638b5a6ee09e5670c 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,7 +1,8 @@
 /* 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) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004, 2005
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
@@ -17,8 +18,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 */
 
@@ -353,7 +354,11 @@ fontset_set (fontset, c, newelt)
   for (i = 0; code[i] > 0; i++)
     {
       if (!SUB_CHAR_TABLE_P (*elt))
-       *elt = make_sub_char_table (*elt);
+       {
+         Lisp_Object val = *elt;
+         *elt = make_sub_char_table (Qnil);
+         XCHAR_TABLE (*elt)->defalt = val;
+       }
       elt = &XCHAR_TABLE (*elt)->contents[code[i]];
     }
   if (SUB_CHAR_TABLE_P (*elt))
@@ -1616,6 +1621,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;