Merge from origin/emacs-29
0d8b69e0ad
Don't ding when completion succeededf11e2d3699
; * admin/git-bisect-start: Update failing commits9855a3ea74
; * src/xdisp.c (redisplay_tool_bar): Fix a typo in a com...f4ee696b88
Improve documentation of color-related functions90eadc3e23
Revert "* package.el (package--get-activatable-pkg): Pref...65f355ea0a
; Update my mail addressa3a69ec234
Fix connection-local user options handling (bug#63300)240803cc3e
Document 'startup-redirect-eln-cache'026afb2298
; * etc/PROBLEMS: Entry about crashes due to anti-virus (...bcc222251e
Fix `emacs-lisp-native-compile-and-load' for C-h f (bug#5...07c8211ca3
Add 'infer' as a keyword to typescript-ts-mode (bug#63880)dd2d8ff2f5
; * etc/NEWS: Mention the issue with PGTK on WSL (bug#633...fa8135f891
Revert changes to the order in which package descs are lo...27fcfa2c0a
; * etc/NEWS: Improve instructions for grammar libraries.2a84ab905c
Handle point in last file-name component in minibuffer co...05f25238b7
Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...4bc043ff45
Avoid asking redundant question in emacsbug.el2eadf328d0
* test/infra/Dockerfile.emba (emacs-base): Don't install ...583ba1db7e
typescript-ts-mode: Add a rule for function_signature # Conflicts: # etc/NEWS # lisp/minibuffer.el
This commit is contained in:
commit
acfd261a61
21 changed files with 179 additions and 64 deletions
|
@ -2,7 +2,7 @@
|
|||
|
||||
;; Copyright (C) 2019-2023 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Andrea Corallo <akrl@sdf.org>
|
||||
;; Author: Andrea Corallo <acorallo@gnu.org>
|
||||
;; Keywords: lisp
|
||||
;; Package: emacs
|
||||
|
||||
|
@ -4367,6 +4367,26 @@ last directory in `native-comp-eln-load-path')."
|
|||
else
|
||||
collect (byte-compile-file file))))
|
||||
|
||||
(defun comp-write-bytecode-file (eln-file)
|
||||
"After native compilation write the bytecode file for ELN-FILE.
|
||||
Make sure that eln file is younger than byte-compiled one and
|
||||
return the filename of this last.
|
||||
|
||||
This function can be used only in conjuntion with
|
||||
`byte+native-compile' `byte-to-native-output-buffer-file' (see
|
||||
`batch-byte+native-compile')."
|
||||
(pcase byte-to-native-output-buffer-file
|
||||
(`(,temp-buffer . ,target-file)
|
||||
(unwind-protect
|
||||
(progn
|
||||
(byte-write-target-file temp-buffer target-file)
|
||||
;; Touch the .eln in order to have it older than the
|
||||
;; corresponding .elc.
|
||||
(when (stringp eln-file)
|
||||
(set-file-times eln-file)))
|
||||
(kill-buffer temp-buffer))
|
||||
target-file)))
|
||||
|
||||
;;;###autoload
|
||||
(defun batch-byte+native-compile ()
|
||||
"Like `batch-native-compile', but used for bootstrap.
|
||||
|
@ -4382,16 +4402,7 @@ variable \"NATIVE_DISABLED\" is set, only byte compile."
|
|||
(let* ((byte+native-compile t)
|
||||
(byte-to-native-output-buffer-file nil)
|
||||
(eln-file (car (batch-native-compile))))
|
||||
(pcase byte-to-native-output-buffer-file
|
||||
(`(,temp-buffer . ,target-file)
|
||||
(unwind-protect
|
||||
(progn
|
||||
(byte-write-target-file temp-buffer target-file)
|
||||
;; Touch the .eln in order to have it older than the
|
||||
;; corresponding .elc.
|
||||
(when (stringp eln-file)
|
||||
(set-file-times eln-file)))
|
||||
(kill-buffer temp-buffer))))
|
||||
(comp-write-bytecode-file eln-file)
|
||||
(setq command-line-args-left (cdr command-line-args-left)))))
|
||||
|
||||
;;;###autoload
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue