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-11 10:15:24 -07:00
parent abf3060e47 313b70e139
commit ce5c5d896b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/org.el
View File

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