X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/6b3f86c6b6be29c634c1d4b7b1461c539bcc6df3..8af1d2ed80edf9197b9697d36b7bb01fd5265488:/vm

diff --git a/vm b/vm
index d3824cc..3abaebb 100644
--- a/vm
+++ b/vm
@@ -2,6 +2,13 @@
 ;;;
 ;;; Configuration for VM
 
+(let ((path exec-path))
+  (while path
+    (let ((try (expand-file-name "movemail" (car path))))
+      (if (file-executable-p try)
+	  (setenv "REAL_MOVEMAIL" try))
+      (setq path (cdr path)))))
+
 (setq vm-reply-subject-prefix "Re: "
       vm-included-text-prefix "> "
       vm-included-text-attribution-format "%F <%f> wrote:\n\n"
@@ -11,6 +18,7 @@
       vm-circular-folders nil
       vm-preview-lines nil
       vm-highlighted-header-regexp "^From\\|^Subject"
+      vm-movemail-program "movemail-hack"
       vm-delete-after-saving t
       vm-move-after-deleting t
       vm-delete-empty-folders)
@@ -48,8 +56,8 @@
 	("image/gif" "display")
 	("image/bmp" "display")
 	("image/tiff" "display")
-	("application/postscript" "gv")
-	("application/pdf" "gv")))
+	("application/postscript" "evince")
+	("application/pdf" "evince")))
 
 (setq vm-url-browser "firefox")
 
@@ -59,7 +67,8 @@
 	(primary-summary ((width . 81) (height . 33)))))
 
 (setq vm-auto-folder-alist
-      '(("delivered-to" ("root@" . "admin"))))
+      '(("delivered-to" ("root@" . "admin"))
+	("from" ("Cron Daemon" . "admin"))))
 
 (defun join-strings (del strings)
   (with-output-to-string
@@ -100,3 +109,10 @@
 		  (insert (format "To: %s\n" (join-strings ", " new))))))))))
 
 (add-hook 'vm-reply-hook 'mdw-vm-fix-mailing-lists)
+
+(defun mdw-mark-as-spam ()
+  (interactive)
+  (save-window-excursion
+    (vm-pipe-message-to-command "userv spamd spam" 1))
+  (vm-delete-message 1))
+(define-key vm-summary-mode-map "/" 'mdw-mark-as-spam)