diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/frame.c | 6 |
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 @@ | |||
| 1 | 2013-11-19 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * frame.c (Fhandle_focus_in, Fhandle_focus_out): Doc fixes. | ||
| 4 | |||
| 1 | 2013-11-19 Brian Jenkins <brian@brianjenkins.org> (tiny change) | 5 | 2013-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", | |||
| 892 | Focus in events are usually bound to this function. | 892 | Focus in events are usually bound to this function. |
| 893 | Focus in events occur when a frame has focus, but a switch-frame event | 893 | Focus in events occur when a frame has focus, but a switch-frame event |
| 894 | is not generated. | 894 | is not generated. |
| 895 | This function checks if blink-cursor timers should be turned on again. */) | 895 | This function runs the hook `focus-in-hook'. |
| 896 | It 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. |
| 904 | Focus out events are usually bound to this function. | 905 | Focus out events are usually bound to this function. |
| 905 | Focus out events occur when no frame has focus. | 906 | Focus out events occur when no frame has focus. |
| 906 | This function checks if blink-cursor timers should be turned off. */) | 907 | This function runs the hook `focus-out-hook'. |
| 908 | It 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); |