(ns-display-name): Remove declaration.

(make-frame-on-display): Use x-display-name instead
ns-display-name.  Use unless.

2 files changed, 7 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17ad3fb9e1b..c55e73de577 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2008-07-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * frame.el (ns-display-name): Remove declaration.
+        (make-frame-on-display): Use x-display-name instead
+        ns-display-name.  Use unless.
+
         * startup.el (command-line-1): Fix indentation.
 
         * term/ns-win.el (up-one, down-one, left-one, right-one): Remove,
diff --git a/lisp/frame.el b/lisp/frame.el
index b8ec20bf0c3..3682d1cc5e7 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -606,7 +606,6 @@ is not considered (see `next-frame')."
 (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,12 +614,12 @@ The optional second argument PARAMETERS specifies additional frame parameters."
   (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)
-          (error "Invalid display, not HOST:SERVER or HOST:SERVER.SCREEN"))
+      (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))