diff options
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/w32fns.c | 15 |
5 files changed, 23 insertions, 5 deletions
@@ -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 88248f00559..aa27ea3f97a 100644 --- 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 e4bf031d422..b7f2a69e77b 100644 --- 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 854c4987be5..d68225070d7 100644 --- 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 f48e5764b4c..2ecd6e91533 100644 --- 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); |