branch: externals/marginalia
commit bf207e36e722263c229953caa04631e453580956
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
marginalia-annotate-buffer: Check `uniquify-orig-buffer` property
Thanks, @dgutov!
See emacs-mirror/emacs/commit/76877a6b08492c555744cfebda3224df91dec82a.
cc @oantolin Embark needs an `embark--uniquify-orig-buffer` candidate
transformer in `embark-transformer-alist`.
---
marginalia.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/marginalia.el b/marginalia.el
index 6fbaa2f6a0..63228e414d 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -906,7 +906,9 @@ The string is transformed according to
`marginalia--bookmark-type-transforms'."
(defun marginalia-annotate-buffer (cand)
"Annotate buffer CAND with modification status, file name and major mode."
- (when-let ((buffer (get-buffer cand)))
+ ;; Emacs 31: `project--read-project-buffer' uses `uniquify-get-unique-names'
+ (when-let ((buffer (or (get-text-property 0 'uniquify-orig-buffer cand)
+ (get-buffer cand))))
(if (buffer-live-p buffer)
(marginalia--fields
((marginalia--buffer-status buffer))
