1 files changed, 3 insertions, 26 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index c713a82505c..6ec77af88d0 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1368,32 +1368,9 @@
 ;;; we break the program, because it will appear that pop-up-windows and 
 ;;; old-pop-ups are not EQ when really they are.  So we have to know what
 ;;; the BOOL variables are, and not perform this optimization on them.
-;;;
-(defconst byte-boolean-vars
-  '(abbrev-all-caps abbrevs-changed byte-debug-flag byte-metering-on
-    cannot-suspend check-markers-debug-flag completion-auto-help
-    completion-ignore-case cursor-in-echo-area debug-on-next-call
-    debug-on-quit delete-exited-processes enable-recursive-minibuffers
-    garbage-collection-messages highlight-nonselected-windows
-    indent-tabs-mode inherit-process-coding-system inhibit-eol-conversion
-    inhibit-local-menu-bar-menus insert-default-directory inverse-video
-    keyword-symbols-constant-flag load-convert-to-unibyte
-    load-force-doc-strings load-in-progress menu-prompting
-    minibuffer-allow-text-properties minibuffer-auto-raise
-    mode-line-inverse-video multiple-frames no-redraw-on-reenter
-    noninteractive parse-sexp-ignore-comments parse-sexp-lookup-properties
-    pop-up-frames pop-up-windows print-escape-multibyte
-    print-escape-newlines
-    print-escape-nonascii print-quoted scroll-preserve-screen-position
-    system-uses-terminfo truncate-partial-width-windows
-    unibyte-display-via-language-environment use-dialog-box
-    visible-bell vms-stmlf-recfm words-include-escapes redisplay-dont-pause
-    w32-use-full-screen-buffer w32-strict-fontnames w32-enable-unicode-output
-    auto-resize-toolbars auto-raise-toolbar-buttons display-busy-cursor
-    x-stretch-cursor x-toolkit-scroll-bars-p)
-  "DEFVAR_BOOL variables.  Giving these any non-nil value sets them to t.
-If this does not enumerate all DEFVAR_BOOL variables, the byte-optimizer
-may generate incorrect code.")
+
+;;; The variable `byte-boolean-vars' is now primitive and updated
+;;; automatically by DEFVAR_BOOL.
 
 (defun byte-optimize-lapcode (lap &optional for-effect)
   "Simple peephole optimizer.  LAP is both modified and returned."