From f6083c67c54ba1a4951ecf7b3b242d097de8bff2 Mon Sep 17 00:00:00 2001
From: Brian Jenkins <brian@brianjenkins.org>
Date: Sat, 23 Nov 2013 11:07:34 -0800
Subject: [PATCH] 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.
---
 doc/lispref/ChangeLog   | 5 +++++
 doc/lispref/frames.texi | 8 ++++++++
 doc/lispref/hooks.texi  | 6 ++++++
 etc/NEWS                | 1 +
 4 files changed, 20 insertions(+)

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 5251efec3e..bd84546551 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 4935534d6e..01ced2bf6a 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 745393f816..74adda1d49 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}.
 
diff --git a/etc/NEWS b/etc/NEWS
index 4dc1543d84..ffbfc64873 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -176,6 +176,7 @@ Generic commands are interactive functions whose implementation can be
 selected among several alternatives, as a matter of user preference.
 
 ** New hooks `focus-in-hook', `focus-out-hook'.
+These are normal hooks run when an Emacs frame gains or loses input focus.
 
 ** The blink cursor stops blinking after 10 blinks (default) on X and NS.
 You can change the default by customizing the variable blink-cursor-blinks.
-- 
2.20.1