Merge branch 'maint' into emacs-sync

doc/org.texi

@@ -5136,7 +5136,7 @@ that Org can parse this line correctly:
 
 In this example, @samp{GTD} is the @emph{group tag} and it is related to two
 other tags: @samp{Control}, @samp{Persp}.  Defining @samp{Control} and
-@samp{Persp} as group tags creates an hierarchy of tags:
+@samp{Persp} as group tags creates a hierarchy of tags:
 
 @example
 #+TAGS: [ Control : Context Task ]
@@ -11184,7 +11184,7 @@ Org exports text in this block only when using ASCII back-end.
 @cindex horizontal rules, in ASCII export
 
 ASCII back-end recognizes only one attribute, @code{:width}, which specifies
-the width of an horizontal rule in number of characters.  The keyword and
+the width of a horizontal rule in number of characters.  The keyword and
 syntax for specifying widths is:
 
 @example

doc/orgguide.texi

@@ -2156,11 +2156,11 @@ but not any simpler
 @node Emphasis and monospace, Comment lines, Paragraphs, Structural markup elements
 @subheading Emphasis and monospace
 
-You can make words @b{*bold*}, @i{/italic/}, _underlined_, @code{=code=}
-and @code{~verbatim~}, and, if you must, @samp{+strike-through+}.  Text
-in the code and verbatim string is not processed for Org-mode specific
-syntax, it is exported verbatim.  To insert a horizontal rules, use a line 
-consisting of only dashes, and at least 5 of them.
+You can make words @b{*bold*}, @i{/italic/}, _underlined_, @code{=verbatim=}
+and @code{~code~}, and, if you must, @samp{+strike-through+}.  Text in the
+code and verbatim string is not processed for Org-mode specific syntax, it is
+exported verbatim.  To insert a horizontal rules, use a line consisting of
+only dashes, and at least 5 of them.
 
 @node Comment lines,  , Emphasis and monospace, Structural markup elements
 @subheading Comment lines

lisp/org-element.el

@@ -931,10 +931,10 @@ Assume point is at beginning of the headline."
 	   (level (prog1 (org-reduced-level (skip-chars-forward "*"))
 		    (skip-chars-forward " \t")))
 	   (todo (and org-todo-regexp
-		      (let (case-fold-search) (looking-at org-todo-regexp))
+		      (let (case-fold-search) (looking-at (concat org-todo-regexp " ")))
 		      (progn (goto-char (match-end 0))
 			     (skip-chars-forward " \t")
-			     (match-string 0))))
+			     (match-string 1))))
 	   (todo-type
 	    (and todo (if (member todo org-done-keywords) 'done 'todo)))
 	   (priority (and (looking-at "\\[#.\\][ \t]*")

lisp/org.el

@@ -7,7 +7,7 @@
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: https://orgmode.org
-;; Version: 9.1.13
+;; Version: 9.1.14
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -13594,8 +13594,8 @@ EXTRA is additional text that will be inserted into the notes buffer."
 		      (regexp-quote (cdr (assq 'state org-log-note-headings)))
 		      `(("%d" . ,org-ts-regexp-inactive)
 			("%D" . ,org-ts-regexp)
-			("%s" . "\"\\S-+\"")
-			("%S" . "\"\\S-+\"")
+			("%s" . "\\(?:\"\\S-+\"\\)?")
+			("%S" . "\\(?:\"\\S-+\"\\)?")
 			("%t" . ,org-ts-regexp-inactive)
 			("%T" . ,org-ts-regexp)
 			("%u" . ".*?")

lisp/ox-odt.el

@@ -1359,11 +1359,10 @@ original parsed data.  INFO is a plist holding export options."
   ;; Write styles file.
   (let* ((styles-file (plist-get info :odt-styles-file))
 	 (styles-file (and (org-string-nw-p styles-file)
-			   (read (org-trim styles-file))))
+			   (org-trim styles-file)))
 	 ;; Non-availability of styles.xml is not a critical
 	 ;; error. For now, throw an error.
 	 (styles-file (or styles-file
-			  (plist-get info :odt-styles-file)
 			  (expand-file-name "OrgOdtStyles.xml"
 					    org-odt-styles-dir)
 			  (error "org-odt: Missing styles file?"))))

testing/lisp/test-org-element.el

@@ -1014,6 +1014,17 @@ Some other text
 
 ;;;; Headline
 
+(ert-deftest test-org-element/headline-todo-keyword ()
+  "Test todo keyword recognition."
+  ;; Reference test.
+  (org-test-with-temp-text "* TODO Headline"
+    (let ((org-todo-keywords '((sequence "TODO" "DONE"))))
+      (should (org-element-property :todo-keyword (org-element-at-point)))))
+  ;; Todo keyword is prefix of headlines first word.
+  (org-test-with-temp-text "* TODOHeadline"
+    (let ((org-todo-keywords '((sequence "TODO" "DONE"))))
+      (should-not (org-element-property :todo-keyword (org-element-at-point))))))
+
 (ert-deftest test-org-element/headline-comment-keyword ()
   "Test COMMENT keyword recognition."
   ;; Reference test.