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
e560aba9
Commit
e560aba9
authored
Jul 28, 2013
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* frame.c (delete_frame): Avoid unnecessary 'this_f' test.
Fixes: debbugs:14970
parent
2e5ce5de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
src/ChangeLog
src/ChangeLog
+4
-0
src/frame.c
src/frame.c
+6
-5
No files found.
src/ChangeLog
View file @
e560aba9
2013-07-28 Paul Eggert <eggert@cs.ucla.edu>
* frame.c (delete_frame): Avoid unnecessary 'this_f' test (Bug#14970).
2013-07-28 Eli Zaretskii <eliz@gnu.org>
* w32fns.c (w32_wnd_proc) <WM_IME_STARTCOMPOSITION>: Make sure the
...
...
src/frame.c
View file @
e560aba9
...
...
@@ -1158,12 +1158,13 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
FOR_EACH_FRAME (frames, this)
{
Lisp_Object fminiw;
struct
frame
*
this_f
;
if
(
!
EQ
(
this
,
frame
)
&&
(
this_f
=
XFRAME
(
this
))
&&
WINDOWP
(
fminiw
=
FRAME_MINIBUF_WINDOW
(
this_f
))
&&
EQ
(
frame
,
WINDOW_FRAME
(
XWINDOW
(
fminiw
))))
if (EQ (this, frame))
continue;
fminiw = FRAME_MINIBUF_WINDOW (XFRAME (this));
if (WINDOWP (fminiw) && EQ (frame, WINDOW_FRAME (XWINDOW (fminiw))))
{
/* If we MUST delete this frame, delete the other first.
But do this only if FORCE equals `noelisp'. */
...
...
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