From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 23 Oct 2021 17:34:28 +0000 (-0400)
Subject: Update to Org 9.5-59-g52e6f1
X-Git-Tag: emacs-28.0.90~197
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6fa5206770;p=emacs.git

Update to Org 9.5-59-g52e6f1
---

diff --git a/doc/misc/org.org b/doc/misc/org.org
index 5977f091610..788e5efedf5 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -16543,7 +16543,7 @@ more "bibliography" keywords.
 #+bibliography: "/some/file/with spaces/in its name.bib"
 #+end_example
 
-#+kindex: C-c C-x @
+#+kindex: C-c C-x @@
 #+findex: org-cite-insert
 One can then insert and edit citations using ~org-cite-insert~, called
 with {{{kbd(C-c C-x @)}}}.
diff --git a/lisp/org/org-macro.el b/lisp/org/org-macro.el
index b8d3373418d..1259430ae44 100644
--- a/lisp/org/org-macro.el
+++ b/lisp/org/org-macro.el
@@ -125,7 +125,7 @@ previous one, unless VALUE is nil.  Return the updated list."
   "Collect macro definitions in current buffer and setup files.
 Return an alist containing all macro templates found."
   (let ((templates
-         `(("author" . ,(org-macro--find-keyword-value "AUTHOR"))
+         `(("author" . ,(org-macro--find-keyword-value "AUTHOR" t))
 	   ("email" . ,(org-macro--find-keyword-value "EMAIL"))
 	   ("title" . ,(org-macro--find-keyword-value "TITLE" t))
 	   ("date" . ,(org-macro--find-date)))))
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 4464459695f..55f186b4712 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
 (defun org-git-version ()
   "The Git version of Org mode.
 Inserted by installing Org or when a release is made."
-   (let ((org-git-version "release_9.5-57-g9bc3a2"))
+   (let ((org-git-version "release_9.5-59-g52e6f1"))
      org-git-version))
 
 (provide 'org-version)