ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2012-09-09 14:14:54 +02:00
parent 830a0781a6 f29131c3d2
commit 8e44533339
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/org-element.el
View File

@ -706,7 +706,7 @@ Assume point is at beginning of the headline."
(and todo (if (member todo org-done-keywords) 'done 'todo))) (and todo (if (member todo org-done-keywords) 'done 'todo)))
(tags (let ((raw-tags (nth 5 components))) (tags (let ((raw-tags (nth 5 components)))
(and raw-tags (org-split-string raw-tags ":")))) (and raw-tags (org-split-string raw-tags ":"))))
(raw-value (nth 4 components)) (raw-value (or (nth 4 components) ""))
(quotedp (quotedp
(let ((case-fold-search nil)) (let ((case-fold-search nil))
(string-match (format "^%s +" org-quote-string) raw-value))) (string-match (format "^%s +" org-quote-string) raw-value)))
@ -849,8 +849,9 @@ CONTENTS is the contents of the element."
Return a list whose CAR is `inlinetask' and CDR is a plist Return a list whose CAR is `inlinetask' and CDR is a plist
containing `:title', `:begin', `:end', `:hiddenp', containing `:title', `:begin', `:end', `:hiddenp',
`:contents-begin' and `:contents-end', `:level', `:priority', `:contents-begin' and `:contents-end', `:level', `:priority',
`:tags', `:todo-keyword', `:todo-type', `:scheduled', `:raw-value', `:tags', `:todo-keyword', `:todo-type',
`:deadline', `:timestamp', `:clock' and `:post-blank' keywords. `:scheduled', `:deadline', `:timestamp', `:clock' and
`:post-blank' keywords.
The plist also contains any property set in the property drawer, The plist also contains any property set in the property drawer,
with its name in lowercase, the underscores replaced with hyphens with its name in lowercase, the underscores replaced with hyphens
@ -870,6 +871,7 @@ Assume point is at beginning of the inline task."
(if (member todo org-done-keywords) 'done 'todo))) (if (member todo org-done-keywords) 'done 'todo)))
(tags (let ((raw-tags (nth 5 components))) (tags (let ((raw-tags (nth 5 components)))
(and raw-tags (org-split-string raw-tags ":")))) (and raw-tags (org-split-string raw-tags ":"))))
(raw-value (or (nth 4 components) ""))
;; Normalize property names: ":SOME_PROP:" becomes ;; Normalize property names: ":SOME_PROP:" becomes
;; ":some-prop". ;; ":some-prop".
(standard-props (let (plist) (standard-props (let (plist)
@ -906,7 +908,8 @@ Assume point is at beginning of the inline task."
(inlinetask (inlinetask
(list 'inlinetask (list 'inlinetask
(nconc (nconc
(list :begin begin (list :raw-value raw-value
:begin begin
:end end :end end
:hiddenp hidden :hiddenp hidden
:contents-begin contents-begin :contents-begin contents-begin
@ -925,9 +928,9 @@ Assume point is at beginning of the inline task."
(cadr keywords))))) (cadr keywords)))))
(org-element-put-property (org-element-put-property
inlinetask :title inlinetask :title
(if raw-secondary-p (nth 4 components) (if raw-secondary-p raw-value
(org-element-parse-secondary-string (org-element-parse-secondary-string
(nth 4 components) raw-value
(org-element-restriction 'inlinetask) (org-element-restriction 'inlinetask)
inlinetask)))))) inlinetask))))))

4
lisp/org.el
View File

@ -4824,7 +4824,7 @@ but the stars and the body are.")
(concat "^\\(\\*+\\)" (concat "^\\(\\*+\\)"
"\\(?: +" org-todo-regexp "\\)?" "\\(?: +" org-todo-regexp "\\)?"
"\\(?: +\\(\\[#.\\]\\)\\)?" "\\(?: +\\(\\[#.\\]\\)\\)?"
"\\(?: +\\(.*?\\)\\)?" "\\(?: +\\(.*?\\)\\)??"
(org-re "\\(?:[ \t]+\\(:[[:alnum:]_@#%:]+:\\)\\)?") (org-re "\\(?:[ \t]+\\(:[[:alnum:]_@#%:]+:\\)\\)?")
"[ \t]*$") "[ \t]*$")
org-complex-heading-regexp-format org-complex-heading-regexp-format
@ -4842,7 +4842,7 @@ but the stars and the body are.")
org-todo-line-tags-regexp org-todo-line-tags-regexp
(concat "^\\(\\*+\\)" (concat "^\\(\\*+\\)"
"\\(?: +" org-todo-regexp "\\)?" "\\(?: +" org-todo-regexp "\\)?"
"\\(?: +\\(.*?\\)\\)?" "\\(?: +\\(.*?\\)\\)??"
(org-re "\\(?:[ \t]+\\(:[[:alnum:]:_@#%]+:\\)\\)?") (org-re "\\(?:[ \t]+\\(:[[:alnum:]:_@#%]+:\\)\\)?")
"[ \t]*$") "[ \t]*$")
org-deadline-regexp (concat "\\<" org-deadline-string) org-deadline-regexp (concat "\\<" org-deadline-string)