Merge from emacs--devo--0

[gnu-emacs] / src / w32console.c

diff --git a/src/w32console.c b/src/w32console.c
index 0ebda179667ab35cc5452f1e139519c94c52af52..b660d74f85203405299d845872e9fd190a4dbd79 100644 (file)
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -1,5 +1,6 @@
 /* Terminal hooks for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1992, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1999, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -31,7 +32,7 @@ Boston, MA 02110-1301, USA.
 #include <string.h>
 
 #include "lisp.h"
-#include "charset.h"
+#include "character.h"
 #include "coding.h"
 #include "disptab.h"
 #include "termhooks.h"
@@ -704,7 +705,7 @@ syms_of_ntterm ()
   DEFVAR_BOOL ("w32-use-full-screen-buffer",
                &w32_use_full_screen_buffer,
               doc: /* Non-nil means make terminal frames use the full screen buffer dimensions.
-This is desirable when running Emacs over telnet, and is the default.
+This is desirable when running Emacs over telnet.
 A value of nil means use the current console window dimensions; this
 may be preferrable when working directly at the console with a large
 scroll-back buffer.  */);