summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBrian Jenkins <brian@brianjenkins.org>2013-11-23 11:07:34 -0800
committerGlenn Morris <rgm@gnu.org>2013-11-23 11:07:34 -0800
commitf6083c67c54ba1a4951ecf7b3b242d097de8bff2 (patch)
tree952f6e5d42696c0fb9f87d8f7238977d404acf97 /doc
parenta594a11662a8b39dc332e6e9edd5d9878f1cc125 (diff)
downloademacs-f6083c67c54ba1a4951ecf7b3b242d097de8bff2.tar.gz
Documentation for focus-in,out hooks (tiny change)
* doc/lispref/frames.texi (Input Focus): * doc/lispref/hooks.texi (Standard Hooks): Mention focus-in-hook, focus-out-hook. * etc/NEWS: Copyedit.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/frames.texi8
-rw-r--r--doc/lispref/hooks.texi6
3 files changed, 19 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 5251efec3e4..bd84546551f 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-23 Brian Jenkins <brian@brianjenkins.org> (tiny change)
+
+ * frames.texi (Input Focus):
+ * hooks.texi (Standard Hooks): Mention focus-in-hook, focus-out-hook.
+
2013-11-23 Glenn Morris <rgm@gnu.org>
* loading.texi (Library Search):
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 4935534d6eb..01ced2bf6ab 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -1479,6 +1479,14 @@ The redirection lasts until @code{redirect-frame-focus} is called to
change it.
@end defun
+@defvar focus-in-hook
+This is a normal hook run when an Emacs frame gains input focus.
+@end defvar
+
+@defvar focus-out-hook
+This is a normal hook run when an Emacs frame loses input focus.
+@end defvar
+
@defopt focus-follows-mouse
This option is how you inform Emacs whether the window manager transfers
focus when the user moves the mouse. Non-@code{nil} says that it does.
diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi
index 745393f8166..74adda1d495 100644
--- a/doc/lispref/hooks.texi
+++ b/doc/lispref/hooks.texi
@@ -115,6 +115,12 @@ Function to call to ``quit'' the current buffer.
@vindex delayed-warnings-hook
The command loop runs this soon after @code{post-command-hook} (q.v.).
+@item focus-in-hook
+@vindex focus-in-hook
+@itemx focus-out-hook
+@vindex focus-out-hook
+@xref{Input Focus}.
+
@item delete-frame-functions
@xref{Deleting Frames}.