procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/frame.el (make-frame): Use t rather than nil for `w'.

Browse source 
Fixes: debbugs:18653
This commit is contained in:
Stefan Monnier 2014-10-08 23:04:59 -04:00
parent b4030330c8
commit fdcb06012a
2 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

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

33
lisp/frame.el
View file

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