(Fx_focus_frame): Rename from Fw32_focus_frame.

2 files changed, 6 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4ad6b4b7264..c1e0f990e04 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-18  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (Fx_focus_frame): Rename from Fw32_focus_frame.
+
 2007-09-17  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (gdpy_def): New variable.
diff --git a/src/w32fns.c b/src/w32fns.c
index aeb4183393b..f4637be249b 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4488,7 +4488,7 @@ x_get_focus_frame (frame)
   return xfocus;
 }
 
-DEFUN ("w32-focus-frame", Fw32_focus_frame, Sw32_focus_frame, 1, 1, 0,
+DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0,
        doc: /* Give FRAME input focus, raising to foreground if necessary.  */)
   (frame)
      Lisp_Object frame;
@@ -9023,10 +9023,10 @@ versions of Windows) characters.  */);
   defsubr (&Sx_close_connection);
   defsubr (&Sx_display_list);
   defsubr (&Sx_synchronize);
+  defsubr (&Sx_focus_frame);
 
   /* W32 specific functions */
 
-  defsubr (&Sw32_focus_frame);
   defsubr (&Sw32_select_font);
   defsubr (&Sw32_define_rgb_color);
   defsubr (&Sw32_default_color_map);