diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-10-19 07:50:35 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-10-19 07:50:35 -0700 |
| commit | 4d4b4017591c7fb4e37b7d1e0d6b2db565a56c66 (patch) | |
| tree | 132fc64cbb5da9e0f5d0600edfcf189dd86e783d /doc/lispref/windows.texi | |
| parent | 41c262af322eab6c35a94d747dcaf776b0975f35 (diff) | |
| parent | d742cc3c204ba0adeb9600d236a0e454e35a42ff (diff) | |
| download | emacs-4d4b4017591c7fb4e37b7d1e0d6b2db565a56c66.tar.gz | |
Merge from origin/emacs-28
d742cc3c20 (origin/emacs-28) ; etc/NEWS: Fix typos
28db29590f * admin/notes/unicode: Refer to Unicode's emoji-style.txt
9bd2f59db6 Handle VS-16 correctly for non-emoji codepoints
e55e2d4a11 ; * etc/NEWS: Minor copyedit about 'repeat-mode'.
380981ddb5 Adjust bug-reference-bug-regexp default values to match on...
c1cf95a0e1 ; * doc/emacs/windows.texi: Doc fix.
98eb6d783a Fix a typo in emacs-lisp-intro.texi
f5b8f626e3 Fix some Tramp problems
fc988a7113 Adapt Tramp manual
0c241043a8 Further fixes to Elisp manual
8e8a920246 * lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1): ...
5a3242301d Rename tab-bar-drag-maybe to tab-bar--dragging-in-progress
bb4209a5a5 Fix xref elisp identifier namespace mistake
# Conflicts:
# etc/NEWS
Diffstat (limited to 'doc/lispref/windows.texi')
| -rw-r--r-- | doc/lispref/windows.texi | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index fb72b8f7005..262516054ab 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -213,7 +213,8 @@ window} which is used for displaying a tooltip in a tooltip frame Each window belongs to exactly one frame (@pxref{Frames}). For all windows belonging to a specific frame, we sometimes also say that these -windows are @dfn{owned} by that frame or simply that they are on that frame. +windows are @dfn{owned} by that frame or simply that they are on that +frame. @defun window-frame &optional window This function returns the specified @var{window}'s frame---the frame @@ -233,12 +234,6 @@ minibuffer window (@pxref{Minibuffer Windows}) in that list. If active. If @var{minibuffer} is neither @code{nil} nor @code{t}, the minibuffer window is never included. -Note that the window returned by @code{minibuffer-window} called with -the argument @var{frame} is returned by @code{window-list} called with -the same argument if and only if that window actually belongs to -@var{frame}. If the minibuffer window is owned by another frame, it is -not returned by this invocation. - The optional argument @var{window}, if non-@code{nil}, must be a live window on the specified frame; then @var{window} will be the first element in the returned list. If @var{window} is omitted or @code{nil}, |