diff options
| author | Martin Rudalics | 2012-07-25 11:34:48 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2012-07-25 11:34:48 +0200 |
| commit | 8137e7b3165ea5dffc66a0a49f34716df0c00c2d (patch) | |
| tree | 752e56d5285c790b10f21c107f8610d494d3f386 /src | |
| parent | 09ae5da1b8bc7e8195a4a252b532ac33e5723f93 (diff) | |
| download | emacs-8137e7b3165ea5dffc66a0a49f34716df0c00c2d.tar.gz emacs-8137e7b3165ea5dffc66a0a49f34716df0c00c2d.zip | |
Add advertised calling convention for redirect-frame-focus (Bug#12030).
* frame.c (Fredirect_frame_focus): In doc-string don't mention
that FOCUS-FRAME can be omitted.
* subr.el (redirect-frame-focus): Add advertised calling
convention (Bug#12030).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/frame.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2c82af88f93..1e9e65192f7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-07-25 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * frame.c (Fredirect_frame_focus): In doc-string don't mention | ||
| 4 | that FOCUS-FRAME can be omitted. | ||
| 5 | |||
| 1 | 2012-07-25 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2012-07-25 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Adjust buffer text indirection counters at the end of Fkill_buffer. | 8 | Adjust buffer text indirection counters at the end of Fkill_buffer. |
diff --git a/src/frame.c b/src/frame.c index bf2b180f2d3..07783bd8c07 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1874,8 +1874,8 @@ In other words, switch-frame events caused by events in FRAME will | |||
| 1874 | request a switch to FOCUS-FRAME, and `last-event-frame' will be | 1874 | request a switch to FOCUS-FRAME, and `last-event-frame' will be |
| 1875 | FOCUS-FRAME after reading an event typed at FRAME. | 1875 | FOCUS-FRAME after reading an event typed at FRAME. |
| 1876 | 1876 | ||
| 1877 | If FOCUS-FRAME is omitted or nil, any existing redirection is | 1877 | If FOCUS-FRAME is nil, any existing redirection is canceled, and the |
| 1878 | canceled, and the frame again receives its own keystrokes. | 1878 | frame again receives its own keystrokes. |
| 1879 | 1879 | ||
| 1880 | Focus redirection is useful for temporarily redirecting keystrokes to | 1880 | Focus redirection is useful for temporarily redirecting keystrokes to |
| 1881 | a surrogate minibuffer frame when a frame doesn't have its own | 1881 | a surrogate minibuffer frame when a frame doesn't have its own |