Merge branch 'master' of git+ssh://boyle.nsict.org/~mdw/etc/profile

diff --git a/bashrc b/bashrc
index 6587800cb3a2cdd262946c48ea027c808a38037c..5f9e13e6c6fda86be22476dc5693e8ecf6c52b80 100644 (file)
--- a/bashrc
+++ b/bashrc
@@ -143,7 +143,7 @@ alias pstree="pstree -Ghl"
 alias cdtmp='cd ${TMPDIR-/tmp}'
 alias pushtmp='pushd ${TMPDIR-/tmp}'
 alias e="sensible-editor"
-alias svn=svnwrap
+alias svn="svnwrap svn"
 
 @ () {
   local t="`xtitle -q`" host="$1"

diff --git a/emacs b/emacs
index 965b643bb04e209f87205a638892c6e93881238e..7149f6f5928cbf88c6dbc5fdfb7b6aa2e780ad36 100644 (file)
--- a/emacs
+++ b/emacs
@@ -313,6 +313,8 @@
                ("/\\(s\\|sh\\)/" . arm-assembler-mode)
                ("\\.\\(cmd\\|exec\\|rexx\\)$" . rexx-mode)
                ("\\.st$" . smalltalk-mode)
+               ("\\.msgs$" . messages-mode)
+               ("/all-cmds\\.in$" . cpp-messages-mode)
                ("\\.\\(tex\\|dtx\\)$" . latex-mode)
                ("\\.gc$" . haskell.-mode)
                (,(concat "^" (getenv "HOME") "/News/") . mdwmail-mode)
@@ -490,7 +492,7 @@
   ;; custom-set-variables was added by Custom -- don't edit or cut/paste it!
   ;; Your init file should contain only one such instance.
  '(url-cookie-untrusted-urls (quote (".")))
- '(url-proxy-services (quote (("http" . "tux.nsict.org:3128") ("ftp" . "tux.nsict.org:3128") ("gopher" . "tux.nsict.org:3128"))))
+ '(url-proxy-services (quote (("http" . "metalzone.distorted.org.uk:3128") ("ftp" . "metalzone.distorted.org.uk:3128") ("gopher" . "metalzone.distorted.org.uk:3128"))))
  '(w3-do-incremental-display t)
  '(w3-honor-stylesheets nil)
  '(w3-use-menus (quote (file edit view go bookmark options buffers style search emacs nil help)))

diff --git a/setup b/setup
index e26282070a01edfb9a862db6f4354e276cb8a779..633336f567d3a170a24c9b6573832ae6d2cf0794 100755 (executable)
--- a/setup
+++ b/setup
@@ -72,7 +72,7 @@ fi
 ### Install necessary things
 echo "Installing useful scripts..."
 
-for script in lesspipe.sh start-ssh-agent; do
+for script in lesspipe.sh start-ssh-agent svnwrap; do
   $echon "  $script:$echoc"
   found=
   for p in /bin /usr/bin /usr/local/bin $(echo $PATH | tr : ' '); do

diff --git a/vm b/vm
index 4f23c6ba474e91471ca1f6f6fa49399bf61c51a0..62892793c7bfa338923b983343b9b0a27d1855c3 100644 (file)
--- a/vm
+++ b/vm
@@ -5,8 +5,6 @@
 (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)
@@ -31,32 +29,35 @@
 (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" "gv")
+       ("application/pdf" "gv")))
 
-(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"))))
 
-
 (defun join-strings (del strings)
   (with-output-to-string
     (if (null strings)
@@ -67,7 +68,7 @@
        (princ del)
        (princ (car strings))
        (setq strings (cdr strings))))))
-       
+
 (defun mdw-vm-fix-mailing-lists ()
   (save-restriction
     (save-excursion