emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Chong Yidong
Subject: [Emacs-diffs] emacs/src ChangeLog frame.c [EMACS_23_1_RC]
Date: Sat, 27 Jun 2009 19:52:05 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Chong Yidong <cyd>      09/06/27 19:52:04

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&only_with_tag=EMACS_23_1_RC&r1=1.7586.2.3&r2=1.7586.2.4
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.419&r2=1.419.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7586.2.3
retrieving revision 1.7586.2.4
diff -u -b -r1.7586.2.3 -r1.7586.2.4
--- ChangeLog   27 Jun 2009 02:32:40 -0000      1.7586.2.3
+++ ChangeLog   27 Jun 2009 19:52:02 -0000      1.7586.2.4
@@ -1,3 +1,7 @@
+2009-06-27  Chong Yidong  <address@hidden>
+
+       * frame.c (x_get_arg): Check if dpyinfo is non-NULL.
+
 2009-06-27  Glenn Morris  <address@hidden>
 
        * m/pmax.h: Restore file.

Index: frame.c
===================================================================
RCS file: /sources/emacs/emacs/src/frame.c,v
retrieving revision 1.419
retrieving revision 1.419.2.1
diff -u -b -r1.419 -r1.419.2.1
--- frame.c     19 May 2009 03:30:36 -0000      1.419
+++ frame.c     27 Jun 2009 19:52:04 -0000      1.419.2.1
@@ -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),




reply via email to

[Prev in Thread] Current Thread [Next in Thread]