Mercurial > emacs
changeset 96869:8cb5d45989af
(ns-display-name): Remove declaration.
(make-frame-on-display): Use x-display-name instead
ns-display-name. Use unless.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 21 Jul 2008 17:43:33 +0000 |
| parents | 0b20e535e319 |
| children | 30f1368d9cf6 |
| files | lisp/ChangeLog lisp/frame.el |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jul 21 17:23:14 2008 +0000 +++ b/lisp/ChangeLog Mon Jul 21 17:43:33 2008 +0000 @@ -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,
--- a/lisp/frame.el Mon Jul 21 17:23:14 2008 +0000 +++ b/lisp/frame.el Mon Jul 21 17:43:33 2008 +0000 @@ -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,12 +614,12 @@ (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))