diff options
author | Bastien Guerry <bzg@altern.org> | 2013-02-05 00:11:08 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-02-05 00:11:08 +0100 |
commit | 3380460c69cac63821bcc43a5342f8470e859d3e (patch) | |
tree | 91a3d33a3e397b6070161038b800053befdfbfac | |
parent | 60b13f3dfe19e49f99a580db111112280b326095 (diff) | |
parent | f27e1e8e4d6ffd3f92287a4a9122e752238c1bb3 (diff) | |
download | org-mode-3380460c69cac63821bcc43a5342f8470e859d3e.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el index 310972b..e9353f6 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -16227,7 +16227,8 @@ If SECONDS is non-nil, return the difference in seconds." (floor (* (string-to-number (match-string 1 ts)) (cdr (assoc (match-string 2 ts) '(("d" . 1) ("w" . 7) - ("m" . 30.4) ("y" . 365.25))))))) + ("m" . 30.4) ("y" . 365.25) + ("h" . 0.041667))))))) ;; go for the default. (t org-deadline-warning-days))) |