mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-27 04:02:53 +00:00
Merge branch 'origin-maint'
This commit is contained in:
commit
f1043a53cc
12
lisp/org.el
12
lisp/org.el
|
@ -4447,12 +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."
|
||||
(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))
|
||||
(org-remove-if (lambda (p) (string= (car p) key)) props)))
|
||||
(cons (cons key val) props)))
|
||||
(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))
|
||||
(cons (cons key val) remainder))))
|
||||
|
||||
(defconst org-block-regexp
|
||||
"^[ \t]*#\\+begin_?\\([^ \n]+\\)\\(\\([^\n]+\\)\\)?\n\\([^\000]+?\\)#\\+end_?\\1[ \t]*$"
|
||||
|
|
Loading…
Reference in a new issue