Subject: w32-default-color-map should be obsolete

From: Juanma Barranquero <[email-masked]>
Date: Tue, 18 Oct 2011 17:32:31 +0200

Package: emacs
Severity: minor

After revno:106121, the w32-specific function w32-default-color-map is
only used from C, in w32fns.c:Fx_open_connection, to initialize the
color map in case ~/rgb.txt and etc/rgb.txt are not found.

It does not seem useful to expose it to elisp, so I suggest turning it
into an internal function, and marking the elisp interface as
obsolete.

    Juanma

2011-10-18  Juanma Barranquero  <[email-masked]>

	* w32fns.c (w32_default_color_map): New function,
	extracted from Fw32_default_color_map.
	(Fw32_default_color_map, Fx_open_connection): Use it.

2011-10-18  Juanma Barranquero  <[email-masked]>

	* term/w32-win.el (w32-default-color-map): Declare obsolete.

=== modified file 'lisp/term/w32-win.el'
--- lisp/term/w32-win.el	2011-05-04 14:03:16 +0000
+++ lisp/term/w32-win.el	2011-10-18 14:40:13 +0000
@@ -85,6 +85,7 @@
 (define-obsolete-function-alias 'w32-select-font 'x-select-font "23.1")

 (defvar w32-color-map) ;; defined in w32fns.c
+(make-obsolete 'w32-default-color-map nil "24.1")

 (declare-function w32-send-sys-command "w32fns.c")
 (declare-function set-message-beep "w32console.c")

=== modified file 'src/w32fns.c'
--- src/w32fns.c	2011-07-08 12:46:17 +0000
+++ src/w32fns.c	2011-10-18 14:35:09 +0000
@@ -635,9 +635,8 @@
   {"LightGreen"                , PALETTERGB (144,238,144)},
 };

-DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color_map,
-       0, 0, 0, doc: /* Return the default color map.  */)
-  (void)
+static Lisp_Object
+w32_default_color_map (void)
 {
   int i;
   colormap_t *pc = w32_color_map;
@@ -658,6 +657,13 @@
   return (cmap);
 }

+DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color_map,
+       0, 0, 0, doc: /* Return the default color map.  */)
+  (void)
+{
+  return w32_default_color_map ();
+}
+
 static Lisp_Object
 w32_color_map_lookup (char *colorname)
 {
@@ -4768,7 +4773,7 @@
     UNGCPRO;
   }
   if (NILP (Vw32_color_map))
-    Vw32_color_map = Fw32_default_color_map ();
+    Vw32_color_map = w32_default_color_map ();

   /* Merge in system logical colors.  */
   add_system_logical_colors_to_map (&Vw32_color_map);