[Emacs-diffs] emacs/src ChangeLog frame.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/06/27 19:50:55

Modified files:
        src            : ChangeLog frame.c 

Log message:
        * frame.c (x_get_arg): Check if dpyinfo is non-NULL.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7606&r2=1.7607
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.419&r2=1.420

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7606
retrieving revision 1.7607
diff -u -b -r1.7606 -r1.7607
--- ChangeLog   27 Jun 2009 03:50:23 -0000      1.7606
+++ ChangeLog   27 Jun 2009 19:50:50 -0000      1.7607
@@ -1,5 +1,7 @@
 2009-06-27  Chong Yidong  <address@hidden>
 
+       * frame.c (x_get_arg): Check if dpyinfo is non-NULL.
+
        * xdisp.c (mouse_face_from_buffer_pos): Fix detection of
        truncation glyphs (Bug#3686).
 

Index: frame.c
===================================================================
RCS file: /sources/emacs/emacs/src/frame.c,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -b -r1.419 -r1.420
--- frame.c     19 May 2009 03:30:36 -0000      1.419
+++ frame.c     27 Jun 2009 19:50:55 -0000      1.420
@@ -4009,7 +4009,7 @@
      look in the X resources.  */
   if (EQ (tem, Qnil))
     {
-      if (attribute)
+      if (attribute && dpyinfo)
        {
          tem = display_x_get_resource (dpyinfo,
                                        build_string (attribute),