diff options
| author | Sébastien Delafond <sdelafond@gmail.com> | 2016-11-07 10:41:54 +0100 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2016-11-07 10:41:54 +0100 |
| commit | 1a7cd65ca362047cd97d4127d49108994baebc6c (patch) | |
| tree | f18735f3b77120ef2e91043f2f662b03e47ccbb0 /contrib/lisp/org-expiry.el | |
| parent | 55074078ca876273e3fa58ee6838cba90d2b6100 (diff) | |
| parent | ec84430cf4e09ba25ec675debdf802bc28111e06 (diff) | |
Merge tag 'upstream/9.0'
Upstream version 9.0
Diffstat (limited to 'contrib/lisp/org-expiry.el')
| -rw-r--r-- | contrib/lisp/org-expiry.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/lisp/org-expiry.el b/contrib/lisp/org-expiry.el index 396f016..45f59a2 100644 --- a/contrib/lisp/org-expiry.el +++ b/contrib/lisp/org-expiry.el @@ -186,7 +186,7 @@ restart `org-mode' if necessary." ;; need this to refresh org-mode hooks (when (eq major-mode 'org-mode) (org-mode) - (if (org-called-interactively-p) + (if (called-interactively-p 'any) (message "Org-expiry insinuated, `org-mode' restarted."))))) (defun org-expiry-deinsinuate (&optional arg) @@ -207,7 +207,7 @@ and restart `org-mode' if necessary." ;; need this to refresh org-mode hooks (when (eq major-mode 'org-mode) (org-mode) - (if (org-called-interactively-p) + (if (called-interactively-p 'any) (message "Org-expiry de-insinuated, `org-mode' restarted."))))) ;;; org-expiry-expired-p: @@ -239,7 +239,7 @@ If FORCE is non-nil, don't require confirmation from the user. Otherwise rely on `org-expiry-confirm-flag' to decide." (interactive "P") (save-excursion - (when (org-called-interactively-p) (org-reveal)) + (when (called-interactively-p) (org-reveal)) (when (org-expiry-expired-p) (org-back-to-heading) (looking-at org-complex-heading-regexp) @@ -253,7 +253,7 @@ Otherwise rely on `org-expiry-confirm-flag' to decide." (not (interactive))) (and org-expiry-confirm-flag (y-or-n-p (format "Entry expired by %d days. Process? " d)))) - (funcall 'org-expiry-handler-function)) + (funcall org-expiry-handler-function)) (delete-overlay ov))))) (defun org-expiry-process-entries (beg end) @@ -271,7 +271,7 @@ The expiry process will run the function defined by (while (and (outline-next-heading) (< (point) end)) (when (org-expiry-expired-p) (setq expired (1+ expired)) - (if (if (org-called-interactively-p) + (if (if (called-interactively-p 'any) (call-interactively 'org-expiry-process-entry) (org-expiry-process-entry)) (setq processed (1+ processed))))) @@ -339,7 +339,7 @@ and insert today's date." (save-excursion (if (org-expiry-expired-p) (org-archive-subtree) - (if (org-called-interactively-p) + (if (called-interactively-p 'any) (message "Entry at point is not expired."))))) (defun org-expiry-add-keyword (&optional keyword) @@ -350,7 +350,7 @@ and insert today's date." (save-excursion (if (org-expiry-expired-p) (org-todo keyword) - (if (org-called-interactively-p) + (if (called-interactively-p 'any) (message "Entry at point is not expired.")))) (error "\"%s\" is not a to-do keyword in this buffer" keyword))) |