mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-29

Browse source 
648a5e33e8 Update to Org 9.6.8-3-g21171d
458442fe78 Escape percent character in treesit--inspect-name (bug#65...
bc0426ce8e Don't add an extraneous slash in remote PATH list in Eshell
34f7a47c9c Fix Tramp on MS Windows
ea5fd6c96b * Fix native disassemble on Windows platforms (bug#65455)
91d2d8439b * Handle missing eln file when trying to disassble (bug#6...
e7ac50a153 * lisp/emacs-lisp/comp.el (comp--native-compile): Fix OUT...
45cf3a0ced Update to Transient v0.4.3
31d3808fb9 Adapt Eshell manual
0c50af054f Fix applying patches with Git on MS-Windows

# Conflicts:
#	doc/misc/transient.texi
#	test/lisp/eshell/esh-util-tests.el
This commit is contained in:
Eli Zaretskii 2023-09-02 04:28:17 -04:00
commit ec3ea8c036
15 changed files with 96 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/emacs-lisp/comp.el
View file

@ -4177,7 +4177,8 @@ the deferred compilation mechanism."
(symbols-with-pos-enabled t)
;; Have byte compiler signal an error when compilation fails.
(byte-compile-debug t)
(comp-ctxt (make-comp-ctxt :output output
(comp-ctxt (make-comp-ctxt :output (when output
(expand-file-name output))
:with-late-load with-late-load)))
(comp-log "\n \n" 1)
(unwind-protect

17
lisp/emacs-lisp/disass.el
View file

@ -92,17 +92,16 @@ redefine OBJECT if it is a symbol."
(subr-native-elisp-p obj))
(progn
(require 'comp)
(call-process "objdump" nil (current-buffer) t "-S"
(native-comp-unit-file (subr-native-comp-unit obj)))
(let ((eln (native-comp-unit-file (subr-native-comp-unit obj))))
(if (file-exists-p eln)
(call-process "objdump" nil (current-buffer) t "-S" eln)
(error "Missing eln file for #<subr %s>" name)))
(goto-char (point-min))
(re-search-forward (concat "^.*"
(re-search-forward (concat "^.*<_?"
(regexp-quote
(concat "<"
(when (eq system-type 'darwin)
"_")
(comp-c-func-name
(subr-name obj) "F" t)
">:"))))
(comp-c-func-name
(subr-name obj) "F" t))
">:"))
(beginning-of-line)
(delete-region (point-min) (point))
(when (re-search-forward "^.*<.*>:" nil t 2)