aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref/frames.texi
diff options
context:
space:
mode:
authorPaul Eggert2016-09-26 13:32:28 -0700
committerPaul Eggert2016-09-26 13:32:28 -0700
commitdcd90f60eb8952d119d97efcef9564ec96def054 (patch)
tree2d3a5bbac64d7fbd94f3af0774218911a522e61f /doc/lispref/frames.texi
parentc44ecb77ab33f0a0559c3e5da42fb486d6b014dd (diff)
parent0ffc9cef49b0fceb3c5e904837ea5675fe4306ac (diff)
downloademacs-dcd90f60eb8952d119d97efcef9564ec96def054.tar.gz
emacs-dcd90f60eb8952d119d97efcef9564ec96def054.zip
Merge from origin/emacs-25
0ffc9ce Update admin/authors.el 0ad7410 Update Antinews in ELisp manual ea0f750 Fix comments on window height macros 0bbdeed Fix 'url-http-create-request' when cookies are used 0045998 Fix cross reference in frames.texi 1392894 ; * etc/DEBUG: Minor copyedits. 304a5c8 ; * etc/DEBUG: Improve documentation of getting control to GDB. 56bf7d7 Fix regexp-opt documentation (bug #17862) 803ad6f ; Fix documentation of seq-subseq ed4530d * lisp/emacs-lisp/gv.el (gv-ref): Fix example of PLACE in doc... 88ea396 ; Spelling fixes 17197d0 Fix tags-query-replace docstring 80a7f8b Clarify documentation of precision in format specs 88a5052 Improve and clarify documentation of subprocesses 89eb09f * etc/PROBLEMS: Mention gnutls-cli 3.5.3 (Bug#24247). # Conflicts: # etc/PROBLEMS # src/process.c
Diffstat (limited to 'doc/lispref/frames.texi')
-rw-r--r--doc/lispref/frames.texi3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 53406d114af..7736438126c 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -1992,8 +1992,7 @@ Window Ordering}.
1992 1992
1993Normally, each frame has its own minibuffer window at the bottom, which 1993Normally, each frame has its own minibuffer window at the bottom, which
1994is used whenever that frame is selected. If the frame has a minibuffer, 1994is used whenever that frame is selected. If the frame has a minibuffer,
1995you can get it with @code{minibuffer-window} (@pxref{Definition of 1995you can get it with @code{minibuffer-window} (@pxref{Minibuffer Windows}).
1996minibuffer-window}).
1997 1996
1998@cindex frame without a minibuffer 1997@cindex frame without a minibuffer
1999@cindex surrogate minibuffer frame 1998@cindex surrogate minibuffer frame