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
0e662342
Commit
0e662342
authored
Oct 26, 2000
by
Gerd Moellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(Fdelete_frame): Doc fix. Move running the hook
down after the last error condition check.
parent
6c5b90af
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
9 deletions
+13
-9
src/frame.c
src/frame.c
+13
-9
No files found.
src/frame.c
View file @
0e662342
...
...
@@ -1137,7 +1137,10 @@ DEFUN ("delete-frame", Fdelete_frame, Sdelete_frame, 0, 2, "",
If omitted, FRAME defaults to the selected frame.
\n
\
A frame may not be deleted if its minibuffer is used by other frames.
\n
\
Normally, you may not delete a frame if all other frames are invisible,
\n
\
but if the second optional argument FORCE is non-nil, you may do so."
)
but if the second optional argument FORCE is non-nil, you may do so.
\n
\
\n
\
This function runs `delete-frame-hook' before actually deleting the
\n
\
frame. The hook is called with one argument FRAME."
)
(
frame
,
force
)
Lisp_Object
frame
,
force
;
{
...
...
@@ -1169,14 +1172,6 @@ but if the second optional argument FORCE is non-nil, you may do so.")
error ("Attempt to delete the only frame");
#endif
if
(
!
NILP
(
Vrun_hooks
))
{
Lisp_Object
args
[
2
];
args
[
0
]
=
intern
(
"delete-frame-hook"
);
args
[
1
]
=
frame
;
Frun_hook_with_args
(
2
,
args
);
}
/* Does this frame have a minibuffer, and is it the surrogate
minibuffer for any other frame? */
if
(
FRAME_HAS_MINIBUF_P
(
XFRAME
(
frame
)))
...
...
@@ -1198,6 +1193,15 @@ but if the second optional argument FORCE is non-nil, you may do so.")
}
}
/* Run `delete-frame-hook'. */
if
(
!
NILP
(
Vrun_hooks
))
{
Lisp_Object
args
[
2
];
args
[
0
]
=
intern
(
"delete-frame-hook"
);
args
[
1
]
=
frame
;
Frun_hook_with_args
(
2
,
args
);
}
minibuffer_selected
=
EQ
(
minibuf_window
,
selected_window
);
/* Don't let the frame remain selected. */
...
...
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