Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2021-04-26 21:52:25 +02:00
commit 29d4cc1802
1 changed files with 3 additions and 2 deletions

View File

@ -461,13 +461,14 @@ This may be useful when columns have been shrunk."
(when pos (goto-char pos))
(goto-char (line-beginning-position))
(let ((end (line-end-position)) str)
(backward-char)
(while (progn (forward-char 1) (< (point) end))
(let ((ov (car (overlays-at (point)))))
(if (not ov)
(push (char-to-string (char-after)) str)
(push (overlay-get ov 'display) str)
(goto-char (1- (overlay-end ov))))))
(format "|%s" (mapconcat #'identity (reverse str) "")))))
(format "%s" (mapconcat #'identity (reverse str) "")))))
(defvar-local org-table-header-overlay nil)
(defun org-table-header-set-header ()
@ -483,7 +484,7 @@ This may be useful when columns have been shrunk."
(while (or (org-at-table-hline-p)
(looking-at-p ".*|\\s-+<[rcl]?\\([0-9]+\\)?>"))
(move-beginning-of-line 2))
(point)))
(line-beginning-position)))
(end (save-excursion (goto-char beg) (point-at-eol))))
(if (pos-visible-in-window-p beg)
(when (overlayp org-table-header-overlay)