summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2011-05-26 09:18:36 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2011-05-26 09:18:36 +0200
commitc9d01a1cc98b1cfd30b2c8abd6d18809199f943d (patch)
tree58f29dae891b265313ea64eaea26a36e9283b9a8
parent9e5ab4053edd44c012b419b83482f334409a9fc6 (diff)
parentbd91803d0d1d88e94a059f28b5cccb7e969d0042 (diff)
downloadorg-mode-c9d01a1cc98b1cfd30b2c8abd6d18809199f943d.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--contrib/lisp/org-drill.el19
1 files changed, 17 insertions, 2 deletions
diff --git a/contrib/lisp/org-drill.el b/contrib/lisp/org-drill.el
index 7592f06..a6a42da 100644
--- a/contrib/lisp/org-drill.el
+++ b/contrib/lisp/org-drill.el
@@ -1655,7 +1655,6 @@ items if FORCE-SHOW-FIRST or FORCE-SHOW-LAST is non-nil)."
(defun org-drill-present-multicloze-hide-nth (to-hide)
"Hide the TO-HIDE'th piece of clozed text. 1 is the first piece. If
TO-HIDE is negative, count backwards, so -1 means the last item, -2
-CNT is negative, count backwards, so -1 means the last item, -2
the second to last, etc."
(with-hidden-comments
(with-hidden-cloze-hints
@@ -1681,7 +1680,6 @@ the second to last, etc."
(cond
((or (not (plusp match-count))
(> to-hide match-count))
- (and (minusp cnt) (> (abs cnt) match-count)))
nil)
(t
(save-excursion
@@ -1694,6 +1692,23 @@ the second to last, etc."
(incf cnt)
(if (= cnt to-hide)
(org-drill-hide-matched-cloze-text)))))))
+ (org-display-inline-images t)
+ (org-cycle-hide-drawers 'all)
+ (prog1 (org-drill-presentation-prompt)
+ (org-drill-hide-subheadings-if 'org-drill-entry-p)
+ (org-drill-unhide-clozed-text))))))
+
+
+(defun org-drill-present-multicloze-hide1 ()
+ "Hides one of the pieces of text that are marked for cloze deletion,
+chosen at random."
+ (org-drill-present-multicloze-hide-n 1))
+
+
+(defun org-drill-present-multicloze-hide2 ()
+ "Hides two of the pieces of text that are marked for cloze deletion,
+chosen at random."
+ (org-drill-present-multicloze-hide-n 2))
(defun org-drill-present-multicloze-hide-first ()