From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 5 Sep 2022 04:30:32 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1856^2~716^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5c8b76fc873676457810817958c119542ffe16f6;p=emacs.git

Merge from origin/emacs-28

5713c730f2 Update to Org 9.5.5
aad38d6010 * lisp/emacs-lisp/comp.el (comp-run-async-workers): Fail m...
---

5c8b76fc873676457810817958c119542ffe16f6
diff --cc lisp/emacs-lisp/comp.el
index 306ec918b1a,a5ab12ae388..a9087313b18
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@@ -3935,39 -3927,28 +3935,42 @@@ display a message.
           when (or native-comp-always-compile
                    load ; Always compile when the compilation is
                         ; commanded for late load.
-                   (file-newer-than-file-p
-                    source-file (comp-el-to-eln-filename source-file)))
+                   ;; Skip compilation if `comp-el-to-eln-filename' fails
+                   ;; to find a writable directory.
+                   (with-demoted-errors "Async compilation :%S"
+                     (file-newer-than-file-p
+                      source-file (comp-el-to-eln-filename source-file))))
           do (let* ((expr `((require 'comp)
 -                           ,(when (boundp 'backtrace-line-length)
 -                              `(setf backtrace-line-length ,backtrace-line-length))
 -                           (setf comp-file-preloaded-p ,comp-file-preloaded-p
 -                                 native-compile-target-directory ,native-compile-target-directory
 -                                 native-comp-speed ,native-comp-speed
 -                                 native-comp-debug ,native-comp-debug
 -                                 native-comp-verbose ,native-comp-verbose
 -                                 comp-libgccjit-reproducer ,comp-libgccjit-reproducer
 -                                 comp-async-compilation t
 -                                 native-comp-eln-load-path ',native-comp-eln-load-path
 -                                 native-comp-compiler-options
 -                                 ',native-comp-compiler-options
 -                                 native-comp-driver-options
 -                                 ',native-comp-driver-options
 -                                 load-path ',load-path
 -                                 warning-fill-column most-positive-fixnum)
 +                           (setq comp-async-compilation t)
 +                           (setq warning-fill-column most-positive-fixnum)
 +                           ,(let ((set (list 'setq)))
 +                              (dolist (var '(comp-file-preloaded-p
 +                                             native-compile-target-directory
 +                                             native-comp-speed
 +                                             native-comp-debug
 +                                             native-comp-verbose
 +                                             comp-libgccjit-reproducer
 +                                             native-comp-eln-load-path
 +                                             native-comp-compiler-options
 +                                             native-comp-driver-options
 +                                             load-path
 +                                             backtrace-line-length
 +                                             ;; package-load-list
 +                                             ;; package-user-dir
 +                                             ;; package-directory-list
 +                                             ))
 +                                (when (boundp var)
 +                                  (push var set)
 +                                  (push `',(symbol-value var) set)))
 +                              (nreverse set))
 +                           ;; FIXME: Activating all packages would align the
 +                           ;; functionality offered with what is usually done
 +                           ;; for ELPA packages (and thus fix some compilation
 +                           ;; issues with some ELPA packages), but it's too
 +                           ;; blunt an instrument (e.g. we don't even know if
 +                           ;; we're compiling such an ELPA package at
 +                           ;; this point).
 +                           ;;(package-activate-all)
                             ,native-comp-async-env-modifier-form
                             (message "Compiling %s..." ,source-file)
                             (comp--native-compile ,source-file ,(and load t))))