lang/pdf: fix compatibility with +new modeline

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
+(if (featurep! :ui doom-modeline +new)
-  (bar matches " " buffer-info +pdf-pages)
+    (def-modeline-format! '+pdf
-  (major-mode vcs))
+      '(+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)

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")
+    (load! "+modeline"))
-    (add-hook! 'pdf-tools-enabled-hook (doom-set-modeline 'pdf-tools-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