diff options
author | Nicolas Goaziou <n.goaziou@gmail.com> | 2014-04-23 22:04:20 +0200 |
---|---|---|
committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2014-04-23 22:04:20 +0200 |
commit | 36b497720d85af627f93cc4eb68ac9bed4a8e3f8 (patch) | |
tree | a1687cab55b8c8d3d52ee545491cccb446f54447 | |
parent | 4c40dc65d0a5b048d40b1d48fd23089a19db7f70 (diff) | |
parent | 94ae862515dd00b56959b4385b3c1eda8cb754d6 (diff) | |
download | org-mode-36b497720d85af627f93cc4eb68ac9bed4a8e3f8.tar.gz |
Merge branch 'maint'
Conflicts:
lisp/org-element.el
-rw-r--r-- | lisp/org-element.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el index d2f169c..d02f907 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -3332,8 +3332,8 @@ cdr a plist with `:type', `:raw-value', `:year-start', `:year-end', `:month-end', `:day-end', `:hour-end', `:minute-end', `:repeater-type', `:repeater-value', `:repeater-unit', `:warning-type', `:warning-value', -`:warning-unit', `:begin', `:end', `:value' and `:post-blank' -keywords. Otherwise, return nil. +`:warning-unit', `:begin', `:end' and `:post-blank' keywords. +Otherwise, return nil. Assume point is at the beginning of the timestamp." (when (org-looking-at-p org-element--timestamp-regexp) |