summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2015-05-19 11:08:21 +0200
committerMartin Rudalics <rudalics@gmx.at>2015-05-19 11:08:21 +0200
commit9a07af01d046d072520593a729ea18230761e205 (patch)
tree0c13081d13e6f7d81b81ce8eaed8cd6e79866ca4 /src/frame.c
parent448cacc85c5cc7b017437e71962168ed03d21ab6 (diff)
downloademacs-9a07af01d046d072520593a729ea18230761e205.tar.gz
emacs-9a07af01d046d072520593a729ea18230761e205.tar.bz2
emacs-9a07af01d046d072520593a729ea18230761e205.zip
Clarify concept of "surrogate minibuffer frames" (Bug#20538)
* src/frame.c (Fdelete_frame): In doc-string mention that frame can't be deleted if it has a surrogate minibuffer. * doc/lispref/frames.texi (Minibuffers and Frames) (Deleting Frames): Explain "surrogate minibuffer frames".
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/frame.c b/src/frame.c
index 22086552ea3..edf656694b7 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1823,9 +1823,10 @@ DEFUN ("delete-frame", Fdelete_frame, Sdelete_frame, 0, 2, "",
doc: /* Delete FRAME, permanently eliminating it from use.
FRAME defaults to the selected frame.
-A frame may not be deleted if its minibuffer is used by other frames.
-Normally, you may not delete a frame if all other frames are invisible,
-but if the second optional argument FORCE is non-nil, you may do so.
+A frame may not be deleted if its minibuffer serves as surrogate
+minibuffer for another frame. Normally, you may not delete a frame if
+all other frames are invisible, but if the second optional argument
+FORCE is non-nil, you may do so.
This function runs `delete-frame-functions' before actually
deleting the frame, unless the frame is a tooltip.