Commit dee8cd43 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

* xfaces.c (Fx_load_color_file): Fix previous change;

  it is #ifdef WINDOWSNT, not WINDOWS_NT.
parent 6d496c76
2008-08-01 Juanma Barranquero <lekktu@gmail.com>
* xfaces.c (Fx_load_color_file): Fix previous change;
it is #ifdef WINDOWSNT, not WINDOWS_NT.
2008-08-01 Michael Albinus <michael.albinus@gmx.de> 2008-08-01 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (xd_read_message): Handle D-Bus error messages. * dbusbind.c (xd_read_message): Handle D-Bus error messages.
...@@ -8,8 +13,7 @@ ...@@ -8,8 +13,7 @@
2008-08-01 Chong Yidong <cyd@stupidchicken.com> 2008-08-01 Chong Yidong <cyd@stupidchicken.com>
* nsfns.m (ns_frame_parm_handlers): Add empty entry for * nsfns.m (ns_frame_parm_handlers): Add empty entry for x_set_alpha.
x_set_alpha.
* nsterm.m (EmacsApp -application:openFiles:): GNUStep does not * nsterm.m (EmacsApp -application:openFiles:): GNUStep does not
define NSApplicationDelegateReplySuccess. define NSApplicationDelegateReplySuccess.
...@@ -28,8 +32,8 @@ ...@@ -28,8 +32,8 @@
2008-08-01 Adrian Robert <Adrian.B.Robert@gmail.com> 2008-08-01 Adrian Robert <Adrian.B.Robert@gmail.com>
Warning clearing and clean-up in NS port. Warning clearing and clean-up in NS port.
* keyboard.h (xmalloc_widget_value, digest_single_submenu): Add * keyboard.h (xmalloc_widget_value, digest_single_submenu):
prototypes. Add prototypes.
* nsgui.h (FACE_DEFAULT): Remove, unused. * nsgui.h (FACE_DEFAULT): Remove, unused.
(XGCValues): Change colors to unsigned long. (XGCValues): Change colors to unsigned long.
* nsterm.h (EmacsApp): Add declaration of all methods implemented in * nsterm.h (EmacsApp): Add declaration of all methods implemented in
...@@ -63,11 +67,11 @@ ...@@ -63,11 +67,11 @@
(ns_list_fonts): Remove, unused. (ns_list_fonts): Remove, unused.
(ns_font_to_xlfd): Make static. Cast result of UTF8String. (ns_font_to_xlfd): Make static. Cast result of UTF8String.
(ns_fontname_to_xlfd): Make static. (ns_fontname_to_xlfd): Make static.
* w32menu.c (xmalloc_widget_value, digest_single_submenu): Remove * w32menu.c (xmalloc_widget_value, digest_single_submenu):
prototypes (now in keyboard.h). Remove prototypes (now in keyboard.h).
(next_menubar_widget_id): Remove, unused. (next_menubar_widget_id): Remove, unused.
* xmenu.c (xmalloc_widget_value, digest_single_submenu): Remove * xmenu.c (xmalloc_widget_value, digest_single_submenu):
prototypes (now in keyboard.h). Remove prototypes (now in keyboard.h).
* xfaces.c (ns_list_fonts, w32_list_fonts): Remove, unused. * xfaces.c (ns_list_fonts, w32_list_fonts): Remove, unused.
2008-08-01 Dan Nicolaescu <dann@ics.uci.edu> 2008-08-01 Dan Nicolaescu <dann@ics.uci.edu>
...@@ -76,8 +80,8 @@ ...@@ -76,8 +80,8 @@
(floatfns.o): Depend on syssignal.h. (floatfns.o): Depend on syssignal.h.
(term.o): Depend on syssignal.h, systty.h, and $(INTERVAL_SRC). (term.o): Depend on syssignal.h, systty.h, and $(INTERVAL_SRC).
* systty.h: Fix previous change that removed BSD_TERMIOS. Add * systty.h: Fix previous change that removed BSD_TERMIOS.
comments to #ifdefs. Add comments to #ifdefs.
2008-08-01 Adrian Robert <Adrian.B.Robert@gmail.com> 2008-08-01 Adrian Robert <Adrian.B.Robert@gmail.com>
...@@ -14138,7 +14142,6 @@ ...@@ -14138,7 +14142,6 @@
2007-06-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 2007-06-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* macfns.c (mac_window): Replace WindowPtr with WindowRef. * macfns.c (mac_window): Replace WindowPtr with WindowRef.
* macgui.h: Replace WindowPtr with WindowRef. * macgui.h: Replace WindowPtr with WindowRef.
* macmenu.c: Replace MenuHandle and GetMenuHandle with MenuRef and * macmenu.c: Replace MenuHandle and GetMenuHandle with MenuRef and
......
...@@ -6600,10 +6600,10 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */) ...@@ -6600,10 +6600,10 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */)
if (name[num] == '\n') if (name[num] == '\n')
name[num] = 0; name[num] = 0;
cmap = Fcons (Fcons (build_string (name), cmap = Fcons (Fcons (build_string (name),
#ifdef WINDOWS_NT #ifdef WINDOWSNT
make_number (RGB (red, green, blue))), make_number (RGB (red, green, blue))),
#else #else
make_number ((red << 16) | (green << 8) | blue)), make_number ((red << 16) | (green << 8) | blue)),
#endif #endif
cmap); cmap);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment