1 files changed, 67 insertions, 22 deletions

@@ -87,7 +87,7 @@
   (:also-load acdw-compat
               acdw-lisp
               acdw-reading)
-  (acdw/require-private)
+  (require 'acdw-private (acdw/sync-dir "private.el") :noerror)
 
   (:option user-full-name "Case Duckworth"
            user-mail-address (rot13-string "npqj@npqj.arg"))
@@ -579,13 +579,21 @@ specific to most general, they are these:
 - `flymake-inhibit-major-modes': a list of major-modes in which
   to inhibit `flymake-mode'.  Really only useful if you want to
   generally add `flymake-mode' to `prog-mode-hook'."
-    (unless (or (bound-and-true-p flymake-inhibit) ; file-local variable
-                (list-string-match-p (buffer-name)
-                                     flymake-inhibit-buffer-name-regexps)
-                (list-string-match-p (buffer-file-name)
-                                     flymake-inhibit-file-name-regexps)
-                (apply #'derived-mode-p flymake-inhibit-major-modes))
-      (flymake-mode-on)))
+    ;; The name of this hook tells you pretty much everything you need to know
+    ;; for this little thing right here.
+    (add-hook 'hack-local-variables-hook
+              (defun flymake-unless@hack-local-variables ()
+                (unless (or (cdr (assoc 'flymake-inhibit
+                                        file-local-variables-alist))
+                            (list-string-match-p
+                             (buffer-name)
+                             flymake-inhibit-buffer-name-regexps)
+                            (list-string-match-p
+                             (buffer-file-name)
+                             flymake-inhibit-file-name-regexps)
+                            (apply #'derived-mode-p
+                                   flymake-inhibit-major-modes))
+                  (flymake-mode-on)))))
 
   (add-hook 'prog-mode-hook #'flymake-unless)
   
@@ -714,20 +722,57 @@ specific to most general, they are these:
 
 (setup mu4e
   (:load-from "/usr/share/emacs/site-lisp/mu4e")
-  (:option mu4e-change-filenames-when-moving t
-           mu4e-update-interval (* 10 60)
+  (:autoload (mu4e :interactive t)
+                 make-mu4e-context)
+  (:option message-kill-buffer-on-exit t
+           message-send-mail-function #'smtpmail-send-it
+           mu4e-change-filenames-when-moving t
+           mu4e-contexts
+           (list
+            ;; Work
+            (make-mu4e-context
+             :name "Work"
+             :match-func (lambda (msg)
+                           (when msg
+                             (string-prefix-p
+                              work-mail-dir
+                              (mu4e-message-field msg :maildir))))
+             :vars `((user-mail-address . ,work-email)
+                     (smtpmail-smtp-server . ,work-smtp-server)
+                     (mu4e-compose-format-flowed . nil)
+                     (mu4e-drafts-folder
+                      . ,(concat work-mail-dir "/[Gmail]/Drafts"))
+                     (mu4e-sent-folder
+                      . ,(concat work-mail-dir "/[Gmail]/Sent Mail"))
+                     (mu4e-refile-dir
+                      . ,(concat work-mail-dir "/[Gmail]/All Mail"))
+                     (mu4e-trash-folder
+                      . ,(concat work-mail-dir "/[Gmail]/Trash"))))
+            ;; Home
+            (make-mu4e-context
+             :name "Home"
+             :match-func (lambda (msg)
+                           (when msg
+                             (string-prefix-p
+                              home-mail-dir
+                              (mu4e-message-field msg :maildir))))
+             :vars `((user-mail-address . ,home-email)
+                     (smtpmail-smtp-server . ,home-smtp-server)
+                     (mu4e-compose-format-flowed . nil)
+                     (mu4e-drafts-folder
+                      . ,(concat home-mail-dir "/Drafts"))
+                     (mu4e-sent-folder
+                      . ,(concat home-mail-dir "/Sent"))
+                     (mu4e-refile-folder
+                      . ,(concat home-mail-dir "/Archive"))
+                     (mu4e-trash-folder
+                      . ,(concat home-mail-dir "/Trash")))))
            mu4e-get-mail-command "mbsync -a"
-           mu4e-maildir "~/mail/clickhere")
-  (:option mu4e-drafts-folder "/[Gmail]/Drafts"
-           mu4e-sent-folder "/[Gmail]/Sent Mail"
-           mu4e-refile-folder "/[Gmail]/All Mail"
-           mu4e-trash-folder "/[Gmail]/Trash"
-           mu4e-maildir-shortcuts
-           `((:maildir "/Inbox" :key ?i)
-             (:maildir ,mu4e-drafts-folder :key ?d)
-             (:maildir ,mu4e-sent-folder :key ?s)
-             (:maildir ,mu4e-refile-folder :key ?a)
-             (:maildir ,mu4e-trash-folder :key ?t))))
+           mu4e-maildir "~/mail"
+           mu4e-update-interval (* 10 60)
+           send-mail-function #'smtpmail-send-it
+           smtpmail-smtp-service 465
+           smtpmail-stream-type 'ssl))
 
 (setup page
   (:option page-delimiter
@@ -2437,7 +2482,7 @@ the default is \"/\"."
               (list
                (propertize " "
                            'display
-                           '((space
+                           `((space
                               :align-to 
                               ,(unless
                                    (bound-and-true-p visual-fill-column-mode)