Merge branch 'main' of https://tildegit.org/acdw/emacs

3 files changed, 43 insertions, 21 deletions

@@ -27,6 +27,11 @@
                 (nnir-search-engine imap))
         (nntp "news.tilde.club")))
 
+;;; Gnus cloud
+(setq gnus-cloud-method "nnimap:fastmail.com"
+      gnus-cloud-storage-method 'base64 ; Don't always have GPG or gzip
+      )
+
 ;;; Gnus subscriptions
 (setq gnus-options-subscribe (rx (or ;; all alternatives go under this
                                   (seq string-start
@@ -752,26 +752,35 @@ if ripgrep is installed, otherwise `consult-grep'."
 
 (setup (:straight geiser))
 
-(setup (:straight slime)
+(setup common-lisp-ide
+  (defvar acdw/cl-ide :sly)
   (defvar acdw/lisp-bin (or (executable-find "sbcl")
                             (executable-find "clisp")))
   (:needs acdw/lisp-bin)
-  
-  (:also-load slime-autoloads)
-  
   (:option inferior-lisp-program acdw/lisp-bin)
-
-  (when-let ((slime-helper (or (expand-file-name-exists-p
-                                "~/quicklisp/slime-helper.el")
-                               (expand-file-name-exists-p
-                                "~/var/quicklisp/slime-helper.el"))))
-    (load slime-helper))
-
-  (with-eval-after-load 'company
-    (setup (:straight slime-company)
-      (:option slime-company-completion 'fuzzy
-               slime-company-after-completion nil)
-      (slime-setup '(slime-fancy slime-company)))))
+  
+  (pcase acdw/cl-ide
+    (:slime
+     (setup (:straight slime)
+       (:also-load slime-autoloads)
+       
+       (when-let ((slime-helper (or (expand-file-name-exists-p
+                                     "~/quicklisp/slime-helper.el")
+                                    (expand-file-name-exists-p
+                                     "~/var/quicklisp/slime-helper.el"))))
+         (load slime-helper))
+
+       (with-eval-after-load 'company
+         (setup (:straight slime-company)
+           (:option slime-company-completion 'fuzzy
+                    slime-company-after-completion nil)
+           (slime-setup '(slime-fancy slime-company))))))
+
+    (:sly
+     (setup (:straight sly)
+       (:option sly-kill-without-query-p t)
+       
+       (:also-load sly-autoloads)))))
 
 (setup (:straight (gemini-mode
                    :host nil
@@ -971,8 +980,8 @@ if ripgrep is installed, otherwise `consult-grep'."
 
 (setup (:straight which-key)
   (:option which-key-show-early-on-C-h t
-           which-key-idle-delay 0.05
-           which-key-idle-secondary-delay 0.05
+           which-key-idle-delay 1
+           which-key-idle-secondary-delay 0.5
            which-key-delay-functions '(acdw/which-key-delay-all-but))
 
   (defun acdw/which-key-delay-all-but (seq len)
@@ -981,9 +990,9 @@ if ripgrep is installed, otherwise `consult-grep'."
      ;; With C-z binds (`acdw/leader'), pop up right away
      ((string-prefix-p "C-z" seq :ignore-case) 0)
      ;; Also pop up right away if we're already entering keys
-     ((> len 1) 0)
-     ;; Otherwise, wait 1.25 seconds
-     (t 1.25)))
+     ((> len 1) which-key-idle-secondary-delay)
+     ;; Otherwise, wait
+     (t which-key-idle-delay)))
   
   (which-key-setup-minibuffer)
   (which-key-mode +1))
@@ -30,6 +30,14 @@
 
 ;;; Utility functions
 
+(defun dos2unix (buffer)
+  "Replace \r\n with \n in BUFFER."
+  (interactive "*b")
+  (save-excursion
+    (goto-char (point-min))
+    (while (search-forward (string ?\C-m ?\C-j) nil t)
+      (replace-match (string ?\C-j) nil t))))
+
 (defun expand-file-name-exists-p (&rest expand-file-name-args)
   "Call `expand-file-name' on EXPAND-FILE-NAME-ARGS, returning
   its name if it exists, or NIL otherwise."