diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2020-05-12 22:47:05 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2020-05-12 22:47:05 -0400 |
| commit | 4349402f3ff0921b4c47e1c91fc73ddadc0b4d03 (patch) | |
| tree | 9059cd1934d6bfdff4b3411aef6cf4ac770409b6 | |
| parent | 1228b73313063de3f8aa3647e508be6ab06a6eea (diff) | |
| parent | 7684b59c78cbd6d1deb92f94bb96fc18c1eeb95a (diff) | |
| download | org-mode-4349402f3ff0921b4c47e1c91fc73ddadc0b4d03.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | doc/org-manual.org | 4 | ||||
| -rw-r--r-- | lisp/org-colview.el | 2 | ||||
| -rw-r--r-- | testing/lisp/test-org-colview.el | 19 |
3 files changed, 22 insertions, 3 deletions
diff --git a/doc/org-manual.org b/doc/org-manual.org index 57b1564..3905da1 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -5211,11 +5211,11 @@ not be used as keys in the properties drawer: | | ~org-clock-sum-today~ must be run first to compute the | | | values in the current buffer. | | =CLOSED= | When was this entry closed? | -| =DEADLINE= | The deadline time string, without the angular brackets. | +| =DEADLINE= | The deadline timestamp. | | =FILE= | The filename the entry is located in. | | =ITEM= | The headline of the entry. | | =PRIORITY= | The priority of the entry, a string with a single letter. | -| =SCHEDULED= | The scheduling timestamp, without the angular brackets. | +| =SCHEDULED= | The scheduling timestamp. | | =TAGS= | The tags defined directly in the headline. | | =TIMESTAMP= | The first keyword-less timestamp in the entry. | | =TIMESTAMP_IA= | The first inactive timestamp in the entry. | diff --git a/lisp/org-colview.el b/lisp/org-colview.el index f1768f5..e50a4d7 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -259,6 +259,8 @@ value for ITEM property." (if org-hide-leading-stars ?\s ?*)) "* ")))) (concat stars (org-link-display-format value)))) + (`(,(or "DEADLINE" "SCHEDULED" "TIMESTAMP") . ,_) + (replace-regexp-in-string org-ts-regexp "[\\1]" value)) (`(,_ ,_ ,_ ,_ nil) value) ;; If PRINTF is set, assume we are displaying a number and ;; obey to the format string. diff --git a/testing/lisp/test-org-colview.el b/testing/lisp/test-org-colview.el index ed75090..7612074 100644 --- a/testing/lisp/test-org-colview.el +++ b/testing/lisp/test-org-colview.el @@ -1519,7 +1519,24 @@ (org-test-with-temp-text "* H src_emacs-lisp{(+ 1 1)} 1\n<point>#+BEGIN: columnview\n#+END:" (let ((org-columns-default-format "%ITEM")) (org-update-dblock)) - (buffer-substring-no-properties (point) (point-max)))))) + (buffer-substring-no-properties (point) (point-max))))) + ;; Active time stamps are displayed as inactive. + (should + (equal + "#+BEGIN: columnview +| ITEM | d | s | t | +|------+------------------+------------------+------------------| +| H | [2020-05-14 Thu] | [2020-05-11 Mon] | [2020-06-10 Wed] | +#+END:" + (org-test-with-temp-text + "* H +SCHEDULED: <2020-05-11 Mon> DEADLINE: <2020-05-14 Thu> +<2020-06-10 Wed> +<point>#+BEGIN: columnview\n#+END:" + (let ((org-columns-default-format + "%ITEM %DEADLINE(d) %SCHEDULED(s) %TIMESTAMP(t)")) + (org-update-dblock)) + (buffer-substring-no-properties (point) (point-max)))))) (provide 'test-org-colview) ;;; test-org-colview.el ends here |