diff options
| -rw-r--r-- | custom/jao-custom-notmuch.el | 4 | ||||
| -rw-r--r-- | init.el | 2 | ||||
| -rw-r--r-- | lib/wm/jao-exwm-zathura.el | 12 |
3 files changed, 7 insertions, 11 deletions
diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el index 1ef20b7..4502334 100644 --- a/custom/jao-custom-notmuch.el +++ b/custom/jao-custom-notmuch.el @@ -46,7 +46,7 @@ (jao-notmuch-notify) (with-current-buffer "*notmuch-hello*" (notmuch-hello-update) - (when first (jao-notmuch-hello-first)) + (when (and first (not (widget-at))) (jao-notmuch-hello-first)) (when agenda (jao-notmuch-refresh-agenda)))) (when jao-notmuch-enabled @@ -458,7 +458,7 @@ (defun jao-notmuch-after-tree-quit (&optional _both) (when (not (derived-mode-p 'notmuch-tree-mode 'notmuch-hello-mode)) (jump-to-register ?G)) - (jao-notmuch-notify-and-update t t)) + (jao-notmuch-notify-and-update t)) (defvar jao-notmuch--visits 0) @@ -364,7 +364,7 @@ :demand t :init (setq jao-themes-default-family (jao-d-l "Menlo" "Hack") ;; "RobotoMono Nerd Font" - jao-themes-default-size (jao-d-l 10 10) + jao-themes-default-size (jao-d-l 10 9) jao-themes-default-variable-pitch-family (jao-d-l "Helvetica" "Iosevka Etoile") jao-themes-default-variable-pitch-size (jao-d-l 12 9))) diff --git a/lib/wm/jao-exwm-zathura.el b/lib/wm/jao-exwm-zathura.el index 9da0a25..f26f0f9 100644 --- a/lib/wm/jao-exwm-zathura.el +++ b/lib/wm/jao-exwm-zathura.el @@ -64,8 +64,6 @@ (jao-doc-session-save) (doc-view-imenu-index (car info) #'jao-zathura-goto-page)))) -(add-hook 'exwm-update-title-hook #'jao-exwm--zathura-setup t) - ;;;###autoload (defun jao-exwm-pdf-zathura-close-all () (interactive) @@ -104,6 +102,9 @@ (defun jao-exwm-pdf-enable-zathura () (interactive) (add-hook 'kill-emacs-query-functions #'jao-exwm-pdf-zathura-close-all t) + (add-hook 'exwm-update-title-hook #'jao-exwm--zathura-setup t) + (with-eval-after-load "org" + (define-key org-mode-map (kbd "C-c o") #'jao-exwm-zathura-goto-pdf)) (setq jao-pdf-open-in-emacs nil) (setq jao-org-open-pdf-fun #'jao-zathura-open-doc) (setq jao-org-links-pdf-store-fun #'jao-exwm-org-store-zathura-link) @@ -113,6 +114,7 @@ (defun jao-exwm-pdf-disable-zathura () (interactive) (remove-hook 'kill-emacs-query-functions #'jao-exwm-pdf-zathura-close-all) + (remove-hook 'exwm-update-title-hook #'jao-exwm--zathura-setup) (setq jao-pdf-open-in-emacs t) (setq jao-org-open-pdf-fun #'jao-find-or-open) (setq jao-org-links-pdf-store-fun nil) @@ -131,12 +133,6 @@ (when-let* ((pdf (jao-exwm-org-to-pdf-file))) (jao-zathura-open-doc pdf)))) -(with-eval-after-load "org" - (define-key org-mode-map (kbd "C-c o") #'jao-exwm-zathura-goto-pdf)) - -(when (not jao-pdf-open-in-emacs) - (jao-exwm-pdf-enable-zathura)) - (defun jao-exwm-select-pdf () (interactive) (let ((b (read-buffer "Document: " nil t |