branch: elpa/org-drill
commit 3c356dfc5a0f99d022f4bd9c6f3a2c93863c0529
Author: Phillip Lord <[email protected]>
Commit: Phillip Lord <[email protected]>
Fix robot testing and reference to drill-typed-answer
---
org-drill.el | 11 +++--------
robot/all-card-run.sh | 1 -
robot/robot.el | 2 ++
robot/robot.sh | 2 +-
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/org-drill.el b/org-drill.el
index b4f446a788..1f50d4de30 100644
--- a/org-drill.el
+++ b/org-drill.el
@@ -77,7 +77,7 @@ by `org-drill'."
(defcustom org-drill-maximum-items-per-session
30
- "Each drill session will present at most this many topics for review.
+ "Eaqch drill session will present at most this many topics for review.
Nil means unlimited."
:group 'org-drill
:type '(choice integer (const nil)))
@@ -1798,15 +1798,12 @@ Consider reformulating the item to make it easier to
remember.\n"
(defun org-drill-presentation-prompt-in-buffer (session)
(let* ((item-start-time (current-time))
- (input nil)
- (ch nil)
- (last-second 0)
(prompt
(format (concat "Type answer then return, "
"C-c e=edit, C-c t=tags, C-c s=skip, C-c q=quit.")))
(full-prompt
(org-drill--make-minibuffer-prompt session prompt)))
- (setf (oref session drill-typed-answer) nil)
+ (setf (oref session drill-answer) nil)
(if (and (eql 'warn org-drill-leech-method)
(org-drill-entry-leech-p))
(setq full-prompt (concat
@@ -1858,7 +1855,7 @@ You seem to be having a lot of trouble memorising this
item.
Consider reformulating the item to make it easier to remember.\n"
'face '(:foreground "red"))
full-prompt)))
- (setf (oref session drill-typed-answer)
+ (setf (oref session drill-answer)
(read-string full-prompt nil nil nil t))))
@@ -3098,14 +3095,12 @@ subtree at point."
(interactive)
(org-drill 'tree))
-
(defun org-drill-directory ()
"Run an interactive drill session using drill items from all org
files in the same directory as the current file."
(interactive)
(org-drill 'directory))
-
(defun org-drill-again (&optional scope drill-match)
"Run a new drill session, but try to use leftover due items that
were not reviewed during the last session, rather than scanning for
diff --git a/robot/all-card-run.sh b/robot/all-card-run.sh
index 059f7d4a79..25d560d912 100755
--- a/robot/all-card-run.sh
+++ b/robot/all-card-run.sh
@@ -36,6 +36,5 @@ launch_emacs $this_dir/all-card-run.el $card_no
## Run once with default options
run_drill
-
wait_emacs
} || cat robot/failure.txt
diff --git a/robot/robot.el b/robot/robot.el
index a9813d975a..ef1f4c2af6 100644
--- a/robot/robot.el
+++ b/robot/robot.el
@@ -48,6 +48,8 @@
(defun robot-dump ()
(dump-buffer "*Backtrace*" "failure.txt")
(dump-buffer "*Messages*" "messages.txt")
+ (princ "Killing Emacs after error\n"
+ 'external-debugging-output)
(kill-emacs -1))
(defun robot-dump-messages ()
diff --git a/robot/robot.sh b/robot/robot.sh
index f901b6770d..12ac79e401 100644
--- a/robot/robot.sh
+++ b/robot/robot.sh
@@ -65,7 +65,7 @@ function retn {
}
function wait_emacs {
- wait $emacs_process_pid
+ wait $emacs_process_pid || exit 1
}
function find_bot {
