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).

4 files changed, 14 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95b69ec7712..5dbd7fb4bf1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-25  Martin Rudalics  <rudalics@gmx.at>
+
+        * subr.el (redirect-frame-focus): Add advertised calling
+        convention (Bug#12030).
+
 2012-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Prefer typical American spelling for "acknowledgment".
@@ -570,7 +575,7 @@
 2012-07-06  Dmitry Gutov  <dgutov@yandex.ru>
 
         * window.el (quit-window): Always restore window height when
-        it's saved in quit-restore parameter.
+        it's saved in quit-restore parameter (Bug#11810).
 
 2012-07-06  Glenn Morris  <rgm@gnu.org>
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 0afe33c6a4c..882ad3cd23d 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1184,6 +1184,7 @@ is converted into a string by expressing it in decimal."
 (set-advertised-calling-convention
  'all-completions '(string collection &optional predicate) "23.1")
 (set-advertised-calling-convention 'unintern '(name obarray) "23.3")
+(set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.2")
 
 ;;;; Obsolescence declarations for variables, and aliases.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 2c82af88f93..1e9e65192f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-25  Martin Rudalics  <rudalics@gmx.at>
+
+        * frame.c (Fredirect_frame_focus): In doc-string don't mention
+        that FOCUS-FRAME can be omitted.
+
 2012-07-25  Dmitry Antipov  <dmantipov@yandex.ru>
 
         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
 request a switch to FOCUS-FRAME, and `last-event-frame' will be
 FOCUS-FRAME after reading an event typed at FRAME.
 
-If FOCUS-FRAME is omitted or nil, any existing redirection is
-canceled, and the frame again receives its own keystrokes.
+If FOCUS-FRAME is nil, any existing redirection is canceled, and the
+frame again receives its own keystrokes.
 
 Focus redirection is useful for temporarily redirecting keystrokes to
 a surrogate minibuffer frame when a frame doesn't have its own