[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/org-drill 113c5339f9 075/251: Deal with removal of 'org-me
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/org-drill 113c5339f9 075/251: Deal with removal of 'org-meta-data-and-drawers' function from Org development version. |
Date: |
Mon, 17 Jan 2022 18:59:02 -0500 (EST) |
branch: elpa/org-drill
commit 113c5339f9b976c6348429317cafdfec251fbb5b
Author: Paul Sexton <eeeickythump@gmail.com>
Commit: Paul Sexton <eeeickythump@gmail.com>
Deal with removal of 'org-meta-data-and-drawers' function from Org
development version.
Make item 'lapsing' optional and off by default.
---
org-drill.el | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/org-drill.el b/org-drill.el
index b2b47ee306..81012e1d1b 100755
--- a/org-drill.el
+++ b/org-drill.el
@@ -2,7 +2,7 @@
;;; org-drill.el - Self-testing using spaced repetition
;;;
;;; Author: Paul Sexton <eeeickythump@gmail.com>
-;;; Version: 2.4.4
+;;; Version: 2.4.5
;;; Repository at http://bitbucket.org/eeeickythump/org-drill/
;;;
;;;
@@ -512,6 +512,11 @@ for review unless they were already reviewed in the recent
past?")
'("LEARN_DATA" "DRILL_LAST_INTERVAL" "DRILL_REPEATS_SINCE_FAIL"
"DRILL_TOTAL_REPEATS" "DRILL_FAILURE_COUNT" "DRILL_AVERAGE_QUALITY"
"DRILL_EASE" "DRILL_LAST_QUALITY" "DRILL_LAST_REVIEWED"))
+(defvar org-drill--lapse-very-overdue-entries-p nil
+ "If non-nil, entries more than 90 days overdue are regarded as 'lapsed'.
+This means that when the item is eventually re-tested it will be
+treated as 'failed' (quality 2) for rescheduling purposes,
+regardless of whether the test was successful.")
;;; Make the above settings safe as file-local variables.
@@ -1198,8 +1203,8 @@ See the documentation for `org-drill-get-item-data' for a
description of these."
"If DAYS-AHEAD is supplied it must be a positive integer. The
item will be scheduled exactly this many days into the future."
(let ((delta-days (- (time-to-days (current-time))
- (time-to-days (or (org-get-scheduled-time (point))
- (current-time)))))
+ (time-to-days (or (org-get-scheduled-time (point))
+ (current-time)))))
(ofmatrix org-drill-optimal-factor-matrix)
;; Entries can have weights, 1 by default. Intervals are divided by the
;; item's weight, so an item with a weight of 2 will have all intervals
@@ -1708,7 +1713,9 @@ Note: does not actually alter the item."
(org-back-to-heading t)
(let ((lim (save-excursion
(outline-next-heading) (point))))
- (org-end-of-meta-data-and-drawers)
+ (if (fboundp 'org-end-of-meta-data-and-drawers)
+ (org-end-of-meta-data-and-drawers) ; function removed Feb 2015
+ (org-end-of-meta-data t))
(or (>= (point) lim)
(null (re-search-forward "[[:graph:]]" lim t))))))
@@ -2402,14 +2409,13 @@ all the markers used by Org-Drill will be freed."
;;; where POS is a marker pointing to the start of the entry, and
;;; DUE is a number indicating how many days ago the entry was due.
;;; AGE is the number of days elapsed since item creation (nil if unknown).
-;;; if age > 60, sort by age (oldest first)
-;;; if age < 60, sort by due (biggest first)
+;;; if age > lapse threshold (default 90), sort by age (oldest first)
+;;; if age < lapse threshold, sort by due (biggest first)
-;;; if (age a) <= 60 and (age b) <= 60, sort by due
-;;; else sort by age
(defun org-drill-order-overdue-entries (overdue-data)
- (let* ((lapsed-days 60)
+ (let* ((lapsed-days (if org-drill--lapse-very-overdue-entries-p
+ 90 most-positive-fixnum))
(not-lapsed (remove-if (lambda (a) (> (or (second a) 0) lapsed-days))
overdue-data))
(lapsed (remove-if-not (lambda (a) (> (or (second a) 0)
@@ -2424,8 +2430,9 @@ all the markers used by Org-Drill will be freed."
(defun org-drill--entry-lapsed-p ()
- (let ((lapsed-days 60))
- (> (or (org-drill-entry-days-overdue) 0) lapsed-days)))
+ (let ((lapsed-days 90))
+ (and org-drill--lapse-very-overdue-entries-p
+ (> (or (org-drill-entry-days-overdue) 0) lapsed-days))))
- [nongnu] elpa/org-drill d9488f0f65 031/251: Added tag 2.2 for changeset d9430f6647c9, (continued)
- [nongnu] elpa/org-drill d9488f0f65 031/251: Added tag 2.2 for changeset d9430f6647c9, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill f7e2975556 034/251: - Speed up stripping scheduling data if scope is the current buffer (default)., ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 0eca79a796 036/251: Tiny fix to org-drill-map-entries., ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 65e1290023 038/251: New file-safe user variable: org-drill-scope. Allows customisation of the scope of drill sessions, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 396b3078b7 070/251: Added tag 2.4.2 for changeset 648125435aad, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 6be323d033 055/251: Entries in 'org-drill-card-type-alist' can now take a fourth argument, 'drill-empty-p' (boolean). If true, items of this type are not skipped if their bodies are empty., ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 224a959b26 064/251: Added tag 2.4.0 for changeset 37dd8ae06ded, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 42e9bf3230 078/251: Added tag 2.4.6 for changeset e7bb422d8cb1, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 8e6bf15ac8 066/251: Fix the defcustom definitions and provide :tag property for choices, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill c67928667e 072/251: Added tag 2.4.3 for changeset c289780f11d7, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 113c5339f9 075/251: Deal with removal of 'org-meta-data-and-drawers' function from Org development version.,
ELPA Syncer <=
- [nongnu] elpa/org-drill e04ae39758 096/251: Remove obsolete dependency on org-learn., ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill db7a9c7746 088/251: Added new variable 'org-drill-item-count-includes-failed-items-p'. Default is, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 4f8543a95e 097/251: Added tag 2.5.1 for changeset 7a8df02a7ffc, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill cda03224dc 098/251: Added new card type, "simpletyped". Instead of just pressing space to reveal, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 738b956a16 099/251: Updated version number in header., ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 9c86731452 086/251: During drills, pressing keys for quit, edit and skip now works again., ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill fa03aa7696 087/251: Added tag 2.4.8 for changeset 080a526cc34a, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill a9d3447041 101/251: Reinstated dependency on 'org-learn' library., ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill 562baba885 102/251: Added tag 2.6.1 for changeset 586920548547, ELPA Syncer, 2022/01/17
- [nongnu] elpa/org-drill d9ffa4b91f 104/251: Add support for typing in buffer input, ELPA Syncer, 2022/01/17