X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/6dc106123aa94d1bbf790dd9edd808fa9bb808a7..393e450ba47288aba552c230c60140f70197f545:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 22da44c..bd4d004 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -201,7 +201,7 @@
 
 (setq mail-user-agent 'message-user-agent
       read-mail-command 'gnus)
-(setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$"
+(setq message-signature-separator "^-- \\(\\[mdw\\]\\)?$"
       message-yank-prefix "> "
       message-yank-cited-prefix "> "
       message-send-mail-function 'message-send-mail-with-sendmail
@@ -233,23 +233,25 @@
       (lambda ()
 	(let ((group gnus-newsgroup-name))
 	  (and (string-match "^nn\\(imap\\|folder\\)\\+" group)
-	       (not (string-match (concat ":" "\\(" "crap"
-					      "\\|" "spam"
-					      "\\|" "lists"
-					      "\\|" "corpus"
-					      "\\)" "\\.")
+	       (not (string-match (concat ":" "\\(" "\\(" "crap"
+						    "\\|" "spam"
+						    "\\|" "lists"
+						    "\\|" "corpus"
+						    "\\)" "\\."
+					      "\\|" "Junk Email$"
+					      "\\)")
 				  group)))))
       bbdb-user-mail-names
       (concat "^"
 	      "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
-		    "\\([-+][^@]*\\|\\)"
+		    "\\([-+][^@]*\\)?"
 		    "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
 	      "\\|" "\\(" "\\(mdw\\|mwooding\\)"
 			  "\\(\\+[^@]*\\)?"
 		    "\\|" "0" "\\(mdw\\|mwooding\\)" "k\\.[^@]*"
 		    "\\)" "@"
 		    "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk"
-	      "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
+	      "\\|" "distorted\\.mdw@g\\(oogle\\)?mail.com"
 	      "\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
 	      "\\|" "mark\\.wooding@trustonic\\.com"
 	      "\\)$")
@@ -889,9 +891,9 @@
 			     ((executable-find "sudo") "sudo")
 			     (t "su")))
 	   (this-host (concat "\\`\\(localhost\\|"
-			      (system-name) "\\|\\)\\'"))
+			      (system-name) "\\)?\\'"))
 	   (this-user (concat "\\`\\(" (user-login-name) "\\|"
-			      (user-real-login-name) "\\|\\)\\'")))
+			      (user-real-login-name) "\\)?\\'")))
        (setq tramp-default-method-alist
 	     `((,this-host nil ,rootlyness)
 	       (nil ,this-user "ssh")
@@ -936,7 +938,7 @@
 (setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *")
 (setq comint-password-prompt-regexp
       (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
-	      "[Pp]assword\\|[Pp]ass ?phrase\\(\\| [-a-zA-Z0-9._]+\\)\\):")
+	      "[Pp]assword\\|[Pp]ass ?phrase\\( [-a-zA-Z0-9._]+\\)?\\):")
       comint-file-name-chars "~/A-Za-z0-9+@:_.$#%,={}-"
       shell-file-name-chars comint-file-name-chars)