# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1233408092 0
# Node ID 732e3243f2e4f8be3758ef0820b6a415dfbd1966
# Parent  00ed9903a988de9a983c074bf0abdc667639eeaf
Correct a bug in #'display-graphic-p.

2009-01-31  Aidan Kehoe  <kehoea@parhasard.net>

	* frame.el (display-graphic-p):
	Call #'display-device on the DISPLAY argument, ensuring that the
	argument to #'device-on-window-system-p is correct.

diff -r 00ed9903a988 -r 732e3243f2e4 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 18 12:56:51 2009 +0000
+++ b/lisp/ChangeLog	Sat Jan 31 13:21:32 2009 +0000
@@ -1,3 +1,9 @@
+2009-01-31  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* frame.el (display-graphic-p): 
+	Call #'display-device on the DISPLAY argument, ensuring that the
+	argument to #'device-on-window-system-p is correct.
+
 2009-01-18  Ville Skyttä  <scop@xemacs.org>
 
 	* font.el (font-*-p): Docstring spelling fix.
diff -r 00ed9903a988 -r 732e3243f2e4 lisp/frame.el
--- a/lisp/frame.el	Sun Jan 18 12:56:51 2009 +0000
+++ b/lisp/frame.el	Sat Jan 31 13:21:32 2009 +0000
@@ -1211,7 +1211,7 @@
 that use a window system such as X, and false for text-only terminals.
 DISPLAY can be a frame, a device, a console, or nil (meaning the selected
 frame)."
-  (device-on-window-system-p display))
+  (device-on-window-system-p (display-device display)))
 
 (defun display-images-p (&optional display)
   "Return non-nil if DISPLAY can display images.