Unify Fx_focus_frame between all ports.

* src/frame.h (x_focus_frame): New prototype.
* src/xfns.c (Fx_focus_frame): Remove.
(syms_of_xfns): Do not defsubr it.
(x_focus_frame): X implementation.
* src/nsfns.m (Fx_focus_frame): Remove.
(syms_of_nsfns): Do not defsubr it.
(x_focus_frame): NS implementation.
* src/w32term.c (Fx_focus_frame): Remove.
(x_focus_on_frame): Rename to...
(x_focus_frame): W32 implementation.
* src/w32term.h (x_focus_on_frame): Remove prototype.
* src/w32fns.c (Fx_focus_frame): Remove.
(syms_of_w32fns): Do not defsubr it.
* src/frame.c (Fx_focus_frame): Define here.
(syms_of_frame): Defsubr here.
* src/gtkutil.c (xg_tool_bar_callback): Use x_focus_frame.
* lisp/frame.el (x-focus-frame): Mark as declared in frame.c.

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 649e3a3b01c..aa17b9328c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-13  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * frame.el (x-focus-frame): Mark as declared in frame.c.
+
 2013-09-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * ls-lisp.el: Use advice-add.
diff --git a/lisp/frame.el b/lisp/frame.el
index 3668f24ba01..74149a8dc01 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -759,7 +759,7 @@ the user during startup."
         (nreverse frame-initial-geometry-arguments))
   (cdr param-list))
 
-(declare-function x-focus-frame "xfns.c" (frame))
+(declare-function x-focus-frame "frame.c" (frame))
 
 (defun select-frame-set-input-focus (frame &optional norecord)
   "Select FRAME, raise it, and set input focus, if possible.