aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/frame.c4
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 @@
12012-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
12012-07-25 Dmitry Antipov <dmantipov@yandex.ru> 62012-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
1874request a switch to FOCUS-FRAME, and `last-event-frame' will be 1874request a switch to FOCUS-FRAME, and `last-event-frame' will be
1875FOCUS-FRAME after reading an event typed at FRAME. 1875FOCUS-FRAME after reading an event typed at FRAME.
1876 1876
1877If FOCUS-FRAME is omitted or nil, any existing redirection is 1877If FOCUS-FRAME is nil, any existing redirection is canceled, and the
1878canceled, and the frame again receives its own keystrokes. 1878frame again receives its own keystrokes.
1879 1879
1880Focus redirection is useful for temporarily redirecting keystrokes to 1880Focus redirection is useful for temporarily redirecting keystrokes to
1881a surrogate minibuffer frame when a frame doesn't have its own 1881a surrogate minibuffer frame when a frame doesn't have its own