emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/marginalia 3275d1f85c: marginalia-annotate-buffer: Hand


From: ELPA Syncer
Subject: [elpa] externals/marginalia 3275d1f85c: marginalia-annotate-buffer: Handle dead buffers
Date: Sat, 23 Mar 2024 18:58:34 -0400 (EDT)

branch: externals/marginalia
commit 3275d1f85cb020280979a050054b843f7563aea2
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    marginalia-annotate-buffer: Handle dead buffers
    
    See https://github.com/minad/consult/discussions/979
---
 marginalia.el | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/marginalia.el b/marginalia.el
index 58f090b227..d1a1d72db5 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -883,11 +883,13 @@ 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))
-    (marginalia--fields
-     ((marginalia--buffer-status buffer))
-     ((marginalia--buffer-file buffer)
-      :truncate -0.5 :face 'marginalia-file-name))))
+  (when-let ((buffer (get-buffer cand)))
+    (if (buffer-live-p buffer)
+        (marginalia--fields
+         ((marginalia--buffer-status buffer))
+         ((marginalia--buffer-file buffer)
+          :truncate -0.5 :face 'marginalia-file-name))
+      (marginalia--fields ("(dead buffer)" :face 'error)))))
 
 (defun marginalia--full-candidate (cand)
   "Return completion candidate CAND in full.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]