procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Org 9.5-72-gc5d6656

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

67
lisp/org/org-goto.el
View file

@ -203,40 +203,39 @@ When nil, you can use these keybindings to navigate the buffer:
"Let the user select a location in current buffer. "Let the user select a location in current buffer.
This function uses a recursive edit. It returns the selected This function uses a recursive edit. It returns the selected
position or nil." position or nil."
(org-no-popups (let ((isearch-mode-map org-goto-local-auto-isearch-map)
(let ((isearch-mode-map org-goto-local-auto-isearch-map) (isearch-hide-immediately nil)
(isearch-hide-immediately nil) (isearch-search-fun-function
(isearch-search-fun-function (lambda () #'org-goto--local-search-headings))
(lambda () #'org-goto--local-search-headings)) (help (or help org-goto-help)))
(help (or help org-goto-help))) (save-excursion
(save-excursion (save-window-excursion
(save-window-excursion (delete-other-windows)
(delete-other-windows) (and (get-buffer "*org-goto*") (kill-buffer "*org-goto*"))
(and (get-buffer "*org-goto*") (kill-buffer "*org-goto*")) (pop-to-buffer-same-window
(pop-to-buffer-same-window (condition-case nil
(condition-case nil (make-indirect-buffer (current-buffer) "*org-goto*" t)
(make-indirect-buffer (current-buffer) "*org-goto*" t) (error (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)
(let (temp-buffer-show-function temp-buffer-show-hook) (with-output-to-temp-buffer "*Org Help*"
(with-output-to-temp-buffer "*Org Help*" (princ (format help (if org-goto-auto-isearch
(princ (format help (if org-goto-auto-isearch " Just type for auto-isearch."
" Just type for auto-isearch." " n/p/f/b/u to navigate, q to quit.")))))
" n/p/f/b/u to navigate, q to quit."))))) (org-fit-window-to-buffer (get-buffer-window "*Org Help*"))
(org-fit-window-to-buffer (get-buffer-window "*Org Help*")) (org-overview)
(org-overview) (setq buffer-read-only t)
(setq buffer-read-only t) (if (and (boundp 'org-goto-start-pos)
(if (and (boundp 'org-goto-start-pos) (integer-or-marker-p org-goto-start-pos))
(integer-or-marker-p org-goto-start-pos)) (progn (goto-char org-goto-start-pos)
(progn (goto-char org-goto-start-pos) (when (org-invisible-p)
(when (org-invisible-p) (org-show-set-visibility 'lineage)))
(org-show-set-visibility 'lineage))) (goto-char (point-min)))
(goto-char (point-min))) (let (org-special-ctrl-a/e) (org-beginning-of-line))
(let (org-special-ctrl-a/e) (org-beginning-of-line)) (message "Select location and press RET")
(message "Select location and press RET") (use-local-map org-goto-map)
(use-local-map org-goto-map) (recursive-edit)))
(recursive-edit))) (kill-buffer "*org-goto*")
(kill-buffer "*org-goto*") (cons org-goto-selected-point org-goto-exit-command)))
(cons org-goto-selected-point org-goto-exit-command))))
;;;###autoload ;;;###autoload
(defun org-goto (&optional alternative-interface) (defun org-goto (&optional alternative-interface)

2
lisp/org/org-version.el
View file

@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
(defun org-git-version () (defun org-git-version ()
"The Git version of Org mode. "The Git version of Org mode.
Inserted by installing Org or when a release is made." 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)) org-git-version))
(provide 'org-version) (provide 'org-version)

6
lisp/org/ox-icalendar.el
View file

@ -280,6 +280,7 @@ re-read the iCalendar file.")
(footnote-definition . ignore) (footnote-definition . ignore)
(footnote-reference . ignore) (footnote-reference . ignore)
(headline . org-icalendar-entry) (headline . org-icalendar-entry)
(inner-template . org-icalendar-inner-template)
(inlinetask . ignore) (inlinetask . ignore)
(planning . ignore) (planning . ignore)
(section . ignore) (section . ignore)
@ -805,6 +806,11 @@ END:VALARM\n"
;;;; Template ;;;; 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) (defun org-icalendar-template (contents info)
"Return complete document string after iCalendar conversion. "Return complete document string after iCalendar conversion.
CONTENTS is the transcoded contents string. INFO is a plist used CONTENTS is the transcoded contents string. INFO is a plist used