From df233eb1a9ed52af7da3d7e0607ae45491107224 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 25 Jul 2018 15:37:24 +0200 Subject: [PATCH] lang/pdf: fix compatibility with +new modeline --- modules/tools/pdf/+modeline.el | 19 +++++++++++++++---- modules/tools/pdf/config.el | 3 +-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/tools/pdf/+modeline.el b/modules/tools/pdf/+modeline.el index e88d3f440..2ca275663 100644 --- a/modules/tools/pdf/+modeline.el +++ b/modules/tools/pdf/+modeline.el @@ -2,8 +2,19 @@ (def-modeline-segment! +pdf-pages "Current and total page indicator for PDF documents." - (format " P %d/%d" (pdf-view-current-page) (pdf-cache-number-of-pages))) + (format "P %d/%d" (pdf-view-current-page) (pdf-cache-number-of-pages))) -(def-modeline! pdf-tools-modeline - (bar matches " " buffer-info +pdf-pages) - (major-mode vcs)) +(if (featurep! :ui doom-modeline +new) + (def-modeline-format! '+pdf + '(+mode-line-bar " " +mode-line-buffer-id " " +pdf-pages) + '(+mode-line-major-mode +mode-line-vcs)) + (def-modeline! '+pdf + '(bar matches " " buffer-info +pdf-pages) + '(major-mode vcs))) + +(defun +pdf|init-modeline () + (funcall (if (featurep! :ui doom-modeline +new) + #'set-modeline! + #'doom-set-modeline) + '+pdf)) +(add-hook 'pdf-tools-enabled-hook #'+pdf|init-modeline) diff --git a/modules/tools/pdf/config.el b/modules/tools/pdf/config.el index 5b2952b64..8ea1b0139 100644 --- a/modules/tools/pdf/config.el +++ b/modules/tools/pdf/config.el @@ -31,8 +31,7 @@ (add-hook! 'pdf-view-mode-hook (cua-mode 0)) ;; Custom modeline that removes useless info and adds page numbers (when (featurep! :ui doom-modeline) - (load! "+modeline") - (add-hook! 'pdf-tools-enabled-hook (doom-set-modeline 'pdf-tools-modeline))) + (load! "+modeline")) ;; Handle PDF-tools related popups better (set-popup-rule! "^\\*Outline*" :side 'right :size 40 :select nil) ;; TODO: Add additional important windows that should be handled differently