Merge from emacs--devo--0

[gnu-emacs] / src / window.h

diff --git a/src/window.h b/src/window.h
index d4f28034b190cfc793f32f3b3e8e6dd88867b72f..d459d9e305d91f59420b59f349267d7b42a80a96 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -6,7 +6,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -744,7 +744,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.  */