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

Merge branch 'origin-maint'

This commit is contained in:
Eric Schulte 2012-01-06 11:20:55 -07:00
parent aeb1ee1c66 369fa6d874
commit f1043a53cc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org.el
View File

@ -4447,12 +4447,12 @@ means to push this value onto the list in the variable.")
(defun org-update-property-plist (key val props) (defun org-update-property-plist (key val props)
"Update PROPS with KEY and VAL." "Update PROPS with KEY and VAL."
(if (string= "+" (substring key (- (length key) 1))) (let ((remainder (org-remove-if (lambda (p) (string= (car p) key)) props)))
(let* ((key (substring key 0 (- (length key) 1))) (if (string= "+" (substring key (- (length key) 1)))
(previous (cdr (assoc key props)))) (let* ((key (substring key 0 (- (length key) 1)))
(cons (cons key (concat previous " " val)) (previous (cdr (assoc key props))))
(org-remove-if (lambda (p) (string= (car p) key)) props))) (cons (cons key (concat previous " " val)) remainder))
(cons (cons key val) props))) (cons (cons key val) remainder))))
(defconst org-block-regexp (defconst org-block-regexp
"^[ \t]*#\\+begin_?\\([^ \n]+\\)\\(\\([^\n]+\\)\\)?\n\\([^\000]+?\\)#\\+end_?\\1[ \t]*$" "^[ \t]*#\\+begin_?\\([^ \n]+\\)\\(\\([^\n]+\\)\\)?\n\\([^\000]+?\\)#\\+end_?\\1[ \t]*$"