[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/csv-mode 51580d5bf7: Make csv-mode align when display-l
From: |
Lars Ingebrigtsen |
Subject: |
[elpa] externals/csv-mode 51580d5bf7: Make csv-mode align when display-line-numbers-mode is on |
Date: |
Fri, 13 May 2022 15:48:13 -0400 (EDT) |
branch: externals/csv-mode
commit 51580d5bf7095eff429029cd8d4b79214faf6b48
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Make csv-mode align when display-line-numbers-mode is on
* csv-mode.el (csv-header-line): Add the header line indent.
(csv--compute-header-string): Add to align-to.
(csv-align-mode): Enable header-line-indent-mode (bug#55387).
---
csv-mode.el | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/csv-mode.el b/csv-mode.el
index 30dbb5f4ec..c39f81eabe 100644
--- a/csv-mode.el
+++ b/csv-mode.el
@@ -4,7 +4,7 @@
;; Author: "Francis J. Wright" <F.J.Wright@qmul.ac.uk>
;; Maintainer: emacs-devel@gnu.org
-;; Version: 1.19
+;; Version: 1.20
;; Package-Requires: ((emacs "27.1") (cl-lib "0.5"))
;; Keywords: convenience
@@ -1377,8 +1377,12 @@ If there is already a header line, then unset the header
line."
(overlay-put csv--header-line 'modification-hooks
'(csv--header-flush)))
(csv--header-flush)
+ ;; These are introduced in Emacs 29.
+ (unless (boundp 'header-line-indent)
+ (setq-local header-line-indent ""
+ header-line-indent-width 0))
(setq header-line-format
- '(:eval (csv--header-string)))))
+ '("" header-line-indent (:eval (csv--header-string))))))
(defun csv--header-flush (&rest _)
;; Force re-computation of the header-line.
@@ -1412,9 +1416,10 @@ If there is already a header line, then unset the header
line."
(nexti (next-single-property-change i 'display str))
(newprop
`(space :align-to
- ,(if (numberp x)
- (- x (or csv--header-hscroll 0))
- `(- ,x csv--header-hscroll)))))
+ (+ ,(if (numberp x)
+ (- x (or csv--header-hscroll 0))
+ `(- ,x csv--header-hscroll))
+ header-line-indent-width))))
(put-text-property i (or nexti (length str))
'display newprop str)
(setq i nexti))))
@@ -1742,6 +1747,8 @@ setting works better)."
(add-to-invisibility-spec '(csv-truncate . t))
(kill-local-variable 'csv--jit-columns)
(cursor-sensor-mode 1)
+ (when (fboundp 'header-line-indent-mode)
+ (header-line-indent-mode))
(jit-lock-register #'csv--jit-align)
(jit-lock-refontify))
(t
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/csv-mode 51580d5bf7: Make csv-mode align when display-line-numbers-mode is on,
Lars Ingebrigtsen <=