*** empty log message ***

[bpt/emacs.git] / lisp / frame.el

diff --git a/lisp/frame.el b/lisp/frame.el
index 05a6a80..1c7ab99 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -606,7 +606,7 @@ DISPLAY is a name of a display, a string of the form HOST:SERVER.SCREEN.
 If DISPLAY is omitted or nil, it defaults to the selected frame's display."
   (let* ((display (or display (frame-parameter nil 'display)))
         (func #'(lambda (frame)
-                  (eq (frame-parameter frame 'display) display))))
+                  (equal (frame-parameter frame 'display) display))))
     (filtered-frame-list func)))
 
 (defun framep-on-display (&optional display)
@@ -946,10 +946,7 @@ DISPLAY can be a display name, a frame, or nil (meaning the selected
 frame's display)."
   (and (display-graphic-p display)
        (fboundp 'image-mask-p)
-       (fboundp 'image-size)
-       ;; FIXME: this will need to be revisited when the Windows port
-       ;; supports images.
-       (not (eq (framep-on-display display) 'w32))))
+       (fboundp 'image-size)))
 
 (defalias 'display-multi-frame-p 'display-graphic-p)
 (defalias 'display-multi-font-p 'display-graphic-p)