Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
fdcb0601
Commit
fdcb0601
authored
Oct 08, 2014
by
Stefan Monnier
Browse files
* lisp/frame.el (make-frame): Use t rather than nil for `w'.
Fixes: debbugs:18653
parent
b4030330
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
17 deletions
+24
-17
lisp/ChangeLog
lisp/ChangeLog
+6
-2
lisp/frame.el
lisp/frame.el
+18
-15
No files found.
lisp/ChangeLog
View file @
fdcb0601
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)
...
...
lisp/frame.el
View file @
fdcb0601
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment