aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2018-06-12 19:26:44 +0300
committerEli Zaretskii2018-06-12 19:26:44 +0300
commitd93ba8ddeb30bca74b306b6e768f6d20416e1802 (patch)
tree1bb1716f87e803e8b28218a67e4d891251672f09 /src
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 'src')
-rw-r--r--src/keyboard.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 0d6a6ad56b8..12fc33787a3 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6605,8 +6605,8 @@ has the same base event type and all the specified modifiers. */)
6605 6605
6606DEFUN ("internal-handle-focus-in", Finternal_handle_focus_in, 6606DEFUN ("internal-handle-focus-in", Finternal_handle_focus_in,
6607 Sinternal_handle_focus_in, 1, 1, 0, 6607 Sinternal_handle_focus_in, 1, 1, 0,
6608 doc: /* Internally handle focus-in events, possibly generating 6608 doc: /* Internally handle focus-in events.
6609an artifical switch-frame event. */) 6609This function potentially generates an artifical switch-frame event. */)
6610 (Lisp_Object event) 6610 (Lisp_Object event)
6611{ 6611{
6612 Lisp_Object frame; 6612 Lisp_Object frame;
@@ -6616,9 +6616,9 @@ an artifical switch-frame event. */)
6616 error ("invalid focus-in event"); 6616 error ("invalid focus-in event");
6617 6617
6618 /* Conceptually, the concept of window manager focus on a particular 6618 /* Conceptually, the concept of window manager focus on a particular
6619 frame and the Emacs selected frame shouldn't be related, but for a 6619 frame and the Emacs selected frame shouldn't be related, but for
6620 long time, we automatically switched the selected frame in response 6620 a long time, we automatically switched the selected frame in
6621 to focus events, so let's keep doing that. */ 6621 response to focus events, so let's keep doing that. */
6622 bool switching = (!EQ (frame, internal_last_event_frame) 6622 bool switching = (!EQ (frame, internal_last_event_frame)
6623 && !EQ (frame, selected_frame)); 6623 && !EQ (frame, selected_frame));
6624 internal_last_event_frame = frame; 6624 internal_last_event_frame = frame;