Browse Source

Merge branch 'maint'

Nicolas Goaziou 2 years ago
parent
commit
4b2006db3d
2 changed files with 1 additions and 7 deletions
  1. 1 1
      lisp/org-clock.el
  2. 0 6
      lisp/org-compat.el

+ 1 - 1
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)))

+ 0 - 6
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."