Merge from emacs--devo--0

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index ff0caaf43b4f065b15cdcea52aef868add09be46..b20df2e9cd5762bdf34677db750c33eba574a190 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -36,13 +36,6 @@
 (defvar command-line-processed nil
   "Non-nil once command line has been processed.")
 
-(defvar window-system initial-window-system
-  "Name of window system the selected frame is displaying through.
-The value is a symbol--for instance, `x' for X windows.
-The value is nil if the selected frame is on a text-only-terminal.")
-
-(make-variable-frame-local 'window-system)
-
 (defgroup initialization nil
   "Emacs start-up procedure."
   :group 'environment)