Merge branch 'maint'

lisp/ox-texinfo.el

@@ -526,8 +526,7 @@ holding export options."
 	 "^@documentencoding \\(AUTO\\)$"
 	 coding
 	 (replace-regexp-in-string
-	  "^@documentlanguage \\(AUTO\\)$" language header nil nil 1)
-	 nil nil 1)))
+	  "^@documentlanguage \\(AUTO\\)$" language header t nil 1) t nil 1)))
      ;; Additional header options set by #+TEXINFO_HEADER.
      (let ((texinfo-header (plist-get info :texinfo-header)))
        (and texinfo-header (org-element-normalize-string texinfo-header)))