diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-21 17:43:33 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-21 17:43:33 +0000 |
| commit | 5f2aebc0e64aaf57a71af694a224ea6368555c24 (patch) | |
| tree | 02f2e0e33c21ec3f8802ea54b8d566df2b771f7f /lisp/frame.el | |
| parent | 3000e3f4e49db898c4f7a6ec702f351ed9c4c38a (diff) | |
| download | emacs-5f2aebc0e64aaf57a71af694a224ea6368555c24.tar.gz | |
(ns-display-name): Remove declaration.
(make-frame-on-display): Use x-display-name instead
ns-display-name. Use unless.
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 7 |
1 files changed, 3 insertions, 4 deletions
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)) |