ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien 2020-09-05 09:41:42 +02:00
parent 0e580d169f 4696aef580
commit 3f8fe39695
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/org-goto.el
View File

@ -234,20 +234,15 @@ position or nil."
(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*") (make-indirect-buffer (current-buffer) "*org-goto*" t)
(error (make-indirect-buffer (current-buffer) "*org-goto*")))) (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*"))
(setq buffer-read-only nil) (org-overview)
(let ((org-startup-truncated t)
(org-startup-folded nil)
(org-startup-align-all-tables nil))
(org-mode)
(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))