From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 12 Jun 2008 15:29:18 +0000 (+0000)
Subject: (Fx_select_font): Rename from x-font-dialog.
X-Git-Tag: emacs-pretest-23.0.90~4854
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f82605c6b65ae393cfb9f7a7f0b173a6efd83e5c;p=emacs.git

(Fx_select_font): Rename from x-font-dialog.
---

diff --git a/src/xfns.c b/src/xfns.c
index df350a36e93..2dbbe80e097 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5631,12 +5631,15 @@ directories.  */)
 
 #ifdef HAVE_FREETYPE
 
-DEFUN ("x-font-dialog", Fx_font_dialog, Sx_font_dialog, 0, 0, 0,
-       doc: /* Read a font name using a font selection dialog.
-The font name is returned as a string.  */)
-  ()
+DEFUN ("x-select-font", Fx_select_font, Sx_select_font, 0, 2, 0,
+       doc: /* Read a font name using a GTK font selection dialog.
+Return a GTK-style font string corresponding to the selection.
+
+If FRAME is omitted or nil, it defaults to the selected frame. */)
+  (frame, ignored)
+     Lisp_Object frame, ignored;
 {
-  FRAME_PTR f = SELECTED_FRAME ();
+  FRAME_PTR f = check_x_frame (frame);
   char *fontname;
   Lisp_Object font = Qnil;
   int count = SPECPDL_INDEX ();
@@ -6036,7 +6039,7 @@ the tool bar buttons.  */);
 #endif
 
 #ifdef USE_GTK
-  defsubr (&Sx_font_dialog);
+  defsubr (&Sx_select_font);
 #endif
 }