HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge from trunk
[bpt/emacs.git]
/
src
/
xdisp.c
diff --git
a/src/xdisp.c
b/src/xdisp.c
index
635e7ec
..
2047c0e
100644
(file)
--- a/
src/xdisp.c
+++ b/
src/xdisp.c
@@
-302,7
+302,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_X_WINDOWS
#include "xterm.h"
#endif
-#ifdef
WINDOWSNT
+#ifdef
HAVE_NTGUI
#include "w32term.h"
#endif
#ifdef HAVE_NS