[Emacs-diffs] Changes to emacs/src/nsfont.m,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/07/17 03:33:59

Index: src/nsfont.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfont.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/nsfont.m        16 Jul 2008 02:22:04 -0000      1.4
+++ src/nsfont.m        17 Jul 2008 03:33:58 -0000      1.5
@@ -234,7 +234,7 @@
 
 struct font_driver nsfont_driver =
   {
-    (Lisp_Object) NULL,                /* Qns */
+    0,                         /* Qns */
     1,                         /* case sensitive */
     nsfont_get_cache,
     nsfont_list,
@@ -518,7 +518,7 @@
   font_info = (struct nsfont_info *) XFONT_OBJECT (font_object);
   font = (struct font *)font_info;
   if (!font)
-    return NULL; /*PENDING: this copies w32, but causes a segfault */
+    return Qnil; /*PENDING: this copies w32, but causes a segfault */
 
   if (NSFONT_TRACE)
     {
@@ -571,7 +571,7 @@
       if (!nsfont)
         {
           fprintf (stderr, "*** Emacs.app: unable to load backup font\n");
-          return NULL;
+          return Qnil;
         }
     }
 
@@ -601,7 +601,7 @@
   font_info->metrics = (struct font_metrics *)
     xmalloc (0x100 * sizeof (struct font_metrics *));
   if (!font_info->glyphs || !font_info->metrics)
-    return NULL;
+    return Qnil;
   bzero (font_info->glyphs, 0x100 * sizeof (unsigned short *));
   bzero (font_info->metrics, 0x100 * sizeof (struct font_metrics *));