summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-05-30 08:47:26 +0200
committerBastien Guerry <bzg@altern.org>2014-05-30 08:47:26 +0200
commitf86d99a292ef9c567d530b496392a13d8a30e585 (patch)
tree5475edb0a924fe5a09a0cafc28b0cb91e8ac2fb2
parent554c9e3228b54044a0fbe1caa4008a4cefdd87b6 (diff)
parent822dcfc881a5df3249fcecf4b7bc71ee9c321b92 (diff)
downloadorg-mode-f86d99a292ef9c567d530b496392a13d8a30e585.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el16
1 files changed, 9 insertions, 7 deletions
diff --git a/lisp/org.el b/lisp/org.el
index b10e826..b9ee3b0 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6266,12 +6266,14 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'."
(defvar org-font-lock-keywords nil)
-(defsubst org-re-property (property &optional literal)
- "Return a regexp matching a PROPERTY line.
-Match group 3 will be set to the value if it exists."
- (concat "^\\(?4:[ \t]*\\)\\(?1::\\(?2:"
- (if literal property (regexp-quote property))
- "\\):\\)[ \t]+\\(?3:[^ \t\r\n].*?\\)\\(?5:[ \t]*\\)$"))
+(defsubst org-re-property (property &optional literal allow-null)
+ "Return a regexp matching a PROPERTY line.
+ Match group 3 will be set to the value if it exists."
+ (concat "^\\(?4:[ \t]*\\)\\(?1::\\(?2:"
+ (if literal property (regexp-quote property))
+ "\\):\\)[ \t]+\\(?3:[^ \t\r\n]"
+ (if allow-null "*")
+ ".*?\\)\\(?5:[ \t]*\\)$"))
(defconst org-property-re
(org-re-property ".*?" 'literal)
@@ -15780,7 +15782,7 @@ If it is not a string, an error is raised."
(setq range (org-get-property-block beg end 'force))
(goto-char (car range))
(if (re-search-forward
- (org-re-property property) (cdr range) t)
+ (org-re-property property nil t) (cdr range) t)
(progn
(delete-region (match-beginning 0) (match-end 0))
(goto-char (match-beginning 0)))