ecomplete.el (ecomplete-display-matches): Intercept key sequence from terminal as...

[gnu-emacs] / src / w32xfns.c

diff --git a/src/w32xfns.c b/src/w32xfns.c
index 4cbd812ec0f239cb7b9637814aaa8528a2e82946..fbbf11bd65c574958840f5f7e1c79e1c5ea4b3f7 100644 (file)
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -1,6 +1,5 @@
 /* Functions taken directly from X sources for use with the Microsoft W32 API.
-   Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
-                 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1989, 1992-1995, 1999, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -98,7 +97,7 @@ select_palette (FRAME_PTR f, HDC hdc)
   else
     f->output_data.w32->old_palette = NULL;
 
-  if (RealizePalette (hdc))
+  if (RealizePalette (hdc) != GDI_ERROR)
   {
     Lisp_Object frame, framelist;
     FOR_EACH_FRAME (framelist, frame)
@@ -443,5 +442,3 @@ x_sync (void *f)
 {
 }
 
-/* arch-tag: 4fab3695-4ad3-4cc6-a2b1-fd2c67dc46be
-   (do not change this comment) */