[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/valign 7529ddd 111/198: Revert "* valign.el (valign-tab
From: |
Stefan Monnier |
Subject: |
[elpa] externals/valign 7529ddd 111/198: Revert "* valign.el (valign-table): Tuck in some long lines." |
Date: |
Tue, 1 Dec 2020 18:19:28 -0500 (EST) |
branch: externals/valign
commit 7529dddb0d88007386c89d2bd8eb1643ddad58d5
Author: Yuan Fu <casouri@gmail.com>
Commit: Yuan Fu <casouri@gmail.com>
Revert "* valign.el (valign-table): Tuck in some long lines."
This reverts commit ba7a72beb7ac140bd1ee0c95115b754db43b9423.
---
valign.el | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/valign.el b/valign.el
index 783da96..12fbad8 100644
--- a/valign.el
+++ b/valign.el
@@ -514,13 +514,12 @@ You need to restart valign mode for this setting to take
effect."
(signal 'valign-not-gui nil))
(let (end column-width-list column-idx pos ssw bar-width
separator-row-point-list rev-list
- column-alignment-list info at-sep-row
- right-bar-pos)
+ column-alignment-list info at-sep-row right-bar-pos)
;; ‘separator-row-point-list’ marks the point for each
;; separator-row, so we can later come back and align them.
- ;; ‘rev-list’ is the reverse list of right positions of
- ;; each separator row cell. ‘at-sep-row’ t means we
- ;; are at a separator row.
+ ;; ‘rev-list’ is the reverse list of right positions of each
+ ;; separator row cell. ‘at-sep-row’ t means we are at
+ ;; a separator row.
(if (not (valign--at-table-p))
(signal 'valign-not-on-table nil))
(valign--end-of-table)
@@ -552,10 +551,9 @@ You need to restart valign mode for this setting to take
effect."
;; single-space-width
(unless ssw (setq ssw (valign--pixel-width-from-to
(point) (1+ (point)))))
- (unless bar-width
- (setq bar-width
- (valign--pixel-width-from-to
- (1- (point)) (point))))
+ (unless bar-width (setq bar-width
+ (valign--pixel-width-from-to
+ (1- (point)) (point))))
;; Initialize some numbers when we are at a new
;; line. ‘pos’ is the pixel position of the
;; current point, i.e., after the left bar.
@@ -566,8 +564,7 @@ You need to restart valign mode for this setting to take
effect."
(valign--maybe-render-bar (1- (point)))
(unless (valign--separator-p)
(setq rev-list nil))
- (setq at-sep-row
- (if (valign--separator-p) t nil))
+ (setq at-sep-row (if (valign--separator-p) t nil))
(setq pos (valign--pixel-width-from-to
(line-beginning-position) (point))))
;; Align cell.
@@ -577,8 +574,7 @@ You need to restart valign mode for this setting to take
effect."
(valign--skip-space-forward)
(if (< (- (point) tab-start) 2)
(valign--put-text-property
- tab-start (point)
- (+ pos col-width ssw))
+ tab-start (point) (+ pos col-width ssw))
;; When possible, we try to add two tabs
;; and the point can appear in the middle
;; of the cell, instead of on the very
@@ -590,15 +586,13 @@ You need to restart valign mode for this setting to take
effect."
(valign--put-text-property
(1+ tab-start) (point)
(+ pos col-width ssw))))
- ;; 2) Separator row. We don’t align the
- ;; separator row yet, but will come back to
- ;; it.
+ ;; 2) Separator row. We don’t align the separator
+ ;; row yet, but will come back to it.
((valign--separator-p) nil)
;; 3) Normal cell.
(t (pcase (valign--cell-alignment
(valign--guess-table-type)
- (nth column-idx
- column-alignment-list))
+ (nth column-idx column-alignment-list))
;; 3.1) Align a left-aligned cell.
('left (search-forward "|" nil t)
(backward-char)
@@ -624,8 +618,7 @@ You need to restart valign mode for this setting to take
effect."
valign-separator-row-style
(reverse rev-list)))))
- ((debug valign-bad-cell valign-not-gui valign-not-on-table)
- nil)))
+ ((debug valign-bad-cell valign-not-gui valign-not-on-table) nil)))
;;; Mode intergration
- [elpa] externals/valign 831c2a7 176/198: * valign.el (valign--do-row): Fix infinite loop., (continued)
- [elpa] externals/valign 831c2a7 176/198: * valign.el (valign--do-row): Fix infinite loop., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 7315f4b 148/198: Add support for org-indent, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 99300eb 167/198: Add support for table.el tables, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 7b581e0 072/198: Remove valign-werid-alignment error, Stefan Monnier, 2020/12/01
- [elpa] externals/valign f6d60d2 078/198: Merge two implementations for valign--align-separator-row, Stefan Monnier, 2020/12/01
- [elpa] externals/valign e9975b7 083/198: Use new text size calculation, Stefan Monnier, 2020/12/01
- [elpa] externals/valign e32d191 079/198: Valign-table refactor, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 21a397a 092/198: Update README, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 4ecc990 093/198: * valign.el (valign--table-face): Fix markdown-mode., Stefan Monnier, 2020/12/01
- [elpa] externals/valign c4ddfb3 095/198: Fix org-flag-region advice, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 7529ddd 111/198: Revert "* valign.el (valign-table): Tuck in some long lines.",
Stefan Monnier <=
- [elpa] externals/valign 97beef8 127/198: Remove valign-table-quiet, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 1412fef 133/198: * valign.el (valign-table): Suppress search errors., Stefan Monnier, 2020/12/01
- [elpa] externals/valign fc591d8 129/198: * valign.el (valign-table-1): Clear overlay before measuring table., Stefan Monnier, 2020/12/01
- [elpa] externals/valign c5eb220 108/198: Remove valign--face-attribute, Stefan Monnier, 2020/12/01
- [elpa] externals/valign ed8dd50 118/198: Remove obsolete functions, Stefan Monnier, 2020/12/01
- [elpa] externals/valign ced2f6a 132/198: * valign.el (valign-table-1): Fix search term., Stefan Monnier, 2020/12/01
- [elpa] externals/valign c70c64e 125/198: * valign.el (valign--clean-text-property): Remove code using 'text-property-search-forward'., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 645260f 076/198: * valign.el (valign-table): Allow edebug., Stefan Monnier, 2020/12/01
- [elpa] externals/valign 82566b3 080/198: Fix tab calculation, Stefan Monnier, 2020/12/01
- [elpa] externals/valign 6578fe4 081/198: * valign.el (valign-table): Don’t message errors., Stefan Monnier, 2020/12/01