Have `no-byte-compile' implies also `no-native-compile'.

	* lisp/emacs-lisp/comp.el (no-native-compile): Update doctring.
	* lisp/emacs-lisp/bytecomp.el (byte-compile-from-buffer): when
	`no-byte-compile' is set to non-nil it overrides this.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index b04286c34aecf53a1f5e34a2322340a6a8a60d52..6b874b69167b0237808e91a01917de3e7bd33ebc 100644 (file)
--- 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 5a4a2f6ef152d206d1507b3bcff8859e707be3d9..a3a481cd36ad1d4b7463eedab60c8dcc17a2c1e5 100644 (file)
--- 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: ")