aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2018-06-12 19:26:44 +0300
committerEli Zaretskii2018-06-12 19:26:44 +0300
commitd93ba8ddeb30bca74b306b6e768f6d20416e1802 (patch)
tree1bb1716f87e803e8b28218a67e4d891251672f09 /lisp
parente9c189ccae342c63de2629c5a51d1f40d1a562b6 (diff)
downloademacs-d93ba8ddeb30bca74b306b6e768f6d20416e1802.tar.gz
emacs-d93ba8ddeb30bca74b306b6e768f6d20416e1802.zip
; Assorted documentation fixes in recent changes
* etc/NEWS: Minor copyedits of recent entries. * src/keyboard.c (Finternal_handle_focus_in): * lisp/frame.el (frame-focus-state): Doc fixes. * doc/lispref/hooks.texi (Standard Hooks): Mention after-delete-frame-functions.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/frame.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 38f785901e7..7dbd346bd91 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -131,9 +131,10 @@ appended when the minibuffer frame is created."
131 131
132(defun frame-focus-state (&optional frame) 132(defun frame-focus-state (&optional frame)
133 "Return FRAME's last known focus state. 133 "Return FRAME's last known focus state.
134If nil or omitted, FRAME defaults to the selected frame.
135
134Return nil if the frame is definitely known not be focused, t if 136Return nil if the frame is definitely known not be focused, t if
135the frame is known to be focused, and 'unknown if we don't know. If 137the frame is known to be focused, and `unknown' if we don't know."
136FRAME is nil, query the selected frame."
137 (let* ((frame (or frame (selected-frame))) 138 (let* ((frame (or frame (selected-frame)))
138 (tty-top-frame (tty-top-frame frame))) 139 (tty-top-frame (tty-top-frame frame)))
139 (if (not tty-top-frame) 140 (if (not tty-top-frame)