Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 09:14:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix buffer menu unmark (bug#80082)

Browse source 
Now when calling 'Buffer-menu-unmark-all-buffers', only the
selected mark is removed.

* lisp/buff-menu.el (Buffer-menu--unmark): Add a mark parameter
to correctly select it in the entry.
(Buffer-menu-unmark, Buffer-menu-unmark-all-buffers)
(Buffer-menu-backup-unmark): Usage.
This commit is contained in:
Manuel Giraud 2026-01-08 08:45:04 +01:00 committed by Juri Linkov
parent e4f49d2710
commit 66ff6064f5
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lisp/buff-menu.el
View file

@ -465,7 +465,7 @@ When `outline-minor-mode' is enabled and point is on the outline
heading line, this command will unmark all entries in the outline."
(interactive "P" Buffer-menu-mode)
(cond ((tabulated-list-get-id)
(Buffer-menu--unmark)
(Buffer-menu--unmark ?\r)
(forward-line (if backup -1 1)))
((and (bound-and-true-p outline-minor-mode) (outline-on-heading-p))
(let ((old-pos (point))
@ -488,11 +488,7 @@ When called interactively prompt for MARK; RET remove all marks."
(save-excursion
(goto-char (point-min))
(while (not (eobp))
(when-let* ((entry (tabulated-list-get-entry)))
(let ((xmarks (list (aref entry 0) (aref entry 2))))
(when (or (char-equal mark ?\r)
(member (char-to-string mark) xmarks))
(Buffer-menu--unmark))))
(Buffer-menu--unmark mark)
(forward-line))))
(defun Buffer-menu-unmark-all ()
@ -506,15 +502,22 @@ When called interactively prompt for MARK; RET remove all marks."
(forward-line -1)
(while (and (not (tabulated-list-get-id)) (not (bobp)))
(forward-line -1))
(if (tabulated-list-get-id) (Buffer-menu--unmark)))
(if (tabulated-list-get-id) (Buffer-menu--unmark ?\r)))
(defun Buffer-menu--unmark ()
(tabulated-list-set-col 0 " " t)
(let ((buf (Buffer-menu-buffer)))
(when buf
(if (buffer-modified-p buf)
(tabulated-list-set-col 2 "*" t)
(tabulated-list-set-col 2 " " t)))))
(defun Buffer-menu--unmark (mark)
"Remove MARK in current entry.
If MARK is \\`RET' remove all marks."
(when-let* ((entry (tabulated-list-get-entry)))
;; A mark could appear in column 0 or 2.
(dolist (col '(0 2))
(when (or (char-equal mark ?\r)
(char-equal mark (string-to-char (aref entry col))))
(tabulated-list-set-col col " " t)))
;; Reset modified mark in column 2.
(let ((buf (Buffer-menu-buffer)))
(when (and buf (buffer-modified-p buf)
(string-equal (aref entry 2) " "))
(tabulated-list-set-col 2 "*" t)))))
(defun Buffer-menu-delete (&optional arg)
"Mark the buffer on this Buffer Menu buffer line for deletion.