nits

4 files changed, 61 insertions, 57 deletions

diff --git a/completion.org b/completion.org
index 7869b46..54d29d0 100644
--- a/completion.org
+++ b/completion.org
@@ -9,8 +9,11 @@
         completion-category-defaults nil
         completion-cycle-threshold nil
         completions-detailed t
+        completion-show-help nil
         completion-show-inline-help nil
         completion-ignore-case t
+        completion-wrap-movement t
+        completion-auto-select nil
         completion-category-overrides '((file (styles . (partial-completion)))))
   #+end_src
 * imenu
@@ -108,7 +111,7 @@
             mct-show-completion-line-numbers nil
             mct-apply-completion-stripes nil
             mct-minimum-input 3
-            mct-live-update-delay 0
+            mct-live-update-delay 0.3
             mct-live-completion t ;; 'visible
             mct-completion-blocklist nil
             mct-completion-passlist '(imenu
@@ -117,8 +120,7 @@
  	                              Info-menu
                                       jao-buffer-same-mode
  	                              vc-retrieve-tag))
-      :bind (:map mct-completion-list-mode-map
-             (("e" . mct-focus-minibuffer))))
+      :bind (:map mct-completion-list-mode-map (("e" . mct-focus-minibuffer))))
 
     (mct-mode 1)
 
@@ -154,7 +156,7 @@
                ("C-c k" . consult-ripgrep)
                ("C-c K" . consult-git-grep)
                ("C-c L" . consult-locate)
-               ("C-h m" . consult-mode-command)
+               ;; ("C-h m" . consult-mode-command)
                ("C-c s" . consult-line)
                ("C-x r x" . consult-register)
                ("C-x r b" . consult-bookmark)
@@ -363,7 +365,7 @@
 
         :bind (("C-;" . embark-act)
                ("C-'" . embark-dwim)
-               ("C-h b" . embark-bindings)
+               ;; ("C-h b" . embark-bindings)
                (:map minibuffer-local-map
                      (("C-'" . embark-dwim)
                       ("C-," . embark-become)
diff --git a/email.org b/email.org
index 3f41902..e67a855 100644
--- a/email.org
+++ b/email.org
@@ -251,7 +251,7 @@
     (defun jao-shr-html-renderer (handle)
       (let (;; (shr-use-fonts t)
             ;; (shr-use-colors t)
-            (fill-column 120))
+            (shr-width 130))
         (mm-shr handle)))
 
     ;; (setq mm-text-html-renderer #'jao-w3m-html-renderer)
diff --git a/init.org b/init.org
index 711c997..580a41f 100644
--- a/init.org
+++ b/init.org
@@ -1149,7 +1149,7 @@
       (global-set-key (kbd "s-a") #'jao-first-window)
       (global-set-key (kbd "H-s-a") #'jao-first-window)
       (global-set-key (kbd "C-x p") 'jao-prev-window)
-      (global-set-key (kbd "M-o") #'other-window)
+      (global-set-key (kbd "M-o") #'jao-other-window)
       (global-set-key (kbd "M-p") #'jao-prev-window)
 
       (global-set-key (kbd "C-c 0") #'jao-first-window)
@@ -1329,39 +1329,42 @@
     #+BEGIN_SRC emacs-lisp
       (use-package tex-site
         :ensure auctex
-        :init (progn (setq TeX-auto-save t)
-                     (setq TeX-parse-self t)
-                     (setq TeX-a4-paper t)
-                     (setq TeX-auto-local ".tex-auto-local")
-                     ;; Preferred view format: dvi, ps, pdf, pdfs
-                     (setq TeX-view-format "pdf")
-                     (setq-default TeX-master "../main") ; nil to ask
-                     (setq TeX-view-program-selection
-                           (jao-d-l
-                            '((output-dvi "open")
-                              (output-pdf "open")
-                              (output-html "open"))
-                            '(((output-dvi has-no-display-manager) "dvi2tty")
-                              ((output-dvi style-pstricks) "dvips and gv")
-                              (output-dvi "xdvi")
-                              (output-pdf "xdg-open")
-                              (output-html "xdg-open"))))
-                     ;; to make RefTeX faster for large documents, try these:
-                     (setq reftex-enable-partial-scans t)
-                     (setq reftex-save-parse-info t)
-                     (setq reftex-use-multiple-selection-buffers t)
-                     ;; to integrate with AUCTeX
-                     (setq reftex-plug-into-AUCTeX t)
-                     (setq reftex-ref-style-default-list
-                           '("Hyperref" "Varioref" "Fancyref"))
-                     (add-hook 'LaTeX-mode-hook 'turn-on-reftex)
-                     (setq LaTeX-command "latex -shell-escape")
-                     (setq LaTeX-biblatex-use-Biber t)
-                     (setq bibtex-dialect 'biblatex)
-                     (jao-when-darwin
-                      (jao-exec-path "/usr/local/texlive/2016/bin/x86_64-darwin"))))
-
-      ;; (use-package ebib
+        :init
+        (setq TeX-auto-save t)
+        (setq TeX-parse-self t)
+        (setq TeX-a4-paper t)
+        (setq TeX-auto-local ".tex-auto-local")
+        ;; Preferred view format: dvi, ps, pdf, pdfs
+        (setq TeX-view-format "pdf")
+        (setq-default TeX-master "../main") ; nil to ask
+        (setq TeX-view-program-selection
+              (jao-d-l
+               '((output-dvi "open")
+                 (output-pdf "open")
+                 (output-html "open"))
+               '(((output-dvi has-no-display-manager) "dvi2tty")
+                 ((output-dvi style-pstricks) "dvips and gv")
+                 (output-dvi "xdvi")
+                 (output-pdf "xdg-open")
+                 (output-html "xdg-open"))))
+        ;; to make RefTeX faster for large documents, try these:
+        (setq reftex-enable-partial-scans t)
+        (setq reftex-save-parse-info t)
+        (setq reftex-use-multiple-selection-buffers t)
+        ;; to integrate with AUCTeX
+        (setq reftex-plug-into-AUCTeX t)
+        (setq reftex-ref-style-default-list
+              '("Hyperref" "Varioref" "Fancyref"))
+        (setq LaTeX-command "latex -shell-escape")
+        (setq LaTeX-biblatex-use-Biber t)
+        (setq bibtex-dialect 'biblatex)
+        :config
+        (add-hook 'TeX-after-compilation-finished-functions
+                  #'TeX-revert-document-buffer)
+        (add-hook 'LaTeX-mode-hook 'turn-on-reftex)
+        )
+
+;; (use-package ebib
       ;;  :ensure t
       ;;  :config (setq ebib-bibtex-dialect 'biblatex))
 
@@ -2073,13 +2076,7 @@
         :ensure t
         :after magit
         :init
-        (setq forge-database-file
-              (format "~/.emacs.d/forge-database-%s.sqlite" emacs-major-version)
-              forge-topic-list-limit (cons 25 10))
-        ;; workaround for ghub problems (shoudn't be needed in 27.x)
-        (when (< emacs-major-version 27)
-          (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")
-          (setq ghub-use-workaround-for-emacs-bug nil))
+        (setq forge-topic-list-limit (cons 25 10))
         :bind (:map forge-topic-mode-map ("M-w" . copy-region-as-kill))
         :config
         (remove-hook 'magit-status-sections-hook #'forge-insert-issues)
@@ -2405,20 +2402,21 @@
         :commands cider-mode
         :init (setq cider-annotate-completion-candidates t
                     cider-auto-select-error-buffer nil
-                    clojure-docstring-fill-column 72
-                    cider-show-error-buffer 'except-in-repl
+                    cider-auto-select-test-report-buffer nil
+                    cider-eldoc-display-for-symbol-at-point t
+                    cider-enrich-classpath t
                     cider-lein-parameters "repl :headless :host localhost"
                     cider-mode-line  " ÷"
                     cider-prompt-for-symbol nil
-                    cider-repl-pop-to-buffer-on-connect nil
                     cider-repl-history-file
                     (expand-file-name "~/.emacs.d/cache/cider.history")
+                    cider-repl-pop-to-buffer-on-connect nil
                     cider-repl-use-pretty-printing t
+                    cider-show-error-buffer 'except-in-repl
                     cider-test-show-report-on-success nil
-                    cider-auto-select-test-report-buffer nil
-                    cider-use-overlays nil
                     cider-use-fringe-indicators nil
-                    cider-eldoc-display-for-symbol-at-point t
+                    cider-use-overlays nil
+                    clojure-docstring-fill-column 72
                     nrepl-prompt-to-kill-server-buffer-on-quit nil))
 
       (with-eval-after-load "cider-test"
@@ -2797,6 +2795,7 @@
         :config
         (define-key global-map (kbd "C-c C-t") telega-prefix-map)
         (setq telega-chat-show-avatars nil
+              telega-chat-prompt-format ">> "
               telega-root-show-avatars nil
               telega-chat-prompt-show-avatar-for nil
               telega-emoji-use-images nil
diff --git a/lib/eos/jao-tracking.el b/lib/eos/jao-tracking.el
index 85c78db..520116d 100644
--- a/lib/eos/jao-tracking.el
+++ b/lib/eos/jao-tracking.el
@@ -30,10 +30,13 @@
   (dolist (m modes) (add-to-list 'tracking-shorten-modes m)))
 
 (defun jao-tracking--clean-slack (s)
-  (let ((s (replace-regexp-in-string
-            "^\\*Slack - .*? : \\(mpdm-\\)?\\([^ ]+\\)\\( \\(T\\)\\)?.*"
-            "#\\2\\4"
-            s)))
+  (let* ((s (replace-regexp-in-string
+             "^\\*Slack - .*? : \\(mpdm-\\)?\\([^ ]+\\)\\( \\(T\\)\\)?.*"
+             "#\\2\\4"
+             s))
+         (s (replace-regexp-in-string "logstash-\\([^-]+\\)-\\(.+\\)"
+                                      "\\2-\\1"
+                                      s)))
     (replace-regexp-in-string "^[^a-zA-Z#]+" "#" s)))
 
 (defun jao-tracking-shorten-aggressively (lst tail-count)