summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2009-02-10 10:10:44 +0100
committerCarsten Dominik <carsten.dominik@gmail.com>2009-02-10 10:10:44 +0100
commit6296225ac6503c36504520fee297ca98d7e32bd6 (patch)
treea84908b07fec5f5e3bf69069fc47ed2b2797f1df
parent1ece4e1bcbdb66a0a62274bab77f9f8c09aa59a4 (diff)
downloadorg-mode-6296225ac6503c36504520fee297ca98d7e32bd6.tar.gz
Fix a bug in org-choose.el
-rw-r--r--contrib/ChangeLog6
-rw-r--r--contrib/lisp/org-choose.el7
2 files changed, 10 insertions, 3 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index da6b4dc..884ce42 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-10 Carsten Dominik <carsten.dominik@gmail.com>
+
+ * lisp/org-choose.el (org-choose-get-fn-map-group): Call
+ `org-up-heading-all' instead of `outline-up-heading-all', which
+ does not exist.
+
2009-02-04 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-depend.el (org-depend-act-on-sibling): New macro.
diff --git a/contrib/lisp/org-choose.el b/contrib/lisp/org-choose.el
index 964561e..bee8ef6 100644
--- a/contrib/lisp/org-choose.el
+++ b/contrib/lisp/org-choose.el
@@ -386,9 +386,10 @@ setting was changed."
#'(lambda (fn)
(save-excursion
- (outline-up-heading-all 1)
- (save-restriction
- (org-map-entries fn nil 'tree)))))
+ (unless (org-up-heading-safe)
+ (error "Chosing is only supported between siblings in a tree, not on top level"))
+ (save-restriction
+ (org-map-entries fn nil 'tree)))))
;;;_ . org-choose-get-highest-mark-index