summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/bytecomp.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-02-16 09:44:04 -0800
committerGlenn Morris <rgm@gnu.org>2018-02-16 09:44:04 -0800
commit47106da23ac2b19ad994eed95cdcb0d33535281d (patch)
tree689994b90ebbf6d8567d3143aad15a8fec251179 /lisp/emacs-lisp/bytecomp.el
parent4ba32858d61eee16f17b51aca01c15211a0912f8 (diff)
parenta06a8ed5b66883202ae7182471570dfcabcea973 (diff)
downloademacs-47106da23ac2b19ad994eed95cdcb0d33535281d.tar.gz
emacs-47106da23ac2b19ad994eed95cdcb0d33535281d.tar.bz2
emacs-47106da23ac2b19ad994eed95cdcb0d33535281d.zip
Merge from origin/emacs-26
a06a8ed (origin/emacs-26) ; * lisp/vc/vc-git.el (vc-git--program-vers... edc06ad Make 'byte-compile-error-on-warn' a safe file variable 9f5d8da ; * lisp/textmodes/flyspell.el (flyspell-auto-correct-word): ... f73905a Fix the doc string of flyspell-auto-correct-word e9c7ddc Improve the MS-Windows appendix of the Emacs manual 6ddb4bd Fix 'vc-git--program-version' 63c93f7 Fix typos and wording in the Emacs manual 42f15b0 * doc/emacs/programs.texi (Semantic): Order programming langu... b46be29 More improvements for the Emacs manual 874c0ed Minor wording change in Emacs manual 53511f9 Another set of changes for the manual 78426b8 Improvements on tramp.texi 0dca618 Tramp minor doc fixes Conflicts: doc/misc/tramp.texi
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
-rw-r--r--lisp/emacs-lisp/bytecomp.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index a64c88c4f0d..1bf6d04b63b 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -295,6 +295,11 @@ The information is logged to `byte-compile-log-buffer'."
"If true, the byte-compiler reports warnings with `error'."
:group 'bytecomp
:type 'boolean)
+;; This needs to be autoloaded because it needs to be available to
+;; Emacs before the byte compiler is loaded, otherwise Emacs will not
+;; know that this variable is marked as safe until it is too late.
+;; (See https://lists.gnu.org/archive/html/emacs-devel/2018-01/msg00261.html )
+;;;###autoload(put 'byte-compile-error-on-warn 'safe-local-variable 'booleanp)
(defconst byte-compile-warning-types
'(redefine callargs free-vars unresolved