diff options
Diffstat (limited to 'custom/jao-custom-exwm.el')
| -rw-r--r-- | custom/jao-custom-exwm.el | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/custom/jao-custom-exwm.el b/custom/jao-custom-exwm.el index 2135935..3cb3fc9 100644 --- a/custom/jao-custom-exwm.el +++ b/custom/jao-custom-exwm.el @@ -185,7 +185,7 @@ (when cln (if (jao-exwm--check-name cln) (current-buffer) - (when-let* ((b (jao-exwm-find-class-buffer cln))) + (when-let ((b (jao-exwm-find-class-buffer cln))) (pop-to-buffer b))))) (defun jao-exwm-switch-to-next-class () @@ -194,7 +194,9 @@ (defun jao-exwm-switch-to-next-x () (interactive) - (let ((bfs (seq-filter (lambda (b) (buffer-local-value 'exwm-class-name b)) + (let ((bfs (seq-filter (lambda (b) + (with-current-buffer b + (derived-mode-p 'exwm-mode))) (buffer-list (window-frame))))) (when (car bfs) (switch-to-buffer (car (reverse bfs)))))) @@ -341,21 +343,21 @@ (defun jao-exwm-zathura-goto-org (&optional arg) (interactive "P") - (when-let* ((info (jao-zathura--file-info (current-buffer))) - (file (jao-org-find-for-pdf (car info)))) - (let ((newp (not (file-exists-p file)))) - (when (or arg newp) (org-store-link nil t)) - (find-file-other-window file) - (when newp - (jao-org-insert-doc-skeleton) - (org-insert-link))))) + (when-let ((info (jao-zathura--file-info (current-buffer)))) + (when-let ((file (jao-org-find-for-pdf (car info)))) + (let ((newp (not (file-exists-p file)))) + (when (or arg newp) (org-store-link nil t)) + (find-file-other-window file) + (when newp + (jao-org-insert-doc-skeleton) + (org-insert-link)))))) (defun jao-exwm-zathura-goto-org* () (interactive) (jao-exwm-zathura-goto-org t)) (defun jao-exwm-org-store-zathura-link () - (when-let* ((info (jao-zathura--file-info (current-buffer)))) + (when-let ((info (jao-zathura--file-info (current-buffer)))) (let* ((file-name (car info)) (page (cadr info)) (desc (jao-pdf-section-title page file-name))) @@ -385,7 +387,7 @@ (interactive) (if jao-browse-doc-use-emacs-p (jao-org-goto-pdf) - (when-let* ((pdf (jao-exwm-org-to-pdf-file))) + (when-let (pdf (jao-exwm-org-to-pdf-file)) (jao-zathura-open-doc pdf)))) (with-eval-after-load "org" @@ -422,7 +424,7 @@ (defun jao-exwm-kill-firefox-url () (interactive) - (when-let* ((b (jao-exwm-find-class-buffer "Firefox"))) + (when-let (b (jao-exwm-find-class-buffer "Firefox")) (let ((cb (current-buffer))) (switch-to-buffer b) (jao-exwm--send-str "yy") @@ -530,6 +532,7 @@ ([f9] . jao-bright-show))) ;; (customize-set-variable 'exwm-input-global-keys exwm-input-global-keys) +(exwm-wm-mode) ;;; . (provide 'jao-custom-exwm) |