commit b44abacc8cfee02de45773424dd7b18d8794a6c3 (HEAD, refs/remotes/origin/master) Author: Jimmy Yuen Ho Wong Date: Tue Aug 3 08:14:38 2021 +0100 * Fix error while disassembling native code on macOS * lisp/emacs-lisp/disass.el (disassemble-internal): Make sure the regexp that searches for a symbol takes into account of llvm-objdump's output format. diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el index 6ac76f1c19..712fa51170 100644 --- a/lisp/emacs-lisp/disass.el +++ b/lisp/emacs-lisp/disass.el @@ -95,6 +95,8 @@ redefine OBJECT if it is a symbol." (re-search-forward (concat "^.*" (regexp-quote (concat "<" + (when (eq system-type 'darwin) + "_") (comp-c-func-name (subr-name obj) "F" t) ">:")))) commit d50721bf022ba9774cf400c716bbd6c4cac9e45b Merge: 72dc602459 75ecce4323 Author: Amin Bandali Date: Mon Aug 2 22:39:43 2021 -0400 Merge from origin/emacs-27 75ecce4323 Unbreak ERC's Ibuffer filter (Bug#44100) commit 72dc602459fbf0bd756e8e3e41824a353f7dcd80 Merge: 09c3620253 61def1e392 Author: Amin Bandali Date: Mon Aug 2 22:39:43 2021 -0400 ; Merge from origin/emacs-27 The following commit was skipped: 61def1e392 ; Auto-commit of loaddefs files. commit 75ecce4323e8072a2d91a882d0368af9cdfd9df7 (refs/remotes/origin/emacs-27) Author: Olivier Certner Date: Tue Jul 6 10:51:57 2021 +0200 Unbreak ERC's Ibuffer filter (Bug#44100) * lisp/erc/erc-ibuffer.el (erc-modified): Don't use `length' on dotted lists (and not even to test if there is more than one element, for that matter). Use `cdr' instead. diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el index f5b1f6a2a6..8ff548de29 100644 --- a/lisp/erc/erc-ibuffer.el +++ b/lisp/erc/erc-ibuffer.el @@ -77,7 +77,7 @@ erc-track-mode) (let ((entry (assq (current-buffer) erc-modified-channels-alist))) (if entry - (if (> (length entry) 1) + (if (cdr entry) (cond ((eq 'pal (nth 1 entry)) (string erc-ibuffer-pal-char)) ((eq 'fool (nth 1 entry)) commit 09c362025338ff1597593a90f4be5eeac589a7b4 Author: Juri Linkov Date: Tue Aug 3 01:08:23 2021 +0300 Adjust tab-bar to the new mode-line-misc-info value (bug#49806) * lisp/tab-bar.el (tab-bar--define-keys): Adjust to the new default value for `mode-line-misc-info'. diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el index 4d7a0796e5..7459e1b78c 100644 --- a/lisp/tab-bar.el +++ b/lisp/tab-bar.el @@ -142,8 +142,7 @@ Possible modifier keys are `control', `meta', `shift', `hyper', `super' and '(("" (:eval (if (and tab-bar-mode (memq 'tab-bar-format-global tab-bar-format)) - "" global-mode-string)) - " "))))) + "" global-mode-string))))))) (defun tab-bar--undefine-keys () "Uninstall key bindings previously bound by `tab-bar--define-keys'." commit 61def1e392b3e0483d3a2fab5eed123a00a9f0b8 Author: Glenn Morris Date: Sun Aug 1 06:12:18 2021 -0700 ; Auto-commit of loaddefs files. diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 71b107e071..5948b6a67e 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -5039,7 +5039,7 @@ Normally display output in temp buffer, but prefix arg means replace the region with it. `c-macro-preprocessor' specifies the preprocessor to use. -Tf the user option `c-macro-prompt-flag' is non-nil +If the user option `c-macro-prompt-flag' is non-nil prompt for arguments to the preprocessor (e.g. `-DDEBUG -I ./include'), otherwise use `c-macro-cppflags'.