[Emacs-diffs] /srv/bzr/emacs/trunk r106198: * lisp/term/w32-win.el (w32-default-color-map): Declare obsolete.

[Juanma Barranquero]

------------------------------------------------------------
revno: 106198
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2011-10-26 15:42:33 +0200
message:
  * 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.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/term/w32-win.el
  src/ChangeLog
  src/w32fns.c

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2011-10-26 00:44:06 +0000
+++ b/etc/NEWS  2011-10-26 13:42:33 +0000
@@ -1351,6 +1351,8 @@
 
 ** 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.
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-26 08:42:22 +0000
+++ b/lisp/ChangeLog    2011-10-26 13:42:33 +0000
@@ -1,3 +1,7 @@
+2011-10-26  Juanma Barranquero  <address@hidden>
+
+       * term/w32-win.el (w32-default-color-map): Declare obsolete.
+
 2011-10-26  Michael Albinus  <address@hidden>
 
        * ido.el (ido-file-name-all-completions-1): Do not require

=== modified file 'lisp/term/w32-win.el'
--- a/lisp/term/w32-win.el      2011-05-04 14:03:16 +0000
+++ b/lisp/term/w32-win.el      2011-10-26 13:42:33 +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/ChangeLog'
--- a/src/ChangeLog     2011-10-25 16:36:20 +0000
+++ b/src/ChangeLog     2011-10-26 13:42:33 +0000
@@ -1,3 +1,9 @@
+2011-10-26  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * dispextern.h (Fcontrolling_tty_p): New decl (Bug#6649 part 2).

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2011-07-08 12:46:17 +0000
+++ b/src/w32fns.c      2011-10-26 13:42:33 +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)
 {
@@ -683,7 +689,6 @@
       QUIT;
     }
 
-
   UNBLOCK_INPUT;
 
   return ret;
@@ -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);