Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / src / window.h

diff --git a/src/window.h b/src/window.h
index df359f37db2c584753bd6e53fee74279d209ef3b..4ca46b20af57ebbd7901abcf66629fbb75d459d7 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -749,7 +749,7 @@ extern Lisp_Object Vminibuf_scroll_window;
 /* Nil or a symbol naming the window system under which emacs is
    running ('x is the only current possibility) */
 
-extern Lisp_Object Vwindow_system;
+extern Lisp_Object Vinitial_window_system;
 
 /* Version number of X windows: 10, 11 or nil.  */