summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2013-09-13 20:46:18 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2013-09-13 20:46:18 +0400
commitfcd42c11c0e0e5fa3ab931ad2126b1d855ba240f (patch)
tree292f51c029f5651ef19e3058132385c9b03f15a3 /src/frame.c
parentbc2c0769db73f5acd7545b4c3f74cae29e4e4315 (diff)
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.
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c
index 0de3152166..74e57f9b5f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1901,6 +1901,14 @@ See `redirect-frame-focus'. */)
return FRAME_FOCUS_FRAME (decode_live_frame (frame));
}
+DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0,
+ doc: /* Set the input focus to FRAME.
+FRAME nil means use the selected frame. */)
+ (Lisp_Object frame)
+{
+ x_focus_frame (decode_window_system_frame (frame));
+ return Qnil;
+}
/* Return the value of frame parameter PROP in frame FRAME. */
@@ -4524,6 +4532,7 @@ automatically. See also `mouse-autoselect-window'. */);
defsubr (&Svisible_frame_list);
defsubr (&Sraise_frame);
defsubr (&Slower_frame);
+ defsubr (&Sx_focus_frame);
defsubr (&Sredirect_frame_focus);
defsubr (&Sframe_focus);
defsubr (&Sframe_parameters);