diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-08 23:04:59 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-08 23:04:59 -0400 |
| commit | fdcb06012a36a8ec800e33554ae94c26e43a7c05 (patch) | |
| tree | 28092bfee31b86d81680aeec6e0f8049272fbf83 /lisp | |
| parent | b4030330c8a8d807065292a05286962ffe3c4d57 (diff) | |
| download | emacs-fdcb06012a36a8ec800e33554ae94c26e43a7c05.tar.gz | |
* lisp/frame.el (make-frame): Use t rather than nil for `w'.
Fixes: debbugs:18653
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/frame.el | 33 |
2 files changed, 24 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87852d64a46..c8c6f61cdcf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-10-09 Stefan Monnier <monnier@iro.umontreal.ca> + + * frame.el (make-frame): Use t rather than nil for `w' (bug#18653). + 2014-10-08 Leo Liu <sdl.web@gmail.com> * emacs-lisp/cl-extra.el (cl-fresh-line): New function. @@ -9,8 +13,8 @@ 2014-10-08 Leo Liu <sdl.web@gmail.com> - * progmodes/cfengine.el (cfengine3-make-syntax-cache): Always - return a syntax. Replace call-process-shell-command with + * progmodes/cfengine.el (cfengine3-make-syntax-cache): + Always return a syntax. Replace call-process-shell-command with process-file. Ensure cfengine-mode-syntax-functions-regex is always set. Ensure cache when cfengine-cf-promises fails. (Bug#18620) diff --git a/lisp/frame.el b/lisp/frame.el index bd055b7d6df..34f35db34b7 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -646,20 +646,23 @@ frame the selected frame. However, the window system may select the new frame according to its own rules." (interactive) (let* ((display (cdr (assq 'display parameters))) - (w (cond - ((assq 'terminal parameters) - (let ((type (terminal-live-p (cdr (assq 'terminal parameters))))) - (cond - ((null type) (error "Terminal %s does not exist" - (cdr (assq 'terminal parameters)))) - (t type)))) - ((assq 'window-system parameters) - (cdr (assq 'window-system parameters))) - (display - (or (window-system-for-display display) - (error "Don't know how to interpret display %S" - display))) - (t window-system))) + (w (or + (cond + ((assq 'terminal parameters) + (let ((type (terminal-live-p + (cdr (assq 'terminal parameters))))) + (cond + ((null type) (error "Terminal %s does not exist" + (cdr (assq 'terminal parameters)))) + (t type)))) + ((assq 'window-system parameters) + (cdr (assq 'window-system parameters))) + (display + (or (window-system-for-display display) + (error "Don't know how to interpret display %S" + display))) + (t window-system)) + t)) (oldframe (selected-frame)) (params parameters) frame) @@ -680,7 +683,7 @@ the new frame according to its own rules." ;; Now make the frame. (run-hooks 'before-make-frame-hook) (setq frame - (funcall (gui-method frame-creation-function (or w t)) params)) + (funcall (gui-method frame-creation-function w) params)) (normal-erase-is-backspace-setup-frame frame) ;; Inherit the original frame's parameters. (dolist (param frame-inherited-parameters) |