diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-02-01 22:43:19 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-02-01 22:43:19 +0100 |
commit | 4b2006db3d040a8b9683cefcac1ec68b0d12a555 (patch) | |
tree | f3cb97a4d0468e39e1e2358f9d1d2cc4eab2907b | |
parent | e490d2766f77c79075998e97626a3eec31560909 (diff) | |
parent | e570e964a30bb8e719460ef27d919f8d3ab53104 (diff) | |
download | org-mode-4b2006db3d040a8b9683cefcac1ec68b0d12a555.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-clock.el | 2 | ||||
-rw-r--r-- | lisp/org-compat.el | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index aa59d82..0922c28 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1423,7 +1423,7 @@ The time is always returned as UTC." (current-time)) ((equal cmt "today") (setq org--msg-extra "showing today's task time.") - (let* ((dt (org-decode-time nil t)) + (let* ((dt (decode-time)) (hour (nth 2 dt)) (day (nth 3 dt))) (if (< hour org-extend-today-until) (setf (nth 3 dt) (1- day))) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 48de29a..2107de5 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -74,12 +74,6 @@ (defalias 'format-message 'format) (defalias 'gui-get-selection 'x-get-selection)) -(defun org-decode-time (&optional time zone) - "Backward-compatible function for `decode-time'." - (if (< emacs-major-version 25) - (decode-time time) - (decode-time time zone))) - (unless (fboundp 'directory-name-p) (defun directory-name-p (name) "Return non-nil if NAME ends with a directory separator character." |