diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-05-30 13:39:46 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-05-30 13:39:46 +0200 |
commit | 496b2a9855fe514b186890a1f883411ee566d294 (patch) | |
tree | 71a1a766a1b10d3557176f36b748283ca7de5da3 | |
parent | 0cbb877217d98566a637d9bfecd910c505c10cfd (diff) | |
parent | 444d2673bb9b42e52b4e456bc1f57bb85425f388 (diff) | |
download | org-mode-496b2a9855fe514b186890a1f883411ee566d294.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-colview.el | 1 | ||||
-rw-r--r-- | testing/lisp/test-org-colview.el | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/org-colview.el b/lisp/org-colview.el index 844b5d3..0ff87b1 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -781,6 +781,7 @@ view for the whole buffer unconditionally. When COLUMNS-FMT-STRING is non-nil, use it as the column format." (interactive "P") (org-columns-remove-overlays) + (when global (goto-char (point-min))) (move-marker org-columns-begin-marker (point)) (org-columns-goto-top-level) ;; Initialize `org-columns-current-fmt' and diff --git a/testing/lisp/test-org-colview.el b/testing/lisp/test-org-colview.el index 35469ae..f816e7b 100644 --- a/testing/lisp/test-org-colview.el +++ b/testing/lisp/test-org-colview.el @@ -104,9 +104,10 @@ (lambda () (get-char-property (point) 'org-columns-value)))))) (should (equal - '("H1" "H2" "H3" "H4") - (org-test-with-temp-text "Top\n* H1\n** <point>H2\n*** H3\n* H4" - (let ((org-columns-default-format "%ITEM")) (org-columns t)) + '("1" "1") + (org-test-with-temp-text + "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 (lambda () (get-char-property (point) 'org-columns-value))))))) |