summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-04 17:15:56 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-04 17:15:56 (GMT)
commit5c2dd988a502f71a35b8bdcd77e03883fffc47a4 (patch)
treea9624fa1edfcd37caa7dabe9d58c9f693ace9a7d
parent576f43b7434301460a648436ed92d4a4c2b01f8b (diff)
parent6a0c650dd2c2ba9f922663750e066fb47e2b2111 (diff)
downloadorg-mode-5c2dd988a502f71a35b8bdcd77e03883fffc47a4.zip
org-mode-5c2dd988a502f71a35b8bdcd77e03883fffc47a4.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el
index b0fcb58..2ecf4ea 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -13246,9 +13246,9 @@ and by additional input from the age of a schedules or deadline entry."
(defun org-get-priority (s)
"Find priority cookie and return priority."
- (if (functionp org-get-priority-function)
- (funcall org-get-priority-function)
- (save-match-data
+ (save-match-data
+ (if (functionp org-get-priority-function)
+ (funcall org-get-priority-function)
(if (not (string-match org-priority-regexp s))
(* 1000 (- org-lowest-priority org-default-priority))
(* 1000 (- org-lowest-priority