Mercurial > hg > xemacs-beta
changeset 4587:b25f081370e0
Automated merge with file:///Sources/xemacs-21.5-checked-out
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 31 Jan 2009 13:21:37 +0000 |
| parents | 2669b1b7e33b (current diff) 732e3243f2e4 (diff) |
| children | 03ec57ae1d1e dbe504bac1f4 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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.