X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/d2ddb05002375d191b3fe5cfc5978873748debe5..8b8bf8e68f19cdbe07521fa2d3c563265b27bd94:/src/msdos.c diff --git a/src/msdos.c b/src/msdos.c index fc14be2705..e015942779 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1,6 +1,7 @@ /* MS-DOS specific C utilities. -*- coding: raw-text -*- Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, - 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -56,7 +57,7 @@ Boston, MA 02110-1301, USA. */ #include "dispextern.h" #include "dosfns.h" #include "termopts.h" -#include "charset.h" +#include "character.h" #include "coding.h" #include "disptab.h" #include "frame.h" @@ -3799,15 +3800,15 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx, screensize = screen_size * 2; faces[0] = lookup_derived_face (sf, intern ("msdos-menu-passive-face"), - 0, DEFAULT_FACE_ID, 1); + DEFAULT_FACE_ID, 1); faces[1] = lookup_derived_face (sf, intern ("msdos-menu-active-face"), - 0, DEFAULT_FACE_ID, 1); + DEFAULT_FACE_ID, 1); selectface = intern ("msdos-menu-select-face"); faces[2] = lookup_derived_face (sf, selectface, - 0, faces[0], 1); + faces[0], 1); faces[3] = lookup_derived_face (sf, selectface, - 0, faces[1], 1); + faces[1], 1); /* Make sure the menu title is always displayed with `msdos-menu-active-face', no matter where the mouse pointer is. */