From a940f56fb4d34fa35fc15667c7b47c217e6f1677 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 26 Sep 2019 13:15:44 -0400 Subject: [PATCH] tools/pdf: fix 1826 Error occurs if pdf-annot is never loaded before kill-buffer hook runs. --- modules/tools/pdf/config.el | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/modules/tools/pdf/config.el b/modules/tools/pdf/config.el index 4d946c79c..7b213cb9e 100644 --- a/modules/tools/pdf/config.el +++ b/modules/tools/pdf/config.el @@ -5,17 +5,18 @@ :config (map! :map pdf-view-mode-map :gn "q" #'kill-current-buffer) - (defun +pdf-cleanup-windows-h () - "Kill left-over annotation buffers when the document is killed." - (when (buffer-live-p pdf-annot-list-document-buffer) - (pdf-info-close pdf-annot-list-document-buffer)) - (when (buffer-live-p pdf-annot-list-buffer) - (kill-buffer pdf-annot-list-buffer)) - (let ((contents-buffer (get-buffer "*Contents*"))) - (when (and contents-buffer (buffer-live-p contents-buffer)) - (kill-buffer contents-buffer)))) - (add-hook! 'pdf-view-mode-hook - (add-hook 'kill-buffer-hook #'+pdf-cleanup-windows-h nil t)) + (after! pdf-annot + (defun +pdf-cleanup-windows-h () + "Kill left-over annotation buffers when the document is killed." + (when (buffer-live-p pdf-annot-list-document-buffer) + (pdf-info-close pdf-annot-list-document-buffer)) + (when (buffer-live-p pdf-annot-list-buffer) + (kill-buffer pdf-annot-list-buffer)) + (let ((contents-buffer (get-buffer "*Contents*"))) + (when (and contents-buffer (buffer-live-p contents-buffer)) + (kill-buffer contents-buffer)))) + (add-hook! 'pdf-view-mode-hook + (add-hook 'kill-buffer-hook #'+pdf-cleanup-windows-h nil t))) (setq-default pdf-view-display-size 'fit-page pdf-view-use-scaling t