Bläddra i källkod

Merge branch 'maint'

Nicolas Goaziou 11 år sedan
förälder
incheckning
2f60dfc1b3
2 ändrade filer med 9 tillägg och 3 borttagningar
  1. 2 2
      lisp/org-element.el
  2. 7 1
      testing/lisp/test-org-element.el

+ 2 - 2
lisp/org-element.el

@@ -5742,8 +5742,8 @@ Providing it allows for quicker computation."
 	;; At an headline or inlinetask, objects are in title.
 	((memq type '(headline inlinetask))
 	 (goto-char (org-element-property :begin element))
-	 (skip-chars-forward "* ")
-	 (if (and (>= origin (point)) (< origin (line-end-position)))
+	 (skip-chars-forward "*")
+	 (if (and (> origin (point)) (< origin (line-end-position)))
 	     (narrow-to-region (point) (line-end-position))
 	   (throw 'objects-forbidden element)))
 	;; At a paragraph, a table-row or a verse block, objects are

+ 7 - 1
testing/lisp/test-org-element.el

@@ -3050,7 +3050,13 @@ Paragraph \\alpha."
        (org-test-with-temp-text "Some *text with _underline_ text*"
 	 (progn
 	   (search-forward "under")
-	   (org-element-type (org-element-context (org-element-at-point))))))))
+	   (org-element-type (org-element-context (org-element-at-point)))))))
+  ;; Special case: bold object at the beginning of a headline.
+  (should
+   (eq 'bold
+       (org-test-with-temp-text "* *bold*"
+	 (search-forward "bo")
+	 (org-element-type (org-element-context))))))