[emacs] remove unnecessary overrides & silence some compile warnings

[~bandali/configs] / init.org

diff --git a/init.org b/init.org
index ae1a6e6..7f66c99 100644 (file)
--- a/init.org
+++ b/init.org
@@ -648,33 +648,29 @@ Enable =winner-mode=.
 
 *** Don’t display =*compilation*= on success
 
-From https://stackoverflow.com/a/17788551.
+Based on https://stackoverflow.com/a/17788551, with changes to use
+=cl-letf= instead of the now obsolete =flet=.
 
 #+begin_src emacs-lisp
-(defun amin--compilation-finish-function (buffer outstr)
-  (unless (string-match "finished" outstr)
-    (switch-to-buffer-other-window buffer))
-  t)
-
-(setq compilation-finish-functions #'amin--compilation-finish-function)
+(use-package compile
+  :config
+  (defun amin--compilation-finish-function (buffer outstr)
+    (unless (string-match "finished" outstr)
+      (switch-to-buffer-other-window buffer))
+    t)
 
-(require 'cl)
+  (setq compilation-finish-functions #'amin--compilation-finish-function)
 
-(defadvice compilation-start
-    (around inhibit-display
-            (command &optional mode name-function highlight-regexp))
-  (if (not (string-match "^\\(find\\|grep\\)" command))
-      (flet ((display-buffer)
-             (set-window-point)
-             (goto-char))
-        (fset 'display-buffer   'ignore)
-        (fset 'goto-char        'ignore)
-        (fset 'set-window-point 'ignore)
-        (save-window-excursion
-          ad-do-it))
-    ad-do-it))
+  (require 'cl-macs)
 
-(ad-activate 'compilation-start)
+  (defadvice compilation-start
+      (around inhibit-display
+              (command &optional mode name-function highlight-regexp))
+    (if (not (string-match "^\\(find\\|grep\\)" command))
+        (cl-letf (((symbol-function 'display-buffer) #'ignore))
+          (save-window-excursion ad-do-it))
+      ad-do-it))
+  (ad-activate 'compilation-start))
 #+end_src
 
 *** Search for non-ASCII characters
@@ -827,7 +823,8 @@ file.
     (let* ((file-tangle-start-time (current-time))
            (file (buffer-file-name))
            (file-nodir (file-name-nondirectory file))
-           (async-quiet-switch "-q"))
+           ;; (async-quiet-switch "-q")
+           )
       (async-start
        `(lambda ()
           (require 'org)
@@ -957,7 +954,7 @@ There's no way I could top that, so I won't attempt to.
 
   (defun amin|eshell-setup ()
     (make-local-variable 'company-idle-delay)
-    (setq company-idle-delay nil)
+    (defvar company-idle-delay nil)
     (bind-keys :map eshell-mode-map
                ("C-d"   . amin/eshell-quit-or-delete-char)
                ("C-S-l" . amin/eshell-clear)
@@ -996,6 +993,13 @@ There's no way I could top that, so I won't attempt to.
    '(("default"
       ("dired" (mode . dired-mode))
       ("org"   (mode . org-mode))
+      ("gnus"
+       (or
+        (mode . gnus-group-mode)
+        (mode . gnus-summary-mode)
+        (mode . gnus-article-mode)
+        ;; not really, but...
+        (mode . message-mode)))
       ("web"
        (or
         (mode . web-mode)
@@ -1005,20 +1009,21 @@ There's no way I could top that, so I won't attempt to.
       ("shell"
        (or
         (mode . eshell-mode)
-        (mode . shell-mode)))
-      ("notmuch" (name . "\*notmuch\*"))
+        (mode . shell-mode)
+        (mode . term-mode)))
       ("programming"
        (or
         (mode . python-mode)
+        (mode . c-mode)
         (mode . c++-mode)
-        (mode . emacs-lisp-mode)))
+        (mode . emacs-lisp-mode)
+        (mode . scheme-mode)
+        (mode . haskell-mode)
+        (mode . lean-mode)))
       ("emacs"
        (or
         (name . "^\\*scratch\\*$")
-        (name . "^\\*Messages\\*$")))
-      ("slack"
-       (or
-        (name . "^\\*Slack*"))))))
+        (name . "^\\*Messages\\*$"))))))
   (ibuffer-formats
    '((mark modified read-only locked " "
            (name 18 18 :left :elide)
@@ -1472,19 +1477,11 @@ instead.
   :hook (web-mode css-mode html-mode sgml-mode))
 #+end_src
 
-** Nix
-
-#+begin_src emacs-lisp
-(use-package nix-mode
-  :defer t
-  :mode "\\.nix\\'")
-#+end_src
-
-** Java
+** COMMENT Java
 
 *** meghanada
 
-#+begin_src emacs-lisp :tangle no
+#+begin_src emacs-lisp
 (use-package meghanada
   :bind
   (:map meghanada-mode-map
@@ -1511,7 +1508,7 @@ tree-mode
 treemacs
 #+end_comment
 
-#+begin_src emacs-lisp :tangle no
+#+begin_src emacs-lisp
 (use-package treemacs
   :config (setq treemacs-never-persist t))
 
@@ -1561,6 +1558,23 @@ treemacs
   :after (treemacs))
 #+end_src
 
+** geiser
+
+#+begin_src emacs-lisp
+(use-package geiser)
+
+(use-package geiser-guile
+  :config
+  (setq geiser-guile-load-path "~/src/git/guix"))
+#+end_src
+
+** guix
+
+#+begin_src emacs-lisp
+(use-package guix
+  :load-path "lib/guix/elisp")
+#+end_src
+
 * Emacs Enhancements
 
 ** [[https://github.com/justbur/emacs-which-key][which-key]]
@@ -1776,11 +1790,10 @@ Make =*scratch*= and =*Messages*= unkillable.
 
 Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
 
-** [[https://github.com/DarthFennec/highlight-indent-guides][highlight-indent-guides]]
+** COMMENT [[https://github.com/DarthFennec/highlight-indent-guides][highlight-indent-guides]]
 
 #+begin_src emacs-lisp
 (use-package highlight-indent-guides
-  :disabled t
   :defer 3
   :hook ((prog-mode . highlight-indent-guides-mode)
          ;; (org-mode  . highlight-indent-guides-mode)
@@ -1813,12 +1826,6 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
         ("l"   . image-forward-hscroll)))
 #+end_src
 
-** anzu
-
-#+begin_src emacs-lisp
-(use-package anzu)
-#+end_src
-
 ** typo.el
 
 #+begin_src emacs-lisp
@@ -1869,13 +1876,12 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]].
         ""))))
 #+end_src
 
-** slack
+** COMMENT slack
 
 Hopefully temporary.
 
 #+begin_src emacs-lisp
 (use-package slack
-  :disabled t
   :commands (slack-start)
   :init
   (eval-when-compile                    ; silence the byte-compiler
@@ -2000,8 +2006,10 @@ Hopefully temporary.
  read-mail-command   'gnus)
 
 (use-package gnus
-  :bind (("s-m" . gnus)
-         ("s-M" . gnus-unplugged))
+  :bind (("C-c m" . gnus)
+         ("C-c M" . gnus-unplugged)
+         ("s-m"   . gnus)
+         ("s-M"   . gnus-unplugged))
   :init
   (setq
    gnus-select-method '(nnnil "")
@@ -2221,11 +2229,10 @@ I tried using =borg-elpa= instead of doing it like this, but it added
   (bbdb-initialize 'gnus 'message))
 #+end_src
 
-** message-x
+** COMMENT message-x
 
 #+begin_src emacs-lisp
 (use-package message-x
-  :disabled t
   :custom
   (message-x-completion-alist
    (quote
@@ -2237,11 +2244,10 @@ I tried using =borg-elpa= instead of doing it like this, but it added
       . message-expand-group)))))
 #+end_src
 
-** gnus-harvest
+** COMMENT gnus-harvest
 
 #+begin_src emacs-lisp
 (use-package gnus-harvest
-  :disabled t
   :commands gnus-harvest-install
   :demand t
   :config
@@ -2287,4 +2293,5 @@ Display how long it took to load the init file.
 * COMMENT Local Variables                                           :ARCHIVE:
 # Local Variables:
 # eval: (add-hook 'after-save-hook #'amin/async-babel-tangle 'append 'local)
+# eval: (typo-mode -1)
 # End: