[Emacs-diffs] emacs/src font.c

[YAMAMOTO Mitsuharu]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     YAMAMOTO Mitsuharu <mituharu>   09/12/01 09:07:26

Modified files:
        src            : font.c 

Log message:
        (font_load_for_lface, font_open_by_name): Don't store name
        if entity is Qnil.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.c?cvsroot=emacs&r1=1.146&r2=1.147

Patches:
Index: font.c
===================================================================
RCS file: /sources/emacs/emacs/src/font.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- font.c      24 Nov 2009 08:37:32 -0000      1.146
+++ font.c      1 Dec 2009 09:07:26 -0000       1.147
@@ -3537,8 +3537,11 @@
      it to re-apply the font when font parameters (like hinting or dpi) have
      changed.  */
   entity = font_open_for_lface (f, entity, attrs, spec);
+  if (!NILP (entity))
+    {
   name = Ffont_get (spec, QCname);
   if (STRINGP (name)) font_put_extra (entity, QCname, name);
+    }
   return entity;
 }
 
@@ -3610,6 +3613,7 @@
   spec = Ffont_spec (2, args);
   ret = font_open_by_spec (f, spec);
   /* Do not loose name originally put in.  */
+  if (!NILP (ret))
   font_put_extra (ret, QCname, args[1]);
 
   return ret;