avoid nested if - seems to break

[ian-dotfiles.git] / files / emacs_ian.el

diff --git a/files/emacs_ian.el b/files/emacs_ian.el
index 6d83df0b10d914ad6c0003a4e55d932ff4b61f66..e11181ca8fe585c5f9861df611768e9bbe8a81f6 100644 (file)
--- a/files/emacs_ian.el
+++ b/files/emacs_ian.el
@@ -4,6 +4,7 @@
 ; Un-disable narrow and eval-expression
 (put 'narrow-to-region 'disabled nil)
 (put 'eval-expression 'disabled nil)
+(standard-display-european t)
 ;
 ; Make sure we don't disturb links or change ownership, use numbers
 (setq backup-by-copying-when-mismatch t)
@@ -49,7 +50,6 @@
                             (local-set-key "\7f" 'scroll-down))))
       (define-key isearch-mode-map "\1c" 'isearch-repeat-forward)
       (define-key isearch-mode-map "\1d" 'isearch-quote-char)))
-(setq Info-directory-list '("/jura:/usr/info" "/dover:/usr/info"))
 ;
 (menu-bar-mode -1)
 (defun terminal-keybindings ()
@@ -183,7 +183,7 @@
 ;
 ; Use auto-fill when editing text
 (add-hook 'text-mode-hook '(lambda () (auto-fill-mode 1)))
-(add-hook 'text-mode-hook '(lambda () (local-set-key " " 'self-insert-command)))
+; (add-hook 'text-mode-hook '(lambda () (local-set-key "       " 'self-insert-command)))
 ;
 ; Set up newline to auto-indent & other stuff for perl, c++ and c modes.
 (setq perl-mode-hook '(lambda () 
@@ -314,16 +314,19 @@ then call send-and-exit."
 ;
 ; VM stuff
 (load-file "~/private/private.el")
+(if (file-exists-p "~/private/private2.el")
+  (load-file "~/private/private2.el"))
 (setq vm-included-text-attribution-format "%F writes (\"%s\"):\n"
       vm-reply-subject-prefix "Re: "
       vm-folder-directory "~/mail/"
       vm-delete-after-saving t
       vm-delete-empty-folders t
-      vm-mutable-windows nil
+      vm-mutable-windows t
       vm-auto-get-new-mail nil
       vm-auto-next-message nil
       vm-jump-to-new-messages nil
       vm-jump-to-unread-messages nil
+      vm-mime-digest-discard-header-regexp "only-drop-this-header"
       vm-preview-lines nil
       vm-included-text-prefix "> "
       vm-confirm-quit 1
@@ -340,13 +343,50 @@ then call send-and-exit."
       vm-frame-per-folder nil
       vm-tale-is-an-idiot t
       vm-primary-inbox (concat vm-folder-directory "INBOX")
-      vm-sysadmin-inbox (concat vm-folder-directory "SINBOX")
+      vm-sinbin-inbox (concat vm-folder-directory "SINBOX")
       vm-uninteresting-senders "ian"
       vm-reply-ignored-addresses
       (make-regexps-ignore-non-address
        '("ian@chiark.chu.cam.ac.uk" "ian" "iwj10@cus.cam.ac.uk"
          "ian@chiark.greenend.org.uk"
          "ijackson@nyx.cs.du.edu" "ijackson@gnu.ai.mit.edu"))
+      vm-primary-inbox (concat vm-folder-directory "INBOX")
+
+      vm-uninteresting-senders "ian"
+      vm-reply-ignored-addresses
+      (make-regexps-ignore-non-address
+       '("ijackson@chiark.chu.cam.ac.uk" "ijackson"
+         "iwj10@thor.cam.ac.uk" "iwj10@hermes.cam.ac.uk" "iwj10@cl.cam.ac.uk"
+         "iwj10@cam.ac.uk" "Ian.Jackson@cl.cam.ac.uk"))
+      mail-archive-file-name "~/mail/Outbound"
+
+@@?!$ncipher?@@
+      vm-spool-files
+      '((vm-primary-inbox "/var/spool/mail/@@$username@@"
+                         "~/mail/INBOX.CRASH")
+        (vm-primary-inbox "~/News/r" "~/mail/INBOX.CRASH")
+       (vm-primary-inbox "~/mbox" "~/mail/INBOX.CRASH")
+       (vm-primary-inbox "~/mail/Outbound" "~/mail/INBOX.CRASH")
+       (vm-primary-inbox "~/mail/Import" "~/mail/INBOX.CRASH")
+       (vm-primary-inbox "~/mail/Record" "~/mail/INBOX.CRASH")
+       (vm-sinbin-inbox "/var/spool/mail/ian" "~/mail/SINBOX.CRASH"))
+      vm-startup-with-summary t
+
+@@:
+      vm-spool-files (list
+                      "~/mbox"
+                      "~/mail/Outbound"
+                      "~/mail/Record"
+                      "~/mail/Import"
+                      "~/mail/inbox"
+;                       "/var/spool/mail/ijackson"
+                      (concat "mail:110:pass:iwj:" ijackson-pop-password)
+                      "/u/ijackson/mail/INBOX.CRASH"
+                      "~/News/r")
+      mail-host-address "ncipher.com"
+      user-mail-address "iwj@ncipher.com"
+@@;
+
 ;      vm-spool-files
 ;      (list
 ;       (list vm-primary-inbox "~/mbox" "~/mail/INBOX.CRASH")
@@ -375,7 +415,7 @@ then call send-and-exit."
 (add-hook 'vm-mode-hook
           '(lambda ()
              (local-set-key "Q" 'vm-quit)
-             (local-set-key "q" "#Q")))
+             (local-set-key "q" "###Q")))
 (add-hook 'mail-mode-hook
           '(lambda ()
              (if (and (boundp 'folder-buffer)
@@ -390,13 +430,13 @@ then call send-and-exit."
                    (setq mail-archive-file-name
                          "~/mail/SOutbound")))))
 ;
-(defun vmi ()
-  (interactive)
-  (vm "/u/ijackson/mail/INBOX"))
-;
+;(defun vmi ()
+;  (interactive)
+;  (vm "/u/ijackson/mail/INBOX"))
+;;
 (defun vms ()
   (interactive)
-  (vm vm-sysadmin-inbox))
+  (vm vm-sinbin-inbox))
 ;
 (defun make-session ()
   "Makes this emacs hard to kill by requiring ^X^Cy to kill it