Mercurial > emacs

changeset 103603:c99edccfe4d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* frame.c (x_get_arg): Check if dpyinfo is non-NULL.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 27 Jun 2009 19:50:50 +0000
parents c6838f93406e
children 5883b0a08647
files src/ChangeLog src/frame.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Jun 27 04:21:14 2009 +0000
+++ b/src/ChangeLog	Sat Jun 27 19:50:50 2009 +0000
@@ -1,5 +1,7 @@
 2009-06-27  Chong Yidong  <cyd@stupidchicken.com>
 
+	* 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).
 
--- a/src/frame.c	Sat Jun 27 04:21:14 2009 +0000
+++ b/src/frame.c	Sat Jun 27 19:50:50 2009 +0000
@@ -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),