diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2022-10-20 20:00:32 +0200 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2022-10-20 20:00:32 +0200 |
| commit | 37bfb623e4b253443e8280c3de4ff91f8db5f51b (patch) | |
| tree | 39e48d687ace2d9b88b10bf82412301c4e723743 /lisp/emacs-lisp | |
| parent | e08e9bc40f2c309bf119659a6496759493bd35e1 (diff) | |
| parent | 937ae0cf55d31c332fba3d96061e2ac3653e5437 (diff) | |
| download | emacs-37bfb623e4b253443e8280c3de4ff91f8db5f51b.tar.gz emacs-37bfb623e4b253443e8280c3de4ff91f8db5f51b.tar.bz2 emacs-37bfb623e4b253443e8280c3de4ff91f8db5f51b.zip | |
Merge remote-tracking branch 'origin/master' into feature/package+vc
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 2c9b79334ba..5a05fe4854b 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -3928,6 +3928,7 @@ processes from `comp-async-compilations'" "Start compiling files from `comp-files-queue' asynchronously. When compilation is finished, run `native-comp-async-all-done-hook' and display a message." + (cl-assert (null comp-no-spawn)) (if (or comp-files-queue (> (comp-async-runnings) 0)) (unless (>= (comp-async-runnings) (comp-effective-async-max-jobs)) @@ -4048,7 +4049,7 @@ the deferred compilation mechanism." (stringp function-or-file)) (signal 'native-compiler-error (list "Not a function symbol or file" function-or-file))) - (unless comp-no-spawn + (when (or (null comp-no-spawn) comp-async-compilation) (catch 'no-native-compile (let* ((print-symbols-bare t) (data function-or-file) |