Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ac71ced7
Commit
ac71ced7
authored
May 19, 2009
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
(delete_frame) [NS_IMPL_COCOA]: Instead, do it here.
parent
2645d15b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
src/ChangeLog
src/ChangeLog
+5
-0
src/frame.c
src/frame.c
+9
-10
No files found.
src/ChangeLog
View file @
ac71ced7
2009-05-19 Stefan Monnier <monnier@iro.umontreal.ca>
* frame.c (do_switch_frame) [NS_IMPL_COCOA]: Don't raise any window.
(delete_frame) [NS_IMPL_COCOA]: Instead, do it here.
2009-05-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* xterm.c (x_delete_display): Don't call XrmDestroyDatabase here.
...
...
src/frame.c
View file @
ac71ced7
...
...
@@ -866,16 +866,6 @@ do_switch_frame (frame, track, for_deletion, norecord)
Fselect_window
(
XFRAME
(
frame
)
->
selected_window
,
norecord
);
#ifdef NS_IMPL_COCOA
/* Under NS, there is no system mechanism for choosing a new window to be
selected -- it is left to application code. So the portion of THIS
application interfacing with NS needs to know about it. */
if
(
for_deletion
&&
FRAME_VISIBLE_P
(
XFRAME
(
selected_frame
))
&&
FRAME_LIVE_P
(
XFRAME
(
selected_frame
))
&&
!
FRAME_ICONIFIED_P
(
XFRAME
(
selected_frame
)))
Fraise_frame
(
Qnil
);
#endif
/* We want to make sure that the next event generates a frame-switch
event to the appropriate frame. This seems kludgy to me, but
before you take it out, make sure that evaluating something like
...
...
@@ -1423,6 +1413,15 @@ delete_frame (frame, force)
break
;
}
}
#ifdef NS_IMPL_COCOA
else
/* Under NS, there is no system mechanism for choosing a new
window to get focus -- it is left to application code.
So the portion of THIS application interfacing with NS
needs to know about it. We call Fraise_frame, but the
purpose is really to transfer focus. */
Fraise_frame
(
frame1
);
#endif
do_switch_frame
(
frame1
,
0
,
1
,
Qnil
);
sf
=
SELECTED_FRAME
();
...
...
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