[Emacs-diffs] Changes to emacs/lisp/frame.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/11/04 16:39:46

Index: frame.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/frame.el,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -b -r1.287 -r1.288
--- frame.el    1 Nov 2008 01:24:37 -0000       1.287
+++ frame.el    4 Nov 2008 16:39:46 -0000       1.288
@@ -607,22 +607,26 @@
 (defvar x-display-name)                 ; term/x-win
 
 (defun make-frame-on-display (display &optional parameters)
-  "Make a frame on X display DISPLAY.
-The optional second argument PARAMETERS specifies additional frame parameters."
+  "Make a frame on display DISPLAY.
+The optional argument PARAMETERS specifies additional frame parameters."
   (interactive "sMake frame on display: ")
-  (if (featurep 'ns)
-      (progn
+  (cond ((featurep 'ns)
        (when (and (boundp 'ns-initialized) (not ns-initialized))
          (setq x-display-name display)
          (ns-initialize-window-system))
-       (make-frame `((window-system . ns) (display . ,display) . ,parameters)))
-    (progn
+        (make-frame `((window-system . ns)
+                      (display . ,display) . ,parameters)))
+       ((eq system-type 'windows-nt)
+        ;; On Windows, ignore DISPLAY.
+        (make-frame parameters))
+       (t
       (unless (string-match "\\`[^:]*:[0-9]+\\(\\.[0-9]+\\)?\\'" display)
        (error "Invalid display, not HOST:SERVER or HOST:SERVER.SCREEN"))
       (when (and (boundp 'x-initialized) (not x-initialized))
        (setq x-display-name display)
        (x-initialize-window-system))
-      (make-frame `((window-system . x) (display . ,display) . ,parameters)))))
+        (make-frame `((window-system . x)
+                      (display . ,display) . ,parameters)))))
 
 (defun make-frame-on-tty (tty type &optional parameters)
   "Make a frame on terminal device TTY.