aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2017-10-29 11:35:32 +0100
committerMartin Rudalics2017-10-29 11:35:32 +0100
commit4189d0ef7bf935fb8e6ab941e93d591be654ddac (patch)
treedd3e8ffab778e68fa44db9dcc9bdbded06d16aa5 /src
parent2ebdde6e9cfe5bba337cad0a8be695f1e2bce7f8 (diff)
downloademacs-4189d0ef7bf935fb8e6ab941e93d591be654ddac.tar.gz
emacs-4189d0ef7bf935fb8e6ab941e93d591be654ddac.zip
Fix minibuffer window related docs and strings (Bug#28978)
* src/frame.c (Vdefault_minibuffer_frame): Fix doc-string. * src/window.c (Fminibuffer_selected_window): Fix doc-string. * doc/lispref/frames.texi (Buffer Parameters): Rewrite description of `minibuffer' parameter. * doc/lispref/minibuf.texi (Minibuffer Windows): Reorder entries and partly rewrite section. (Minibuffer Misc): Clarify description of `minibuffer-selected-window'. * etc/NEWS: Mention new semantics of 'minibuffer' frame parameter.
Diffstat (limited to 'src')
-rw-r--r--src/frame.c15
-rw-r--r--src/window.c2
2 files changed, 6 insertions, 11 deletions
diff --git a/src/frame.c b/src/frame.c
index ab801eec9c7..fe1709e6ede 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -5895,16 +5895,11 @@ or call the function `tool-bar-mode'. */);
5895#endif 5895#endif
5896 5896
5897 DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame, 5897 DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame,
5898 doc: /* Minibufferless frames use this frame's minibuffer. 5898 doc: /* Minibuffer-less frames by default use this frame's minibuffer.
5899Emacs cannot create minibufferless frames unless this is set to an 5899Emacs consults this variable only when creating a minibuffer-less frame
5900appropriate surrogate. 5900and no explicit minibuffer window has been specified for that frame via
5901 5901the `minibuffer' frame parameter. Once such a frame has been created,
5902Emacs consults this variable only when creating minibufferless 5902setting this variable does not change that frame's previous association.
5903frames; once the frame is created, it sticks with its assigned
5904minibuffer, no matter what this variable is set to. This means that
5905this variable doesn't necessarily say anything meaningful about the
5906current set of frames, or where the minibuffer is currently being
5907displayed.
5908 5903
5909This variable is local to the current terminal and cannot be buffer-local. */); 5904This variable is local to the current terminal and cannot be buffer-local. */);
5910 5905
diff --git a/src/window.c b/src/window.c
index ba86d73911f..f08979e1320 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5833,7 +5833,7 @@ by this function. This happens in an interactive call. */)
5833 5833
5834DEFUN ("minibuffer-selected-window", Fminibuffer_selected_window, Sminibuffer_selected_window, 0, 0, 0, 5834DEFUN ("minibuffer-selected-window", Fminibuffer_selected_window, Sminibuffer_selected_window, 0, 0, 0,
5835 doc: /* Return the window which was selected when entering the minibuffer. 5835 doc: /* Return the window which was selected when entering the minibuffer.
5836Returns nil, if selected window is not a minibuffer window. */) 5836Return nil if the selected window is not a minibuffer window. */)
5837 (void) 5837 (void)
5838{ 5838{
5839 if (minibuf_level > 0 5839 if (minibuf_level > 0