Mercurial > emacs
changeset 96912:71ed3159f616
fix up compile error from renaming of ns-list-fonts
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Wed, 23 Jul 2008 02:51:12 +0000 |
| parents | dd755b7c9f24 |
| children | a0e61ef5801f |
| files | lisp/ChangeLog lisp/term/ns-win.el src/ChangeLog src/nsfns.m src/nsterm.m |
| diffstat | 5 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jul 23 01:20:12 2008 +0000 +++ b/lisp/ChangeLog Wed Jul 23 02:51:12 2008 +0000 @@ -1,3 +1,7 @@ +2008-07-19 Adrian Robert <Adrian.B.Robert@gmail.com> + + * term/ns-win.el (x-list-fonts): Drop alias. + 2008-07-23 Juri Linkov <juri@jurta.org> * replace.el (multi-query-replace-map): New variable.
--- a/lisp/term/ns-win.el Wed Jul 23 01:20:12 2008 +0000 +++ b/lisp/term/ns-win.el Wed Jul 23 02:51:12 2008 +0000 @@ -1302,7 +1302,6 @@ ;;;; Font support. -(defalias 'x-list-fonts 'ns-list-fonts) ;; Needed for font listing functions under both backend and normal (setq scalable-fonts-allowed t)
--- a/src/ChangeLog Wed Jul 23 01:20:12 2008 +0000 +++ b/src/ChangeLog Wed Jul 23 02:51:12 2008 +0000 @@ -1,3 +1,9 @@ +2008-07-22 Adrian Robert <Adrian.B.Robert@gmail.com> + + * 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 <cyd@stupidchicken.com> * xselect.c (Fx_rotate_cut_buffers_internal): Doc fix.
--- a/src/nsfns.m Wed Jul 23 01:20:12 2008 +0000 +++ b/src/nsfns.m Wed Jul 23 02:51:12 2008 +0000 @@ -1840,6 +1840,7 @@ } +#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 @@ -1895,6 +1896,7 @@ return olist; } +#endif DEFUN ("ns-font-name", Fns_font_name, Sns_font_name, 1, 1, 0, @@ -2693,7 +2695,6 @@ 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
--- a/src/nsterm.m Wed Jul 23 01:20:12 2008 +0000 +++ b/src/nsterm.m Wed Jul 23 02:51:12 2008 +0000 @@ -1584,7 +1584,7 @@ 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 @@ 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));