3 files changed, 40 insertions, 35 deletions

diff --git a/lisp/org/org-goto.el b/lisp/org/org-goto.el
index 0a3470f5451..352bf9f2e52 100644
--- a/lisp/org/org-goto.el
+++ b/lisp/org/org-goto.el
@@ -203,40 +203,39 @@ When nil, you can use these keybindings to navigate the buffer:
   "Let the user select a location in current buffer.
 This function uses a recursive edit.  It returns the selected
 position or nil."
-  (org-no-popups
-   (let ((isearch-mode-map org-goto-local-auto-isearch-map)
-         (isearch-hide-immediately nil)
-         (isearch-search-fun-function
-          (lambda () #'org-goto--local-search-headings))
-         (help (or help org-goto-help)))
-     (save-excursion
-       (save-window-excursion
-         (delete-other-windows)
-         (and (get-buffer "*org-goto*") (kill-buffer "*org-goto*"))
-         (pop-to-buffer-same-window
-          (condition-case nil
-              (make-indirect-buffer (current-buffer) "*org-goto*" t)
-            (error (make-indirect-buffer (current-buffer) "*org-goto*" t))))
-         (let (temp-buffer-show-function temp-buffer-show-hook)
-           (with-output-to-temp-buffer "*Org Help*"
-             (princ (format help (if org-goto-auto-isearch
-                                     "  Just type for auto-isearch."
-                                   "  n/p/f/b/u to navigate, q to quit.")))))
-         (org-fit-window-to-buffer (get-buffer-window "*Org Help*"))
-         (org-overview)
-         (setq buffer-read-only t)
-         (if (and (boundp 'org-goto-start-pos)
-                  (integer-or-marker-p org-goto-start-pos))
-             (progn (goto-char org-goto-start-pos)
-                    (when (org-invisible-p)
-                      (org-show-set-visibility 'lineage)))
-           (goto-char (point-min)))
-         (let (org-special-ctrl-a/e) (org-beginning-of-line))
-         (message "Select location and press RET")
-         (use-local-map org-goto-map)
-         (recursive-edit)))
-     (kill-buffer "*org-goto*")
-     (cons org-goto-selected-point org-goto-exit-command))))
+  (let ((isearch-mode-map org-goto-local-auto-isearch-map)
+        (isearch-hide-immediately nil)
+        (isearch-search-fun-function
+         (lambda () #'org-goto--local-search-headings))
+        (help (or help org-goto-help)))
+    (save-excursion
+      (save-window-excursion
+        (delete-other-windows)
+        (and (get-buffer "*org-goto*") (kill-buffer "*org-goto*"))
+        (pop-to-buffer-same-window
+         (condition-case nil
+             (make-indirect-buffer (current-buffer) "*org-goto*" t)
+           (error (make-indirect-buffer (current-buffer) "*org-goto*" t))))
+        (let (temp-buffer-show-function temp-buffer-show-hook)
+          (with-output-to-temp-buffer "*Org Help*"
+            (princ (format help (if org-goto-auto-isearch
+                                    "  Just type for auto-isearch."
+                                  "  n/p/f/b/u to navigate, q to quit.")))))
+        (org-fit-window-to-buffer (get-buffer-window "*Org Help*"))
+        (org-overview)
+        (setq buffer-read-only t)
+        (if (and (boundp 'org-goto-start-pos)
+                 (integer-or-marker-p org-goto-start-pos))
+            (progn (goto-char org-goto-start-pos)
+                   (when (org-invisible-p)
+                     (org-show-set-visibility 'lineage)))
+          (goto-char (point-min)))
+        (let (org-special-ctrl-a/e) (org-beginning-of-line))
+        (message "Select location and press RET")
+        (use-local-map org-goto-map)
+        (recursive-edit)))
+    (kill-buffer "*org-goto*")
+    (cons org-goto-selected-point org-goto-exit-command)))
 
 ;;;###autoload
 (defun org-goto (&optional alternative-interface)
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 6427f30072e..77b1cf4e5ff 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-68-g77e2ec"))
+   (let ((org-git-version "release_9.5-72-gc5d6656"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el
index 9170059156d..081a28317f6 100644
--- a/lisp/org/ox-icalendar.el
+++ b/lisp/org/ox-icalendar.el
@@ -280,6 +280,7 @@ re-read the iCalendar file.")
                      (footnote-definition . ignore)
                      (footnote-reference . ignore)
                      (headline . org-icalendar-entry)
+                     (inner-template . org-icalendar-inner-template)
                      (inlinetask . ignore)
                      (planning . ignore)
                      (section . ignore)
@@ -805,6 +806,11 @@ END:VALARM\n"
 
 ;;;; Template
 
+(defun org-icalendar-inner-template (contents _)
+  "Return document body string after iCalendar conversion.
+CONTENTS is the transcoded contents string."
+  contents)
+
 (defun org-icalendar-template (contents info)
   "Return complete document string after iCalendar conversion.
 CONTENTS is the transcoded contents string.  INFO is a plist used