[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/csv-mode 797c322 13/34: Fix column width calculation in
From: |
Stefan Monnier |
Subject: |
[elpa] externals/csv-mode 797c322 13/34: Fix column width calculation in cvs-mode.el |
Date: |
Sun, 29 Nov 2020 18:46:14 -0500 (EST) |
branch: externals/csv-mode
commit 797c3223fe952b23bd0440695f1919a126fd44bf
Author: Leo Liu <sdl.web@gmail.com>
Commit: Leo Liu <sdl.web@gmail.com>
Fix column width calculation in cvs-mode.el
* csv-mode/cvs-mode.el (csv--column-widths, csv-align-fields): Fix
column width calculation.
---
csv-mode.el | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/csv-mode.el b/csv-mode.el
index 692579d..1e20f8c 100644
--- a/csv-mode.el
+++ b/csv-mode.el
@@ -5,7 +5,7 @@
;; Author: Francis J. Wright <F.J.Wright at qmul.ac.uk>
;; Time-stamp: <23 August 2004>
;; URL: http://centaur.maths.qmul.ac.uk/Emacs/
-;; Version: 1.4
+;; Version: 1.5
;; Keywords: convenience
;; This package is free software; you can redistribute it and/or modify
@@ -964,18 +964,17 @@ The fields yanked are those last killed by
`csv-kill-fields'."
(while (not (eobp)) ; for each record...
(or (csv-not-looking-at-record)
(let ((w widths)
- (beg (point)) ; Beginning of current field.
+ (col (current-column))
x)
(while (not (eolp))
(csv-end-of-field)
- (setq x (- (point) beg)) ; Field width.
+ (setq x (- (current-column) col)) ; Field width.
(if w
(if (> x (car w)) (setcar w x))
(setq w (list x)
widths (nconc widths w)))
(or (eolp) (forward-char)) ; Skip separator.
- (setq w (cdr w)
- beg (point)))))
+ (setq w (cdr w) col (current-column)))))
(forward-line))
widths))
@@ -1021,8 +1020,8 @@ If there is no selected region, default to the whole
buffer."
(align-padding (if (bolp) 0 csv-align-padding))
(left-padding 0) (right-padding 0)
(field-width
- ;; FIXME: Don't assume length=string-width!
- (progn (csv-end-of-field) (- (point) beg)))
+ (- (- (current-column)
+ (progn (csv-end-of-field) (current-column)))))
(column-width (pop w))
(x (- column-width field-width))) ; Required padding.
(set-marker end (point)) ; End of current field.
- [elpa] branch externals/csv-mode created (now cbc9682), Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 0192416 05/34: Commentary fix for quarter-plane.el., Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode b678d22 06/34: * csv-mode.el: Use lexical-binding. Remove redundant :group args., Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 5b659a0 04/34: Commentary tweaks for csv-mode, ioccur, and nhexl-mode packages., Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 3af03bd 07/34: * csv-mode.el: Bump version number., Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode c1989f3 01/34: Add csv-mode.el., Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode a3131af 03/34: csv-mode.el: Improve commentary., Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 797c322 13/34: Fix column width calculation in cvs-mode.el,
Stefan Monnier <=
- [elpa] externals/csv-mode 1aaa593 16/34: Fix csv-mode to delete its own overlays only, Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 935deaf 10/34: * csv-mode (csv-mode-line-help-echo): Remove., Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode f9df7cc 12/34: * csv-mode/cvs-mode.el (csv-set-comment-start): Handle nil., Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 4b9b587 26/34: * packages/csv-mode/csv-mode.el: Fix incorrect truncation, Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 60e3253 02/34: * packages/csv-mode/csv-mode.el: Minor installation cleanups., Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 046da98 11/34: (csv-mode): Set mode-line-position rather than mode-line-format., Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 96f331b 08/34: * packages/csv-mode/csv-mode.el (csv-end-of-field): Don't skip TABs., Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 8c5ea6a 14/34: * csv-mode, landmark: Fix maintainer's email, Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 08ee1af 09/34: * csv-mode.el (csv-kill-one-field): Check for presence before deleting trailing, Stefan Monnier, 2020/11/29
- [elpa] externals/csv-mode 7e5e6bd 29/34: * packages/csv-mode/csv-mode.el (csv-align--cursor-truncated): Fix C-e case, Stefan Monnier, 2020/11/29