mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-26 15:10:50 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Chong Yidong 2009-06-27 19:50:50 +00:00
parent f5594f039f
commit 4e23bedbfa
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -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).

2
src/frame.c
View file

@ -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),