From: Andrea Corallo <acorallo@gnu.org>
Date: Sun, 27 Aug 2023 16:59:40 +0000 (+0200)
Subject: * Fix native disassemble on Windows platforms (bug#65455)
X-Git-Tag: emacs-29.1.90~170
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ea5fd6c96bc;p=emacs.git

* Fix native disassemble on Windows platforms (bug#65455)

* lisp/emacs-lisp/disass.el (disassemble-internal): Improve regexp.
---

diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index 859a494a697..f9f7448d81c 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -94,14 +94,11 @@ redefine OBJECT if it is a symbol."
                     (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)