# HG changeset patch # User Adrian Robert # Date 1216781622 0 # Node ID a0e61ef5801ff83cd6473f17ab67bf1921c54adb # Parent 71ed3159f61600333f6290a8fffbf165e53fef3e fix up compile error from renaming of ns-list-fonts diff -r 71ed3159f616 -r a0e61ef5801f src/nsfns.m --- a/src/nsfns.m Wed Jul 23 02:51:12 2008 +0000 +++ b/src/nsfns.m Wed Jul 23 02:53:42 2008 +0000 @@ -1840,65 +1840,6 @@ } -#if 0 -DEFUN ("x-list-fonts", Fx_list_fonts, Sx_list_fonts, 1, 4, 0, - doc: /* Return a list of the names of available fonts matching PATTERN. -If optional arguments FACE and FRAME are specified, return only fonts -the same size as FACE on FRAME. -If optional argument MAX is specified, return at most MAX matches. - -PATTERN is a regular expression; FACE is a face name - a symbol. - -The return value is a list of strings, suitable as arguments to -set-face-font. - -The font names are _NOT_ X names. */) - (pattern, face, frame, max) - Lisp_Object pattern, face, frame, max; -{ - Lisp_Object flist, olist = Qnil, tem; - struct frame *f; - int maxnames; - - /* We can't simply call check_x_frame because this function may be - called before any frame is created. */ - if (NILP (frame)) - f = SELECTED_FRAME (); - else - { - CHECK_LIVE_FRAME (frame); - f = XFRAME (frame); - } - if (! FRAME_WINDOW_P (f)) - { - /* Perhaps we have not yet created any frame. */ - f = NULL; - } - - if (NILP (max)) - maxnames = 4; - else - { - CHECK_NATNUM (max); - maxnames = XFASTINT (max); - } - - /* get XLFD names */ - flist = ns_list_fonts (f, pattern, 0, maxnames); - - /* convert list into regular names */ - for (tem = flist; CONSP (tem); tem = XCDR (tem)) - { - Lisp_Object fname = XCAR (tem); - olist = Fcons (build_string (ns_xlfd_to_fontname (SDATA (fname))), - olist); - } - - return olist; -} -#endif - - DEFUN ("ns-font-name", Fns_font_name, Sns_font_name, 1, 1, 0, doc: /* Determine font postscript or family name for font NAME. NAME should be a string containing either the font name or an XLFD