From 1ca1d52e922ef63713ad25f39051e0f946dc11b7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 5 May 2016 11:45:35 +0200 Subject: [PATCH] Fix `org-occur' when called non-interactively * lisp/org.el (org-first-headline-recenter): Check if current buffer is actually displayed in a window before trying to recenter view. --- lisp/org.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index ba240fb35..351d02444 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7252,9 +7252,11 @@ show that drawer instead." (defun org-first-headline-recenter () "Move cursor to the first headline and recenter the headline." - (goto-char (point-min)) - (when (re-search-forward (concat "^\\(" org-outline-regexp "\\)") nil t) - (set-window-start (selected-window) (point-at-bol)))) + (let ((window (get-buffer-window))) + (when window + (goto-char (point-min)) + (when (re-search-forward (concat "^\\(" org-outline-regexp "\\)") nil t) + (set-window-start window (line-beginning-position)))))) ;;; Saving and restoring visibility