aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2013-11-18 21:32:26 -0500
committerGlenn Morris2013-11-18 21:32:26 -0500
commit8d1c3af987154197ea2cbe0bbc3eb42c9466e2e9 (patch)
treebd9960ebb6aa73fbec21c7d96daf0e1633795369 /src
parentf88ac3bb9146673dcec4139e6e69149d8333b035 (diff)
downloademacs-8d1c3af987154197ea2cbe0bbc3eb42c9466e2e9.tar.gz
emacs-8d1c3af987154197ea2cbe0bbc3eb42c9466e2e9.zip
* src/frame.c (Fhandle_focus_in, Fhandle_focus_out): Doc fixes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/frame.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 43f966cdc3c..80952b76474 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-11-19 Glenn Morris <rgm@gnu.org>
2
3 * frame.c (Fhandle_focus_in, Fhandle_focus_out): Doc fixes.
4
12013-11-19 Brian Jenkins <brian@brianjenkins.org> (tiny change) 52013-11-19 Brian Jenkins <brian@brianjenkins.org> (tiny change)
2 6
3 Add hooks to run on gaining/losing focus. (Bug#15029) 7 Add hooks to run on gaining/losing focus. (Bug#15029)
diff --git a/src/frame.c b/src/frame.c
index fccb53e2436..fbfc7722681 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -892,7 +892,8 @@ DEFUN ("handle-focus-in", Fhandle_focus_in, Shandle_focus_in, 1, 1, "e",
892Focus in events are usually bound to this function. 892Focus in events are usually bound to this function.
893Focus in events occur when a frame has focus, but a switch-frame event 893Focus in events occur when a frame has focus, but a switch-frame event
894is not generated. 894is not generated.
895This function checks if blink-cursor timers should be turned on again. */) 895This function runs the hook `focus-in-hook'.
896It also checks if blink-cursor timers should be turned on again. */)
896 (Lisp_Object event) 897 (Lisp_Object event)
897{ 898{
898 Frun_hooks (1, &Qfocus_in_hook); 899 Frun_hooks (1, &Qfocus_in_hook);
@@ -903,7 +904,8 @@ DEFUN ("handle-focus-out", Fhandle_focus_out, Shandle_focus_out, 1, 1, "e",
903 doc: /* Handle a focus-out event. 904 doc: /* Handle a focus-out event.
904Focus out events are usually bound to this function. 905Focus out events are usually bound to this function.
905Focus out events occur when no frame has focus. 906Focus out events occur when no frame has focus.
906This function checks if blink-cursor timers should be turned off. */) 907This function runs the hook `focus-out-hook'.
908It also checks if blink-cursor timers should be turned off. */)
907 (Lisp_Object event) 909 (Lisp_Object event)
908{ 910{
909 Frun_hooks (1, &Qfocus_out_hook); 911 Frun_hooks (1, &Qfocus_out_hook);