diff options
| -rw-r--r-- | init.el | 27 |
1 files changed, 11 insertions, 16 deletions
@@ -1023,8 +1023,8 @@ (interactive) (jao-switch-window--then "Switch to buffer" 'consult-buffer)) - :bind (("M-o" . switch-window) - ("M-O" . switch-window-then-swap-buffer) + :bind (;; ("M-o" . switch-window) + ;; ("M-O" . switch-window-then-swap-buffer) ("s-o" . switch-window) ("s-O" . switch-window-then-swap-buffer) ("C-x 4 d" . jao-switch-window-then-dired) @@ -1365,14 +1365,13 @@ (defun jao--make-file-rx (exts) (format "file:/?/?.+\\.%s$" (regexp-opt exts))) -(defvar jao--see-exts - (jao--make-file-rx '("jpg" "jpeg" "png" "mov" "wmv" "avi" "mp4"))) +(defvar jao--see-exts (jao--make-file-rx '("jpg" "jpeg" "png"))) (defvar jao--doc-exts (jao--make-file-rx '("ps" "ps.gz" "pdf" "dvi" "djvu" "chm"))) (defvar jao-browse-url-wget-exts - '("ps" "pdf" "dvi" "djvu" "zip" "gz" "tgz" "mp4" "mp3" "flv")) + '("ps" "pdf" "dvi" "djvu" "zip" "gz" "tgz")) (defvar jao-browse-external-domains '("github.com" "gitlab.com" "slack.com" "meet.google.com" @@ -1398,7 +1397,7 @@ (defun jao-elpher--browse (url &rest _) (elpher-go url)) (defvar jao-browse--sound-rx - (format "^https?://.*/.*\\.%s" (regexp-opt '("mp4" "mp3" "flv")))) + (format "^https?://.*/.*\\.%s" (regexp-opt '("mp3" "flv")))) (defun jao-browse-play-sound-url (url &rest _) (jao-mpc-add-or-play-url url)) @@ -1408,6 +1407,7 @@ (setq browse-url-handlers `(("^\\(gemini\\|gopher\\)://.*" . jao-elpher--browse) + (jao-video--url-p . jao-maybe-view-video) (,jao--doc-exts . jao--browse-doc) (,jao--see-exts . jao--see) ("^file://?.+\\.html?$" . ,jao-browse-url-function) @@ -1416,7 +1416,6 @@ ("^https?://.*\\.gotomeeting\\.com\\.*" . browse-url-chrome) (,jao-browse--sound-rx . jao-browse-play-sound-url) (,(jao-wget--regexp) . jao-download) - (jao-video--url-p . jao-maybe-view-video) ("." . jao-browse-url-browse))) (when (< emacs-major-version 28) @@ -2108,6 +2107,7 @@ ;;;; outline minor mode (use-package outline :init (setq outline-minor-mode-use-buttons nil + outline-minor-mode-use-margins nil outline-minor-mode-cycle t)) (defvar-local jao-outline-folded nil) @@ -2127,14 +2127,6 @@ (jao-outline-minor-mode-hide-all arg) (jao-outline-minor-expand-all))) -(defvar jao-outline-minor-mode-map - (let ((map (make-keymap))) - (define-key map (kbd "C-c C-n") #'outline-next-visible-heading) - (define-key map (kbd "C-c C-p") #'outline-previous-visible-heading) - (define-key map (kbd "C-c o") 'consult-outline) - (define-key map (kbd "<f3>") #'jao-outline-minor-mode-toogle-fold) - map)) - (use-package outline-minor-faces :ensure t :after outline) @@ -2142,6 +2134,10 @@ (define-minor-mode jao-outline-minor-mode "Minor outline mode for programming languages" :lighter "" + :keymap `((,(kbd "C-c C-n") . outline-next-visible-heading) + (,(kbd "C-c C-p") . outline-previous-visible-heading) + (,(kbd "C-c o") . consult-outline) + (,(kbd "<f3>") . jao-outline-minor-mode-toogle-fold)) (if jao-outline-minor-mode (progn (setq-local outline-level #'outline-level outline-regexp (format "[%s]\\{3,\\} " comment-start)) @@ -2398,7 +2394,6 @@ :bind (:map haskell-mode-map (("C-c C-d" . jao-haskell-hoogle) ("C-c h" . haskell-hoogle) - ("C-c C-c" . haskell-compile) ("C-c C-e" . haskell-command-insert-language-pragma) ("<f3>" . haskell-session-kill)))) |