diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2014-08-31 11:43:27 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2014-08-31 11:43:27 +0200 |
commit | d2643be6d8c0e2fd54a673117cf09e332ec18e01 (patch) | |
tree | 6784322391e50a8068ee69206a4c4ff8c156352f | |
parent | 851b779d1a3780d921b9c37b81a6afd919f2c479 (diff) | |
parent | 37bf0576f2f2894c6e37239ee8db63a3ef21a840 (diff) | |
download | org-mode-d2643be6d8c0e2fd54a673117cf09e332ec18e01.tar.gz |
Merge branch 'maint'
Conflicts:
lisp/org-element.el
-rw-r--r-- | lisp/org-element.el | 91 | ||||
-rwxr-xr-x | lisp/org.el | 6 | ||||
-rw-r--r-- | testing/lisp/test-org-element.el | 34 |
3 files changed, 73 insertions, 58 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el index 488d119..c1051f6 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -1396,34 +1396,34 @@ containing `:begin', `:end', `:contents-begin', `:contents-end', `:post-blank' and `:post-affiliated' keywords. Assume point is at the beginning of the property drawer." - (save-excursion - (let ((case-fold-search t)) - (if (not (save-excursion - (re-search-forward "^[ \t]*:END:[ \t]*$" limit t))) - ;; Incomplete drawer: parse it as a paragraph. - (org-element-paragraph-parser limit affiliated) - (save-excursion - (let* ((drawer-end-line (match-beginning 0)) - (begin (car affiliated)) - (post-affiliated (point)) - (contents-begin (progn (forward-line) - (and (< (point) drawer-end-line) - (point)))) - (contents-end (and contents-begin drawer-end-line)) - (pos-before-blank (progn (goto-char drawer-end-line) - (forward-line) - (point))) - (end (progn (skip-chars-forward " \r\t\n" limit) - (if (eobp) (point) (line-beginning-position))))) - (list 'property-drawer - (nconc - (list :begin begin - :end end - :contents-begin contents-begin - :contents-end contents-end - :post-blank (count-lines pos-before-blank end) - :post-affiliated post-affiliated) - (cdr affiliated))))))))) + (let ((case-fold-search t)) + (if (not (save-excursion (re-search-forward "^[ \t]*:END:[ \t]*$" limit t))) + ;; Incomplete drawer: parse it as a paragraph. + (org-element-paragraph-parser limit affiliated) + (save-excursion + (let* ((drawer-end-line (match-beginning 0)) + (begin (car affiliated)) + (post-affiliated (point)) + (contents-begin + (progn + (forward-line) + (and (re-search-forward org-property-re drawer-end-line t) + (line-beginning-position)))) + (contents-end (and contents-begin drawer-end-line)) + (pos-before-blank (progn (goto-char drawer-end-line) + (forward-line) + (point))) + (end (progn (skip-chars-forward " \r\t\n" limit) + (if (eobp) (point) (line-beginning-position))))) + (list 'property-drawer + (nconc + (list :begin begin + :end end + :contents-begin contents-begin + :contents-end contents-end + :post-blank (count-lines pos-before-blank end) + :post-affiliated post-affiliated) + (cdr affiliated)))))))) (defun org-element-property-drawer-interpreter (property-drawer contents) "Interpret PROPERTY-DRAWER element as Org syntax. @@ -2105,29 +2105,30 @@ LIMIT bounds the search. Return a list whose CAR is `node-property' and CDR is a plist containing `:key', `:value', `:begin', `:end', `:post-blank' and `:post-affiliated' keywords." - (save-excursion - (looking-at org-property-re) - (let ((case-fold-search t) - (begin (point)) - (key (org-match-string-no-properties 2)) - (value (org-match-string-no-properties 3)) - (pos-before-blank (progn (forward-line) (point))) - (end (progn (skip-chars-forward " \r\t\n" limit) - (if (eobp) (point) (point-at-bol))))) - (list 'node-property - (list :key key - :value value - :begin begin - :end end - :post-blank (count-lines pos-before-blank end) - :post-affiliated begin))))) + (looking-at org-property-re) + (let ((case-fold-search t) + (begin (point)) + (key (org-match-string-no-properties 2)) + (value (org-match-string-no-properties 3)) + (end (save-excursion + (end-of-line) + (if (re-search-forward org-property-re limit t) + (line-beginning-position) + limit)))) + (list 'node-property + (list :key key + :value value + :begin begin + :end end + :post-blank 0 + :post-affiliated begin)))) (defun org-element-node-property-interpreter (node-property contents) "Interpret NODE-PROPERTY element as Org syntax. CONTENTS is nil." (format org-property-format (format ":%s:" (org-element-property :key node-property)) - (org-element-property :value node-property))) + (or (org-element-property :value node-property) ""))) ;;;; Paragraph diff --git a/lisp/org.el b/lisp/org.el index e05a416..72a306b 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -6261,9 +6261,9 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'." 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]*\\)$")) + "\\):\\)\\(?:[ \t]+\\(?3:[^ \t\r\n].*?\\)\\)" + (and allow-null "?") + "\\(?5:[ \t]*\\)$")) (defconst org-property-re (org-re-property ".*?" 'literal t) diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el index 52ea74b..ceff329 100644 --- a/testing/lisp/test-org-element.el +++ b/testing/lisp/test-org-element.el @@ -1571,23 +1571,37 @@ e^{i\\pi}+1=0 ;; Standard test. (should (equal '("abc" "value") - (org-test-with-temp-text ":PROPERTIES:\n:abc: value\n:END:" - (progn (forward-line) - (let ((element (org-element-at-point))) - (list (org-element-property :key element) - (org-element-property :value element))))))) + (org-test-with-temp-text ":PROPERTIES:\n<point>:abc: value\n:END:" + (let ((element (org-element-at-point))) + (list (org-element-property :key element) + (org-element-property :value element)))))) ;; Value should be trimmed. (should (equal "value" - (org-test-with-temp-text ":PROPERTIES:\n:abc: value \n:END:" - (progn (forward-line) - (let ((element (org-element-at-point))) - (org-element-property :value element)))))) + (org-test-with-temp-text ":PROPERTIES:\n<point>:abc: value \n:END:" + (org-element-property :value (org-element-at-point))))) ;; A node property requires to be wrapped within a property drawer. (should-not (eq 'node-property (org-test-with-temp-text ":abc: value" - (org-element-type (org-element-at-point)))))) + (org-element-type (org-element-at-point))))) + ;; Accept empty properties. + (should + (equal '(("foo" "value") ("bar" nil)) + (org-test-with-temp-text ":PROPERTIES:\n:foo: value\n:bar:\n:END:" + (org-element-map (org-element-parse-buffer) 'node-property + (lambda (p) + (list (org-element-property :key p) + (org-element-property :value p))))))) + ;; Ignore all non-property lines in property drawers. + (should + (equal + '(("foo" "value")) + (org-test-with-temp-text ":PROPERTIES:\nWrong1\n:foo: value\nWrong2\n:END:" + (org-element-map (org-element-parse-buffer) 'node-property + (lambda (p) + (list (org-element-property :key p) + (org-element-property :value p)))))))) ;;;; Paragraph |