diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2023-01-30 07:19:43 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-01-30 07:19:43 +0100 |
| commit | 207a0d9408cb97b9ae78469e2487e3075ade03f8 (patch) | |
| tree | a1981a27c6d4e0263cbaebfd36213a31c7744d7a /lisp/emacs-lisp | |
| parent | 254c75fc2935e7edef079166d90b231278115a2f (diff) | |
| parent | 8360e12f0ea3a3ccf0305adab3c7ea7e38af36c1 (diff) | |
| download | emacs-207a0d9408cb97b9ae78469e2487e3075ade03f8.tar.gz emacs-207a0d9408cb97b9ae78469e2487e3075ade03f8.tar.bz2 emacs-207a0d9408cb97b9ae78469e2487e3075ade03f8.zip | |
Merge from origin/emacs-29
8360e12f0ea Update to Org 9.6.1-23-gc45a05
9058601308d ; * doc/emacs/misc.texi (Document View): Remove @footnote...
197f994384c Document tree-sitter features in the user manual
b73539832d9 ; Remove treesit--font-lock-fast-mode-grace-count
64fee21d5f8 Fix dockerfile-ts-mode line continuation indentation (bug...
1970726e26a Use treesit-subtree-stat to determine treesit--font-lock-...
382e018856a Add treesit-subtree-stat
a3003492ace Move c-ts-mode--statement-offset to c-ts-common.el
4b1714571c8 ; Fix byte-compile warnings in c-ts-mode.el
f50cb7d7c4b ; Improve docstring of c-ts-mode--indent-style-setter
1c3ca3bb649 Fix <> syntax in rust-ts-mode
56e8607dc99 Fix spurious errors on Windows when deleting temporary *....
2bd0b947538 Fix java class member without access modifier (bug#61115)
1de6ebf2878 Make treesit-font-lock-level a defcustom
6e50ee8bbb5 Add c-ts-mode-set-style and :set for c-ts-mode-indent-style
450db0587a9 Minor documentation improvements for outline-minor-mode (...
578e8926713 ; * doc/lispref/variables.texi (File Local Variables): Im...
bc5ee2b7bf0 ; * src/comp.c: Remove Local Variables section to avoid w...
362678d90e1 python.el: Use correct regexp when enabling python-ts-mode
76bb46db9df ; * doc/emacs/frames.texi (Mouse References): Improve ind...
# Conflicts:
# doc/emacs/programs.texi
# etc/NEWS
# lisp/progmodes/c-ts-mode.el
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 4c423be06c4..d2e7d933f4f 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -4112,13 +4112,16 @@ the deferred compilation mechanism." (native-elisp-load data))) ;; We may have created a temporary file when we're being ;; called with something other than a file as the argument. - ;; Delete it. + ;; Delete it if we can. (when (and (not (stringp function-or-file)) (not output) comp-ctxt (comp-ctxt-output comp-ctxt) (file-exists-p (comp-ctxt-output comp-ctxt))) - (delete-file (comp-ctxt-output comp-ctxt)))))))) + (cond ((eq 'windows-nt system-type) + ;; We may still be using the temporary .eln file. + (ignore-errors (delete-file (comp-ctxt-output comp-ctxt)))) + (t (delete-file (comp-ctxt-output comp-ctxt)))))))))) (defun native-compile-async-skip-p (file load selector) "Return non-nil if FILE's compilation should be skipped. |