Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-01-04 18:15:56 +01:00
commit 5c2dd988a5
1 changed files with 3 additions and 3 deletions

View File

@ -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