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

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

diff --git a/etc/NEWS b/etc/NEWS
index 58f3fa492e266840f81cc3cdf52b69c08a9a29c3..6e60f2a65f99ec6f2c41f2c466a65faac241345a 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1351,6 +1351,8 @@ with the USER_LIBS build variable.
 
 ** New make target `dist' to create binary distribution for MS Windows.
 
+** Function `w32-default-color-map' is now obsolete.
+
 ** On Nextstep/OSX, the menu bar can be hidden by customizing
 ns-auto-hide-menu-bar.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88248f00559b9ab28df550836a8788e3b7af4fec..aa27ea3f97a3410d348ecbf68f6dffe7b020e2a7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-26  Juanma Barranquero  <lekktu@gmail.com>
+
+       * term/w32-win.el (w32-default-color-map): Declare obsolete.
+
 2011-10-26  Michael Albinus  <michael.albinus@gmx.de>
 
        * ido.el (ido-file-name-all-completions-1): Do not require

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index e4bf031d4221d505262c5fe15da8bb9ee46ab042..b7f2a69e77bf725a0048fc321c21cee71a50dbf2 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -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")

diff --git a/src/ChangeLog b/src/ChangeLog
index 854c4987be552e13567ef9ce3e99a077d839d02b..d68225070d77fd40d2660eaa39cd9f0ae61bff9c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-26  Juanma Barranquero  <lekktu@gmail.com>
+
+       * 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-25  Paul Eggert  <eggert@cs.ucla.edu>
 
        * dispextern.h (Fcontrolling_tty_p): New decl (Bug#6649 part 2).

diff --git a/src/w32fns.c b/src/w32fns.c
index f48e5764b4cabaea7abcbcb1c7f89f1ab7fb93c6..2ecd6e915332676ddd081a20883380b99cc60c17 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -635,9 +635,8 @@ colormap_t w32_color_map[] =
   {"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 @@ DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color_map,
   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)
 {
@@ -683,7 +689,6 @@ w32_color_map_lookup (char *colorname)
       QUIT;
     }
 
-
   UNBLOCK_INPUT;
 
   return ret;
@@ -4768,7 +4773,7 @@ terminate Emacs if we can't open the connection.
     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);