From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 27 Jun 2009 19:52:02 +0000 (+0000)
Subject: * frame.c (x_get_arg): Check if dpyinfo is non-NULL.
X-Git-Tag: emacs-pretest-23.0.96~74
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f004b5de4cd169a53b7ef0d4ba4b94ead2ffdd9;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index f661dbc213f..f7bd242145f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-27  Chong Yidong  <cyd@stupidchicken.com>
+
+	* frame.c (x_get_arg): Check if dpyinfo is non-NULL.
+
 2009-06-27  Glenn Morris  <rgm@gnu.org>
 
 	* m/pmax.h: Restore file.
diff --git a/src/frame.c b/src/frame.c
index 10713826b50..9e05b1b8456 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4009,7 +4009,7 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
      look in the X resources.  */
   if (EQ (tem, Qnil))
     {
-      if (attribute)
+      if (attribute && dpyinfo)
 	{
 	  tem = display_x_get_resource (dpyinfo,
 					build_string (attribute),