0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-24 23:32:52 +00:00

* org.el (org-duration-string-to-minutes): Don't use `rx-to-string'.

This commit is contained in:
Bastien Guerry 2011-03-06 18:45:03 +01:00
parent 75a1b98cfb
commit 6a0de0dc7b

View file

@ -15553,12 +15553,10 @@ customizing `org-effort-durations' (which see).
Entries containing a colon are interpreted as H:MM by
`org-hh:mm-string-to-minutes'."
(let ((result 0)
(regex (rx-to-string (group (1+ (any "0-9")))
(0+ (syntax whitespace))
(group
(eval (cons 'or
(mapcar 'car org-effort-durations)))))))
(while (string-match regex s)
(re (concat "\\([0-9]+\\) *\\("
(regexp-opt (mapcar 'car org-effort-durations))
"\\)")))
(while (string-match re s)
(incf result (* (cdr (assoc (match-string 2 s) org-effort-durations))
(string-to-number (match-string 1 s))))
(setq s (replace-match "" nil t s)))