mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 20:07:46 +00:00
Merge branch 'maint'
This commit is contained in:
commit
613b480db4
|
@ -14502,13 +14502,14 @@ Returns the new tags string, or nil to not change the current settings."
|
||||||
((member tg inherited) i-face))))
|
((member tg inherited) i-face))))
|
||||||
(when (equal (caar tbl) :grouptags)
|
(when (equal (caar tbl) :grouptags)
|
||||||
(org-add-props tg nil 'face 'org-tag-group))
|
(org-add-props tg nil 'face 'org-tag-group))
|
||||||
(when (and (zerop cnt) (not ingroup) (not intaggroup)) (insert " "))
|
(when (and (zerop cnt) (not ingroup) (not intaggroup)) (insert " "))
|
||||||
(insert "[" c "] " tg (make-string
|
(insert "[" c "] " tg (make-string
|
||||||
(- fwidth 4 (length tg)) ?\ ))
|
(- fwidth 4 (length tg)) ?\ ))
|
||||||
(push (cons tg c) ntable)
|
(push (cons tg c) ntable)
|
||||||
(when (= (cl-incf cnt) ncol)
|
(when (= (cl-incf cnt) ncol)
|
||||||
(insert "\n")
|
(unless (memq (caar tbl) '(:endgroup :endgrouptag))
|
||||||
(when (or ingroup intaggroup) (insert " "))
|
(insert "\n")
|
||||||
|
(when (or ingroup intaggroup) (insert " ")))
|
||||||
(setq cnt 0)))))
|
(setq cnt 0)))))
|
||||||
(setq ntable (nreverse ntable))
|
(setq ntable (nreverse ntable))
|
||||||
(insert "\n")
|
(insert "\n")
|
||||||
|
|
Loading…
Reference in a new issue