Merge branch 'maint'

README_contribute

@@ -58,10 +58,10 @@ development.
      new mechanism to make sure all changes end up in the right
      place.
 
-   - Creating and pushing a change to the Org-mode core requires
-     you also to provide ChangeLog entries.  Just press `C-x 4 a'
-     in each function or variable you have modified and describe
-     the change you made in the ChangeLog buffer/file.
+   - Org mode no longer uses ChangeLog entries to document
+     changes.  Instead, special commit messages are used, as
+     described in the `CONTRIBUTE' file in the main Emacs
+     repository.
 
    - Among other things, Org-mode is widely appreciated because
      of its simplicity, cleanness and consistency.  We should try

lisp/org.el

@@ -11127,18 +11127,18 @@ of matched result, with is either `dedicated' or `fuzzy'."
 				      "\\[[0-9]*\\(?:%\\|/[0-9]*\\)\\]"
 				      wspaceopt
 				      "\\)"))
-		      (sep (concat "\\(?:" wspace "+\\|" cookie "+\\)"))
+		      (sep (concat "\\(?:\\(?:" wspace "\\|" cookie "\\)+\\)"))
 		      (re (concat
 			   org-outline-regexp-bol
 			   "\\(?:" org-todo-regexp "[ \t]+\\)?"
 			   "\\(?:\\[#.\\][ \t]+\\)?"
 			   "\\(?:" org-comment-string "[ \t]+\\)?"
-			   sep "*"
+			   sep "?"
 			   (let ((title (mapconcat #'regexp-quote
 						   words
-						   (concat sep "+"))))
+						   sep)))
 			     (if starred (substring title 1) title))
-			   sep "*"
+			   sep "?"
 			   (org-re "\\(?:[ \t]+:[[:alnum:]_@#%%:]+:\\)?")
 			   "[ \t]*$")))
 		 (goto-char (point-min))