From 712b2de134e18ebf4eb4a5d2154f875becc07d20 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Wed, 23 Jul 2008 02:53:42 +0000 Subject: [PATCH] fix up compile error from renaming of ns-list-fonts --- lisp/ChangeLog | 4 ++++ lisp/term/ns-win.el | 1 - src/ChangeLog | 6 +++++ src/nsfns.m | 58 --------------------------------------------- src/nsterm.m | 4 ++-- 5 files changed, 12 insertions(+), 61 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6ea835e256a..72a11167447 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-07-19 Adrian Robert + + * term/ns-win.el (x-list-fonts): Drop alias. + 2008-07-23 Juri Linkov * replace.el (multi-query-replace-map): New variable. diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 22c21a65c77..cdb5018e230 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -1302,7 +1302,6 @@ PROMPT is the prompt string." ;;;; Font support. -(defalias 'x-list-fonts 'ns-list-fonts) ;; Needed for font listing functions under both backend and normal (setq scalable-fonts-allowed t) diff --git a/src/ChangeLog b/src/ChangeLog index 9e0877701d5..8bee26ced91 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-07-22 Adrian Robert + + * nsfns.m (x-list-fonts): Remove. + (syms_of_nsfns): Drop the x-list-fonts declaration. + * nsterm.m: Get rid of remaining "//" comments. + 2008-07-22 Chong Yidong * xselect.c (Fx_rotate_cut_buffers_internal): Doc fix. diff --git a/src/nsfns.m b/src/nsfns.m index 84bcc36a4cd..b8e28f1d13f 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1840,63 +1840,6 @@ DEFUN ("ns-emacs-info-panel", Fns_emacs_info_panel, Sns_emacs_info_panel, } -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; -} - - 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 @@ -2693,7 +2636,6 @@ be used as the image of the icon representing the frame. */); defsubr (&Sns_set_resource); defsubr (&Sxw_display_color_p); /* this and next called directly by C code */ defsubr (&Sx_display_grayscale_p); - defsubr (&Sx_list_fonts); defsubr (&Sns_font_name); defsubr (&Sns_list_colors); #ifdef NS_IMPL_COCOA diff --git a/src/nsterm.m b/src/nsterm.m index 72638825ef7..8fd157ebcc4 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1584,7 +1584,7 @@ ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc, return 0; if (makeIndex && alloc) - color_def->pixel = ns_index_color(temp, f);//[temp retain]; + color_def->pixel = ns_index_color(temp, f); /* [temp retain]; */ [temp getRed: &r green: &g blue: &b alpha: &a]; color_def->red = r * 256; @@ -4068,7 +4068,7 @@ ns_term_shutdown (int sig) Fcons (build_string ("Cancel"), Qnil), Fcons (build_string ("Save and Exit"), Qt)); Lisp_Object res = ns_popup_dialog (Qt, contents, Qnil); -fprintf (stderr, "res = %d\n", EQ (res, Qt)); // FIXME +fprintf (stderr, "res = %d\n", EQ (res, Qt)); /* FIXME */ if (EQ (res, Qt)) { Feval (Fcons (intern ("save-buffers-kill-emacs"), Qnil)); -- 2.39.2