X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/f617db13b0685c674817a6c7c1d148da3c07081f..b1d0353df9607ce4fceb387a0d7b123eb397e6f2:/vm

diff --git a/vm b/vm
index 4f23c6b..3abaebb 100644
--- a/vm
+++ b/vm
@@ -2,60 +2,73 @@
 ;;;
 ;;; Configuration for VM
 
-(setq vm-reply-subject-prefix "Re: ")
-(setq vm-included-text-prefix "> ")
-(setq vm-included-text-attribution-format "%F <%f> wrote:\n\n")
-;;(setq vm-spool-files '("/home/mdw/Mailbox"
-;;		       "imap:tux.nsict.org:143:inbox:login:mdw:*"))
-(setq vm-folder-directory "~/Mail/")
-(setq vm-startup-with-summary t)
-(setq vm-skip-deleted-messages nil)
-(setq vm-circular-folders nil)
-(setq vm-preview-lines nil)
-(setq vm-highlighted-header-regexp "^From\\|^Subject")
-(setq vm-delete-after-saving t)
-(setq vm-move-after-deleting t)
-(setq vm-delete-empty-folders)
-(setq vm-mime-qp-encoder-program "mimencode")
-(setq vm-mime-qp-encoder-switches '("-q"))
-(setq vm-mime-qp-decoder-program "mimencode")
-(setq vm-mime-qp-decoder-switches '("-q" "-u"))
-(setq vm-mime-base64-encoder-program "mimencode")
-(setq vm-mime-base64-encoder-switches '("-b"))
-(setq vm-mime-base64-decoder-program "mimencode")
-(setq vm-mime-base64-decoder-switches '("-b" "-u"))
+(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"
+      vm-folder-directory "~/Mail/"
+      vm-startup-with-summary t
+      vm-skip-deleted-messages nil
+      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)
+
+(setq vm-mime-qp-encoder-program "mimencode"
+      vm-mime-qp-encoder-switches '("-q")
+      vm-mime-qp-decoder-program "mimencode"
+      vm-mime-qp-decoder-switches '("-q" "-u")
+      vm-mime-base64-encoder-program "mimencode"
+      vm-mime-base64-encoder-switches '("-b")
+      vm-mime-base64-decoder-program "mimencode"
+      vm-mime-base64-decoder-switches '("-b" "-u"))
+
 (setq vm-visible-headers '("resent-from:" "from:" "reply-to:" "sender:"
 			   "to:" "apparently-to:" "cc:"
 			   "subject:" "date:"
 			   "delivered-to:" "return-path:"))
+
 (setq vm-reply-ignored-addresses '("mdw@excessus\\.demon\\.co\\.uk"
 				   "mdw@nsict\\.org" "mdw@eh\\.org"
 				   "mdw@ncipher\\.com"
+				   "mwooding@ncipher\\.com"
+				   "submit@bugs\\.ncipher\\.com"
+				   "mdw@chiark\\.greenend\\.org\\.uk"
 				   "mdw@distorted\\.org\\.uk"
 				   "mdw@metalzone\\.distorted\\.org\\.uk"
-				   "mwooding@ncipher\\.com"
 				   "tux@nsict\\.org"))
 
 (defvar mdw-mailing-lists
   '("hibachi-dealers-members@chiark\\.greenend\\.org\\.uk"))
 
 (setq vm-mime-external-content-types-alist
-      '(("image/jpeg" "eog")
-	("image/jpg" "eog")
-	("image/gif" "eog")
-	("image/tiff" "eog")))
+      '(("image/jpeg" "display")
+	("image/jpg" "display")
+	("image/gif" "display")
+	("image/bmp" "display")
+	("image/tiff" "display")
+	("application/postscript" "evince")
+	("application/pdf" "evince")))
 
-(setq vm-url-browser "galeon")
+(setq vm-url-browser "firefox")
 
 (setq vm-frame-parameter-alist
-      '((folder ((width . 80) (height . 33)))
-	(summary ((width . 80) (height . 33)))
-	(primary-summary ((width . 80) (height . 33)))
-	 ))
+      '((folder ((width . 81) (height . 33)))
+	(summary ((width . 81) (height . 33)))
+	(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
@@ -67,7 +80,7 @@
 	(princ del)
 	(princ (car strings))
 	(setq strings (cdr strings))))))
-	
+
 (defun mdw-vm-fix-mailing-lists ()
   (save-restriction
     (save-excursion
@@ -96,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)