diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index b04286c34ae..6b874b69167 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -2277,7 +2277,8 @@ With argument ARG, insert value in current buffer after the form." (push `(comp-native-driver-options . ,comp-native-driver-options) byte-native-qualities) (defvar no-native-compile) - (push `(no-native-compile . ,no-native-compile) + ;; `no-byte-compile' implies also `no-native-compile'. + (push `(no-native-compile . ,(or no-byte-compile no-native-compile)) byte-native-qualities)) ;; Compile the forms from the input buffer. diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 5a4a2f6ef15..a3a481cd36a 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -182,6 +182,8 @@ the .eln output directory." (defvar no-native-compile nil "Non-nil to prevent native-compiling of Emacs Lisp code. +Note that when `no-byte-compile' is set to non-nil it overrides the value of +`no-native-compile'. This is normally set in local file variables at the end of the elisp file: \;; Local Variables:\n;; no-native-compile: t\n;; End: ") |