aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2011-03-11 16:42:12 +0100
committerJuanma Barranquero2011-03-11 16:42:12 +0100
commit1e048ad1a60374ff026f021fe836c4f77a3fca60 (patch)
tree612d940eeab5525078d87d7bd1afc610a6270e6d /src
parent9c5047fb4e78dfc1d8667e06947f5660dcf234eb (diff)
downloademacs-1e048ad1a60374ff026f021fe836c4f77a3fca60.tar.gz
emacs-1e048ad1a60374ff026f021fe836c4f77a3fca60.zip
Backport 2011-03-08T01:52:20Z!lekktu@gmail.com from trunk.
* src/w32xfns.c (select_palette): Check success of RealizePalette against GDI_ERROR, not zero.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/w32xfns.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a4a80cbf9f5..75958169951 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12011-03-11 Juanma Barranquero <lekktu@gmail.com>
2
3 Backport revno:103582 from trunk.
4 * w32xfns.c (select_palette): Check success of RealizePalette against
5 GDI_ERROR, not zero.
6
12011-03-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 72011-03-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 8
3 * fringe.c (update_window_fringes): Remove unused variables. 9 * fringe.c (update_window_fringes): Remove unused variables.
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 83ffc1c8b5f..0472138e117 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -98,7 +98,7 @@ select_palette (FRAME_PTR f, HDC hdc)
98 else 98 else
99 f->output_data.w32->old_palette = NULL; 99 f->output_data.w32->old_palette = NULL;
100 100
101 if (RealizePalette (hdc)) 101 if (RealizePalette (hdc) != GDI_ERROR)
102 { 102 {
103 Lisp_Object frame, framelist; 103 Lisp_Object frame, framelist;
104 FOR_EACH_FRAME (framelist, frame) 104 FOR_EACH_FRAME (framelist, frame)