ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-05-30 13:39:46 +02:00
parent 0cbb877217 444d2673bb
commit 496b2a9855
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/org-colview.el
View File

@ -781,6 +781,7 @@ view for the whole buffer unconditionally.
When COLUMNS-FMT-STRING is non-nil, use it as the column format." When COLUMNS-FMT-STRING is non-nil, use it as the column format."
(interactive "P") (interactive "P")
(org-columns-remove-overlays) (org-columns-remove-overlays)
(when global (goto-char (point-min)))
(move-marker org-columns-begin-marker (point)) (move-marker org-columns-begin-marker (point))
(org-columns-goto-top-level) (org-columns-goto-top-level)
;; Initialize `org-columns-current-fmt' and ;; Initialize `org-columns-current-fmt' and

7
testing/lisp/test-org-colview.el
View File

@ -104,9 +104,10 @@
(lambda () (get-char-property (point) 'org-columns-value)))))) (lambda () (get-char-property (point) 'org-columns-value))))))
(should (should
(equal (equal
'("H1" "H2" "H3" "H4") '("1" "1")
(org-test-with-temp-text "Top\n* H1\n** <point>H2\n*** H3\n* H4" (org-test-with-temp-text
(let ((org-columns-default-format "%ITEM")) (org-columns t)) "Top\n* H1\n** <point>H2\n:PROPERTIES:\n:A: 1\n:END:"
(let ((org-columns-default-format "%A{+}")) (org-columns t))
(org-map-entries (org-map-entries
(lambda () (get-char-property (point) 'org-columns-value))))))) (lambda () (get-char-property (point) 'org-columns-value)))))))