aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2021-05-18 19:32:35 -0400
committerStefan Monnier2021-05-18 19:32:35 -0400
commitaf68b49565671821361d089ae9a68af32d760e2c (patch)
tree5f571a8563f3f22c203eca8c1e93f257d689033a
parent25bb250e292d8129db0e5bd9978c67aee05bccf5 (diff)
downloademacs-af68b49565671821361d089ae9a68af32d760e2c.tar.gz
emacs-af68b49565671821361d089ae9a68af32d760e2c.zip
* lisp/org/org-clock.el (org-clock-get-table-data): Use proper closures
Also, prefer #' to quote function names
-rw-r--r--lisp/org/org-clock.el26
1 files changed, 13 insertions, 13 deletions
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 251ad97cdec..1283970bc2b 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -539,8 +539,8 @@ of a different task.")
539 "Marker pointing to the task that has been interrupted by the current clock.") 539 "Marker pointing to the task that has been interrupted by the current clock.")
540 540
541(defvar org-clock-mode-line-map (make-sparse-keymap)) 541(defvar org-clock-mode-line-map (make-sparse-keymap))
542(define-key org-clock-mode-line-map [mode-line mouse-2] 'org-clock-goto) 542(define-key org-clock-mode-line-map [mode-line mouse-2] #'org-clock-goto)
543(define-key org-clock-mode-line-map [mode-line mouse-1] 'org-clock-menu) 543(define-key org-clock-mode-line-map [mode-line mouse-1] #'org-clock-menu)
544 544
545(defun org-clock--translate (s language) 545(defun org-clock--translate (s language)
546 "Translate string S into using string LANGUAGE. 546 "Translate string S into using string LANGUAGE.
@@ -1414,12 +1414,12 @@ the default behavior."
1414 (setq org-clock-mode-line-timer 1414 (setq org-clock-mode-line-timer
1415 (run-with-timer org-clock-update-period 1415 (run-with-timer org-clock-update-period
1416 org-clock-update-period 1416 org-clock-update-period
1417 'org-clock-update-mode-line))) 1417 #'org-clock-update-mode-line)))
1418 (when org-clock-idle-timer 1418 (when org-clock-idle-timer
1419 (cancel-timer org-clock-idle-timer) 1419 (cancel-timer org-clock-idle-timer)
1420 (setq org-clock-idle-timer nil)) 1420 (setq org-clock-idle-timer nil))
1421 (setq org-clock-idle-timer 1421 (setq org-clock-idle-timer
1422 (run-with-timer 60 60 'org-resolve-clocks-if-idle)) 1422 (run-with-timer 60 60 #'org-resolve-clocks-if-idle))
1423 (message "Clock starts at %s - %s" ts org--msg-extra) 1423 (message "Clock starts at %s - %s" ts org--msg-extra)
1424 (run-hooks 'org-clock-in-hook)))))) 1424 (run-hooks 'org-clock-in-hook))))))
1425 1425
@@ -1716,7 +1716,7 @@ to, overriding the existing value of `org-clock-out-switch-to-state'."
1716 (unless (org-clocking-p) 1716 (unless (org-clocking-p)
1717 (setq org-clock-current-task nil))))))) 1717 (setq org-clock-current-task nil)))))))
1718 1718
1719(add-hook 'org-clock-out-hook 'org-clock-remove-empty-clock-drawer) 1719(add-hook 'org-clock-out-hook #'org-clock-remove-empty-clock-drawer)
1720 1720
1721(defun org-clock-remove-empty-clock-drawer () 1721(defun org-clock-remove-empty-clock-drawer ()
1722 "Remove empty clock drawers in current subtree." 1722 "Remove empty clock drawers in current subtree."
@@ -2012,7 +2012,7 @@ Use `\\[org-clock-remove-overlays]' to remove the subtree times."
2012 (when time (org-clock-put-overlay time))))) 2012 (when time (org-clock-put-overlay time)))))
2013 ;; Arrange to remove the overlays upon next change. 2013 ;; Arrange to remove the overlays upon next change.
2014 (when org-remove-highlights-with-change 2014 (when org-remove-highlights-with-change
2015 (add-hook 'before-change-functions 'org-clock-remove-overlays 2015 (add-hook 'before-change-functions #'org-clock-remove-overlays
2016 nil 'local)))) 2016 nil 'local))))
2017 (let* ((h (/ org-clock-file-total-minutes 60)) 2017 (let* ((h (/ org-clock-file-total-minutes 60))
2018 (m (- org-clock-file-total-minutes (* 60 h)))) 2018 (m (- org-clock-file-total-minutes (* 60 h))))
@@ -2063,7 +2063,7 @@ If NOREMOVE is nil, remove this function from the
2063 (setq org-clock-overlays nil) 2063 (setq org-clock-overlays nil)
2064 (unless noremove 2064 (unless noremove
2065 (remove-hook 'before-change-functions 2065 (remove-hook 'before-change-functions
2066 'org-clock-remove-overlays 'local)))) 2066 #'org-clock-remove-overlays 'local))))
2067 2067
2068;;;###autoload 2068;;;###autoload
2069(defun org-clock-out-if-current () 2069(defun org-clock-out-if-current ()
@@ -2932,12 +2932,12 @@ PROPERTIES: The list properties specified in the `:properties' parameter
2932 (save-excursion 2932 (save-excursion
2933 (org-clock-sum ts te 2933 (org-clock-sum ts te
2934 (when matcher 2934 (when matcher
2935 `(lambda () 2935 (lambda ()
2936 (let* ((todo (org-get-todo-state)) 2936 (let* ((todo (org-get-todo-state))
2937 (tags-list (org-get-tags)) 2937 (tags-list (org-get-tags))
2938 (org-scanner-tags tags-list) 2938 (org-scanner-tags tags-list)
2939 (org-trust-scanner-tags t)) 2939 (org-trust-scanner-tags t))
2940 (funcall ,matcher todo tags-list nil))))) 2940 (funcall matcher todo tags-list nil)))))
2941 (goto-char (point-min)) 2941 (goto-char (point-min))
2942 (setq st t) 2942 (setq st t)
2943 (while (or (and (bobp) (prog1 st (setq st nil)) 2943 (while (or (and (bobp) (prog1 st (setq st nil))