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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/07/21 17:43:35

Index: frame.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/frame.el,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -b -r1.275 -r1.276
--- frame.el    17 Jul 2008 02:35:06 -0000      1.275
+++ frame.el    21 Jul 2008 17:43:32 -0000      1.276
@@ -606,7 +606,6 @@
 (declare-function x-initialize-window-system "term/x-win" ())
 (declare-function ns-initialize-window-system "term/ns-win" ())
 (defvar x-display-name)                 ; term/x-win
-(defvar ns-display-name)                ; term/ns-win
 
 (defun make-frame-on-display (display &optional parameters)
   "Make a frame on X display DISPLAY.
@@ -615,11 +614,11 @@
   (if (featurep 'ns-windowing)
       (progn
        (when (and (boundp 'ns-initialized) (not ns-initialized))
-         (setq ns-display-name display)
+         (setq x-display-name display)
          (ns-initialize-window-system))
        (make-frame `((window-system . ns) (display . ,display) . ,parameters)))
     (progn
-      (or (string-match "\\`[^:]*:[0-9]+\\(\\.[0-9]+\\)?\\'" display)
+      (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)