diff options
| author | Rasmus <rasmus@gmx.us> | 2017-12-06 15:02:15 +0100 |
|---|---|---|
| committer | Rasmus <rasmus@gmx.us> | 2017-12-06 15:37:41 +0100 |
| commit | 445eefd238eb7c3843e18cd265c05f07233f8aff (patch) | |
| tree | 1b80ecda2301629cf8e1f0b2941e1f729952ca84 /lisp/org/org-colview.el | |
| parent | 5381c70b7a9d46fe4de205363b99f761e2475f1f (diff) | |
| download | emacs-445eefd238eb7c3843e18cd265c05f07233f8aff.tar.gz emacs-445eefd238eb7c3843e18cd265c05f07233f8aff.tar.bz2 emacs-445eefd238eb7c3843e18cd265c05f07233f8aff.zip | |
Backport: Update Org to v9.1.4
Please note this is a bugfix release. See etc/ORG-NEWS for details.
(cherry picked from commit 567b5efe1f338c10c574758fb968915c5c34c909)
Diffstat (limited to 'lisp/org/org-colview.el')
| -rw-r--r-- | lisp/org/org-colview.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el index eac29c50f65..649ca52c4f8 100644 --- a/lisp/org/org-colview.el +++ b/lisp/org/org-colview.el @@ -1070,7 +1070,7 @@ as a canonical duration, i.e., using units defined in (cond ((string-match-p org-ts-regexp s) (/ (- org-columns--time - (float-time (apply #'encode-time (org-parse-time-string s nil t)))) + (float-time (apply #'encode-time (org-parse-time-string s)))) 60)) ((org-duration-p s) (org-duration-to-minutes s t)) ;skip user units (t (user-error "Invalid age: %S" s)))) |