From 35e21b6161cf26eeb0a90ba289568e8a4811f28e Mon Sep 17 00:00:00 2001 From: Marco Wahl Date: Thu, 14 Oct 2021 12:02:04 +0200 Subject: [PATCH 1/2] org-goto: Fix UI * lisp/org-goto.el (org-goto-location): Drop the wrap by `org-no-popups'. This restores the expected functionality of org-goto with interface type 'outline. See ml: https://list.orgmode.org/87mtnovv7f.fsf@alphapapa.net/. --- lisp/org-goto.el | 67 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/lisp/org-goto.el b/lisp/org-goto.el index 0a3470f54..352bf9f2e 100644 --- a/lisp/org-goto.el +++ b/lisp/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) From a51e4dc710d91678126d4cca3970f4b5992474e4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 19 Nov 2021 09:34:37 +0100 Subject: [PATCH 2/2] ox-icalendar: Fix error dangling footnotes * lisp/ox-icalendar.el (icalendar): Add an inner-template function so as to not use "ox-ascii"'s. (org-icalendar-inner-template): New function. This fixes and . Footnote definition is lost, but references are already removed from the description anyway, so the problem is not worse. --- lisp/ox-icalendar.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el index 917005915..081a28317 100644 --- a/lisp/ox-icalendar.el +++ b/lisp/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