Mercurial > emacs
diff src/w32fns.c @ 97194:d45e07b45d86
NS port now uses etc/rgb.txt instead of etc/Emacs.clr (now removed); function Fw32_load_color_file moved to xfaces x_load_color_file
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Fri, 01 Aug 2008 11:48:29 +0000 |
parents | 840bd675fd85 |
children | dde0533b6aec |
line wrap: on
line diff
--- a/src/w32fns.c Fri Aug 01 04:48:08 2008 +0000 +++ b/src/w32fns.c Fri Aug 01 11:48:29 2008 +0000 @@ -502,53 +502,6 @@ return (oldrgb); } -DEFUN ("w32-load-color-file", Fw32_load_color_file, - Sw32_load_color_file, 1, 1, 0, - doc: /* Create an alist of color entries from an external file. -Assign this value to `w32-color-map' to replace the existing color map. - -The file should define one named RGB color per line like so: - R G B name -where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */) - (filename) - Lisp_Object filename; -{ - FILE *fp; - Lisp_Object cmap = Qnil; - Lisp_Object abspath; - - CHECK_STRING (filename); - abspath = Fexpand_file_name (filename, Qnil); - - fp = fopen (SDATA (filename), "rt"); - if (fp) - { - char buf[512]; - int red, green, blue; - int num; - - BLOCK_INPUT; - - while (fgets (buf, sizeof (buf), fp) != NULL) { - if (sscanf (buf, "%u %u %u %n", &red, &green, &blue, &num) == 3) - { - char *name = buf + num; - num = strlen (name) - 1; - if (name[num] == '\n') - name[num] = 0; - cmap = Fcons (Fcons (build_string (name), - make_number (RGB (red, green, blue))), - cmap); - } - } - fclose (fp); - - UNBLOCK_INPUT; - } - - return cmap; -} - /* The default colors for the w32 color map */ typedef struct colormap_t { @@ -4995,7 +4948,7 @@ Fexpand_file_name (build_string ("rgb.txt"), Fsymbol_value (intern ("data-directory"))); - Vw32_color_map = Fw32_load_color_file (color_file); + Vw32_color_map = Fx_load_color_file (color_file); UNGCPRO; } @@ -7226,7 +7179,6 @@ defsubr (&Sw32_define_rgb_color); defsubr (&Sw32_default_color_map); - defsubr (&Sw32_load_color_file); defsubr (&Sw32_send_sys_command); defsubr (&Sw32_shell_execute); defsubr (&Sw32_register_hot_key);