1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00

Update to Org 9.5-72-gc5d6656

This commit is contained in:
Kyle Meyer 2021-11-20 13:12:18 -05:00
parent e3d5337970
commit 0dd3883def
3 changed files with 40 additions and 35 deletions

View File

@ -203,7 +203,6 @@ 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
@ -236,7 +235,7 @@ position or nil."
(use-local-map org-goto-map)
(recursive-edit)))
(kill-buffer "*org-goto*")
(cons org-goto-selected-point org-goto-exit-command))))
(cons org-goto-selected-point org-goto-exit-command)))
;;;###autoload
(defun org-goto (&optional alternative-interface)

View File

@ -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)

View File

@ -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