# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1233408097 0
# Node ID b25f081370e0ea07648c447823f1b97e3d45b33b
# Parent  2669b1b7e33b70dad0f42a94629ab3afeffa9b55# Parent  732e3243f2e4f8be3758ef0820b6a415dfbd1966
Automated merge with file:///Sources/xemacs-21.5-checked-out

diff -r 2669b1b7e33b -r b25f081370e0 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 31 13:06:37 2009 +0000
+++ b/lisp/ChangeLog	Sat Jan 31 13:21:37 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 2669b1b7e33b -r b25f081370e0 lisp/frame.el
--- a/lisp/frame.el	Sat Jan 31 13:06:37 2009 +0000
+++ b/lisp/frame.el	Sat Jan 31 13:21:37 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.