(ns-display-name): Remove declaration.

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

lisp/ChangeLog

 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,

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))