From d61ce8edd116cb9c1c1de378cd3420f748251961 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 3 Nov 2013 14:18:19 +0100 Subject: [PATCH 1/2] Fix flyspell behaviour on verbatim objects * lisp/org.el (org-do-emphasis-faces): Look for verbatim status at correct location. --- lisp/org.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index 5e1f19508..e750ba036 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5704,7 +5704,7 @@ The time stamps may be either active or inactive.") (font-lock-prepend-text-property (match-beginning 2) (match-end 2) 'face (nth 1 a)) - (and (nth 4 a) + (and (nth 2 a) (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))) (add-text-properties (match-beginning 2) (match-end 2) From 757f00811d0bdf1e17562eeb4331d872d720f136 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 3 Nov 2013 17:47:55 +0100 Subject: [PATCH 2/2] org-element: Fix error when parsing lowercase keywords * lisp/org-element.el (org-element-context): Fix error when parsing affiliated keywords, e.g. "caption". * testing/lisp/test-org-element.el: Add test. --- lisp/org-element.el | 5 +++-- testing/lisp/test-org-element.el | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/org-element.el b/lisp/org-element.el index 873c4bb76..c148cacfa 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -4856,9 +4856,10 @@ Providing it allows for quicker computation." ((let ((post (org-element-property :post-affiliated element))) (and post (< origin post))) (beginning-of-line) - (looking-at org-element--affiliated-re) + (let ((case-fold-search t)) (looking-at org-element--affiliated-re)) (cond - ((not (member (upcase (match-string 1)) org-element-parsed-keywords)) + ((not (member-ignore-case (match-string 1) + org-element-parsed-keywords)) (throw 'objects-forbidden element)) ((< (match-end 0) origin) (narrow-to-region (match-end 0) (line-end-position))) diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el index ffa01c7ab..12372885f 100644 --- a/testing/lisp/test-org-element.el +++ b/testing/lisp/test-org-element.el @@ -2961,6 +2961,11 @@ Paragraph \\alpha." (org-test-with-temp-text "#+CAPTION: {{{macro}}}\n| a | b |." (progn (search-forward "{") (org-element-type (org-element-context)))))) + (should + (eq 'bold + (org-test-with-temp-text "#+caption: *bold*\nParagraph" + (progn (search-forward "*") + (org-element-type (org-element-context)))))) ;; Correctly set `:parent' property. (should (eq 'paragraph