aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Jenkins2013-11-23 11:07:34 -0800
committerGlenn Morris2013-11-23 11:07:34 -0800
commitf6083c67c54ba1a4951ecf7b3b242d097de8bff2 (patch)
tree952f6e5d42696c0fb9f87d8f7238977d404acf97
parenta594a11662a8b39dc332e6e9edd5d9878f1cc125 (diff)
downloademacs-f6083c67c54ba1a4951ecf7b3b242d097de8bff2.tar.gz
emacs-f6083c67c54ba1a4951ecf7b3b242d097de8bff2.zip
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.
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/frames.texi8
-rw-r--r--doc/lispref/hooks.texi6
-rw-r--r--etc/NEWS1
4 files changed, 20 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 @@
12013-11-23 Brian Jenkins <brian@brianjenkins.org> (tiny change)
2
3 * frames.texi (Input Focus):
4 * hooks.texi (Standard Hooks): Mention focus-in-hook, focus-out-hook.
5
12013-11-23 Glenn Morris <rgm@gnu.org> 62013-11-23 Glenn Morris <rgm@gnu.org>
2 7
3 * loading.texi (Library Search): 8 * 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
1479change it. 1479change it.
1480@end defun 1480@end defun
1481 1481
1482@defvar focus-in-hook
1483This is a normal hook run when an Emacs frame gains input focus.
1484@end defvar
1485
1486@defvar focus-out-hook
1487This is a normal hook run when an Emacs frame loses input focus.
1488@end defvar
1489
1482@defopt focus-follows-mouse 1490@defopt focus-follows-mouse
1483This option is how you inform Emacs whether the window manager transfers 1491This option is how you inform Emacs whether the window manager transfers
1484focus when the user moves the mouse. Non-@code{nil} says that it does. 1492focus 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.
115@vindex delayed-warnings-hook 115@vindex delayed-warnings-hook
116The command loop runs this soon after @code{post-command-hook} (q.v.). 116The command loop runs this soon after @code{post-command-hook} (q.v.).
117 117
118@item focus-in-hook
119@vindex focus-in-hook
120@itemx focus-out-hook
121@vindex focus-out-hook
122@xref{Input Focus}.
123
118@item delete-frame-functions 124@item delete-frame-functions
119@xref{Deleting Frames}. 125@xref{Deleting Frames}.
120 126
diff --git a/etc/NEWS b/etc/NEWS
index 4dc1543d845..ffbfc64873c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -176,6 +176,7 @@ Generic commands are interactive functions whose implementation can be
176selected among several alternatives, as a matter of user preference. 176selected among several alternatives, as a matter of user preference.
177 177
178** New hooks `focus-in-hook', `focus-out-hook'. 178** New hooks `focus-in-hook', `focus-out-hook'.
179These are normal hooks run when an Emacs frame gains or loses input focus.
179 180
180** The blink cursor stops blinking after 10 blinks (default) on X and NS. 181** The blink cursor stops blinking after 10 blinks (default) on X and NS.
181You can change the default by customizing the variable blink-cursor-blinks. 182You can change the default by customizing the variable blink-cursor-blinks.