update packages
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
;;; org-expiry.el --- expiry mechanism for Org entries
|
||||
;;; org-expiry.el --- expiry mechanism for Org entries -*- lexical-binding: t; -*-
|
||||
;;
|
||||
;; Copyright 2007-2021 Free Software Foundation, Inc.
|
||||
;;
|
||||
@@ -75,6 +75,8 @@
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'org)
|
||||
|
||||
;;; User variables:
|
||||
|
||||
(defgroup org-expiry nil
|
||||
@@ -157,15 +159,15 @@ functions. `org-expiry-deinsinuate' will deactivate them."
|
||||
|
||||
;;; Advices and insinuation:
|
||||
|
||||
(defadvice org-schedule (after org-schedule-update-created)
|
||||
(define-advice org-schedule (:after (&rest _) org-schedule-update-created)
|
||||
"Update the creation-date property when calling `org-schedule'."
|
||||
(org-expiry-insert-created))
|
||||
|
||||
(defadvice org-deadline (after org-deadline-update-created)
|
||||
(define-advice org-deadline (:after (&rest _) org-deadline-update-created)
|
||||
"Update the creation-date property when calling `org-deadline'."
|
||||
(org-expiry-insert-created))
|
||||
|
||||
(defadvice org-time-stamp (after org-time-stamp-update-created)
|
||||
(define-advice org-time-stamp (:after (&rest _) org-time-stamp-update-created)
|
||||
"Update the creation-date property when calling `org-time-stamp'."
|
||||
(org-expiry-insert-created))
|
||||
|
||||
@@ -195,9 +197,9 @@ restart `org-mode' if necessary."
|
||||
If ARG, also remove org-expiry hook in Org's `before-save-hook'
|
||||
and restart `org-mode' if necessary."
|
||||
(interactive "P")
|
||||
(ad-deactivate 'org-schedule)
|
||||
(ad-deactivate 'org-time-stamp)
|
||||
(ad-deactivate 'org-deadline)
|
||||
(advice-remove 'org-schedule #'org-schedule@org-schedule-update-created)
|
||||
(advice-remove 'org-time-stamp #'org-time-stamp@org-time-stamp-update-created)
|
||||
(advice-remove 'org-deadline #'org-deadline@org-deadline-update-created)
|
||||
(remove-hook 'org-insert-heading-hook 'org-expiry-insert-created)
|
||||
(remove-hook 'org-after-todo-state-change-hook 'org-expiry-insert-created)
|
||||
(remove-hook 'org-after-tags-change-hook 'org-expiry-insert-created)
|
||||
@@ -240,7 +242,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 (called-interactively-p) (org-reveal))
|
||||
(when (called-interactively-p 'interactive) (org-reveal))
|
||||
(when (org-expiry-expired-p)
|
||||
(org-back-to-heading)
|
||||
(looking-at org-complex-heading-regexp)
|
||||
@@ -251,13 +253,13 @@ Otherwise rely on `org-expiry-confirm-flag' to decide."
|
||||
(if (or force
|
||||
(null org-expiry-confirm-flag)
|
||||
(and (eq org-expiry-confirm-flag 'interactive)
|
||||
(not (interactive)))
|
||||
(not (called-interactively-p '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)
|
||||
(defun org-expiry-process-entries (_ _)
|
||||
"Process all expired entries between BEG and END.
|
||||
The expiry process will run the function defined by
|
||||
`org-expiry-handler-functions'."
|
||||
@@ -319,7 +321,7 @@ With one `C-u' prefix, don't prompt interactively for the date
|
||||
and insert today's date."
|
||||
(interactive "P")
|
||||
(let* ((d (org-entry-get (point) org-expiry-expiry-property-name))
|
||||
d-time d-hour)
|
||||
d-time d-hour timestr)
|
||||
(setq d-time (if d (org-time-string-to-time d)
|
||||
(current-time)))
|
||||
(setq d-hour (format-time-string "%H:%M" d-time))
|
||||
|
||||
Reference in New Issue
Block a user