[Emacs-diffs] Changes to emacs/src/xfns.c,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/06/12 15:29:18

Index: xfns.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfns.c,v
retrieving revision 1.711
retrieving revision 1.712
diff -u -b -r1.711 -r1.712
--- xfns.c      10 Jun 2008 20:56:58 -0000      1.711
+++ xfns.c      12 Jun 2008 15:29:18 -0000      1.712
@@ -5631,12 +5631,15 @@
 
 #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 @@
 #endif
 
 #ifdef USE_GTK
-  defsubr (&Sx_font_dialog);
+  defsubr (&Sx_select_font);
 #endif
 }