nits

4 files changed, 27 insertions, 21 deletions

diff --git a/completion.org b/completion.org
index 8ef7f67..5d71e9e 100644
--- a/completion.org
+++ b/completion.org
@@ -14,6 +14,16 @@
             completion-category-overrides
             '((file (styles . (partial-completion))))))
   #+end_src
+* imenu
+  #+begin_src emacs-lisp
+    (use-package imenu
+      :init (setq org-imenu-depth 7)
+      :config
+      (defun jao-imenu-hook ()
+        (cond ((derived-mode-p 'org-mode) (org-reveal t))
+              (outline-minor-mode (outline-show-entry))))
+      (add-hook 'imenu-after-jump-hook #'jao-imenu-hook))
+  #+end_src
 * orderless
   #+begin_src emacs-lisp
     (use-package orderless
@@ -137,7 +147,7 @@
         :ensure t
         :bind (("C-x M-:" . consult-complex-command)
                ("C-x b" . consult-buffer)
-               ("C-x C-b" . consult-buffer)
+               ("C-x C-b" . switch-to-buffer)
                ("C-c b" . project-find-file)
                ("C-c h" . consult-history)
                ("C-c i" . consult-imenu)
@@ -569,13 +579,3 @@
              ("C-c l" . link-hint-open-multiple-links)))
 
   #+end_src
-* imenu
-  #+begin_src emacs-lisp
-    (use-package imenu
-      :init (setq org-imenu-depth 7)
-      :config
-      (defun jao-imenu-hook ()
-        (cond ((derived-mode-p 'org-mode) (org-reveal t))
-              (outline-minor-mode (outline-show-entry))))
-      (add-hook 'imenu-after-jump-hook #'jao-imenu-hook))
-  #+end_src
diff --git a/gnus.org b/gnus.org
index 7ba4d17..29e1dab 100644
--- a/gnus.org
+++ b/gnus.org
@@ -245,13 +245,16 @@
           ("nnml:bigml.[^ibs]" "W" jao-themes-dimm)
           ("nnml:jao.[^ist]" "J" jao-themes-dimm)
           (,(format "^nnml:%s" (regexp-opt feeds)) "F" jao-themes-dimm)
-          ("^gmane\\|^gwene" "G" jao-themes-dimm)
+          ("^gmane" "G" jao-themes-dimm)
           ("nnml:local" "l" jao-themes-dimm))))
 
     (defun jao-gnus--unread-counts ()
       (seq-reduce (lambda (r g)
                     (let ((n (gnus-group-unread (car g))))
-                      (if (and (numberp n) (> n 0)) (cons (cons (car g) n) r) r)))
+                      (if (and (numberp n) (> n 0))
+                          (prog1 (cons (cons (car g) n) r)
+                            (gnus-message 7 "%s in %s" n g))
+                        r)))
                   gnus-newsrc-alist
                   ()))
 
@@ -445,7 +448,7 @@
              (expiry-wait . 1)
              (expiry-target . delete))
             ("nnml:jao\\..*"
-             (jao-gnus--trash-group "nnml:jao.trash")
+             (jao-gnus--trash-group "nnml:trash")
              (jao-gnus--spam-group "nnml:spam")
              (jao-gnus--archiving-group "nnml:jao.trove"))
             ("nnml:\\(jao\\|bigml\\)\\.\\(trash\\|spam\\)"
@@ -459,7 +462,7 @@
              (gcc-self . t))
             ("nnml:bigml\\..*"
              (posting-style (address "jao@bigml.com"))
-             (jao-gnus--trash-group "nnml:jao.trash")
+             (jao-gnus--trash-group "nnml:trash")
              (jao-gnus--spam-group "nnml:spam")
              (jao-gnus--archiving-group "nnml:bigml.trove"))
             ("nnml:bigml\\.inbox"
diff --git a/init.org b/init.org
index f05207c..ba9d3da 100644
--- a/init.org
+++ b/init.org
@@ -1601,15 +1601,18 @@
                                (read-string "Feed URL: "))))
         (let* ((url+title (if (consp url) url (list url)))
                (url (car url+title))
-               (title (cdr url+title)))
+               (title (cdr url+title))
+               (cats (mapcar (lambda (f) (car (last (split-string f "\\."))))
+                             (directory-files nnml-directory nil "feeds"))))
           (if url
               (let ((url (if (string-match "^feed:" url) (substring url 5) url)))
                 (when (y-or-n-p (format "Subscribe to <%s>? " url))
                   (let* ((name (read-string "Feed name: " title))
-                         (cat (completing-read "Category: "
-                                               (jao-list-mailboxes "feeds")
-                                               nil t)))
-                    (jao-rss2e-append name url cat)
+                         (cat (completing-read "Category: " cats nil t))
+                         (subs (format "r2e add %s '%s' feeds.%s@localhost"
+                                       name url cat)))
+                    ;; (jao-rss2e-append name url cat)
+                    (shell-command-to-string subs)
                     (shell-command (format "r2e run %s" name)))))
             (message "No feeds found"))))
     #+end_src
diff --git a/org.org b/org.org
index d59ad91..e757a40 100644
--- a/org.org
+++ b/org.org
@@ -212,7 +212,7 @@
         (interactive)
         (consult-recoll (format "dir:%s" jao-org-notes-dir)))
 
-      (jao-transient-major-mode+ org
+      (jao-transient-major-mode org
         ["Notes"
          ("o" "find and open note" jao-org-notes-open)
          ("c" "open or create note" jao-org-notes-open-or-create)