1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00

Prefer pos-bol and pos-eol in tabulated-list.el

* lisp/emacs-lisp/tabulated-list.el (tabulated-list-print)
(tabulated-list-print-entry, tabulated-list-delete-entry)
(tabulated-list-set-col, tabulated-list-previous-column): Prefer
pos-bol and pos-eol.
This commit is contained in:
Stefan Kangas 2022-08-21 18:28:43 +02:00
parent a7557f2483
commit ac90530a0a

View file

@ -465,7 +465,7 @@ changing `tabulated-list-sort-key'."
(let* ((elt (car entries)) (let* ((elt (car entries))
(tabulated-list--near-rows (tabulated-list--near-rows
(list (list
(or (tabulated-list-get-entry (point-at-bol 0)) (cadr elt)) (or (tabulated-list-get-entry (pos-bol 0)) (cadr elt))
(cadr elt) (cadr elt)
(or (cadr (cadr entries)) (cadr elt)))) (or (cadr (cadr entries)) (cadr elt))))
(id (car elt))) (id (car elt)))
@ -519,7 +519,7 @@ of column descriptors."
(insert (make-string x ?\s))) (insert (make-string x ?\s)))
(let ((tabulated-list--near-rows ; Bind it if not bound yet (Bug#25506). (let ((tabulated-list--near-rows ; Bind it if not bound yet (Bug#25506).
(or (bound-and-true-p tabulated-list--near-rows) (or (bound-and-true-p tabulated-list--near-rows)
(list (or (tabulated-list-get-entry (point-at-bol 0)) (list (or (tabulated-list-get-entry (pos-bol 0))
cols) cols)
cols)))) cols))))
(dotimes (n ncols) (dotimes (n ncols)
@ -611,7 +611,7 @@ This function only changes the buffer contents; it does not alter
(cols (tabulated-list-get-entry)) (cols (tabulated-list-get-entry))
(inhibit-read-only t)) (inhibit-read-only t))
(when cols (when cols
(delete-region (line-beginning-position) (1+ (line-end-position))) (delete-region (pos-bol) (1+ (pos-eol)))
(list id cols)))) (list id cols))))
(defun tabulated-list-set-col (col desc &optional change-entry-data) (defun tabulated-list-set-col (col desc &optional change-entry-data)
@ -625,8 +625,8 @@ by setting the appropriate slot of the vector originally used to
print this entry. If `tabulated-list-entries' has a list value, print this entry. If `tabulated-list-entries' has a list value,
this is the vector stored within it." this is the vector stored within it."
(let* ((opoint (point)) (let* ((opoint (point))
(eol (line-end-position)) (eol (pos-eol))
(pos (line-beginning-position)) (pos (pos-bol))
(id (tabulated-list-get-id pos)) (id (tabulated-list-get-id pos))
(entry (tabulated-list-get-entry pos)) (entry (tabulated-list-get-entry pos))
(prop 'tabulated-list-column-name) (prop 'tabulated-list-column-name)
@ -651,9 +651,9 @@ this is the vector stored within it."
(goto-char pos) (goto-char pos)
(let ((tabulated-list--near-rows (let ((tabulated-list--near-rows
(list (list
(tabulated-list-get-entry (point-at-bol 0)) (tabulated-list-get-entry (pos-bol 0))
entry entry
(or (tabulated-list-get-entry (point-at-bol 2)) entry)))) (or (tabulated-list-get-entry (pos-bol 2)) entry))))
(tabulated-list-print-col col desc (current-column))) (tabulated-list-print-col col desc (current-column)))
(if change-entry-data (if change-entry-data
(aset entry col desc)) (aset entry col desc))
@ -785,7 +785,7 @@ If ARG is provided, move that many columns."
(let ((prev (or (previous-single-property-change (let ((prev (or (previous-single-property-change
(point) 'tabulated-list-column-name) (point) 'tabulated-list-column-name)
1))) 1)))
(unless (< prev (line-beginning-position)) (unless (< prev (pos-bol))
(goto-char prev))))) (goto-char prev)))))
;;; The mode definition: ;;; The mode definition: