X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/07965a3978b656cabc38cbac52fde1ed17dd8332..3459d2cb13fc7275693ed1f9e2d5e9a7af0b99ec:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index aa206cf..cbb825a 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -45,7 +45,7 @@
      (add-to-list 'auto-mode-alist
 		  `(,(concat "/debian/"
 			       "\\("
-			         "[" "[:lower:][:digit:]]"
+				 "[" "[:lower:][:digit:]]"
 				     "[[:lower:][:digit:].+-" "]+"
 				 "\\."
 			       "\\)?"
@@ -54,10 +54,10 @@
 
 (and (library-exists-p "vc-git")
      (not (memq 'GIT vc-handled-backends))
+     (not (memq 'Git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
-(and (library-exists-p "quilt")
-     (not mdw-fast-startup)
-     (load "quilt"))
+
+(trap (or mdw-fast-startup (require 'p4)))
 
 (trap (or mdw-fast-startup (require 'tex-site)))
 
@@ -89,8 +89,7 @@
 (and (or window-system (>= emacs-major-version 23))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
 		  gnuserv-frame t)
-	    (trap (server-start))
-	    (trap (gnuserv-start))))
+	    (trap (server-start))))
 
 ;; Control backup behaviour.
 
@@ -203,6 +202,9 @@
 (setq-default fill-column 77)		;I use rather narrow windows
 (setq-default comment-column 40)	;Set a standard comment column
 (setq-default truncate-partial-width-windows nil)
+(setq default-indicate-empty-lines t)
+(setq whitespace-style
+      '(trailing space-before-tab space-after-tab empty indentation))
 (setq woman-use-own-frame nil)		;Keep man pages somewhere sensible
 (setq diff-switches "-u"		;I like reading unified diffs
       cvs-diff-flags (list diff-switches))
@@ -214,6 +216,8 @@
 (setq x-gtk-file-dialog-help-text nil)
 (setq Info-fontify-maximum-menu-size 100000)
 (setq set-mark-command-repeat-pop t)
+(setq-default proced-filter 'all
+	      proced-sort 'user)
 (setq ispell-program-name "aspell"
       ispell-local-dictionary "en_GB-ize-w_accents"
       flyspell-default-dictionary "en_GB-ize-w_accents"
@@ -369,15 +373,12 @@
 	 (scroll-bar-width . 15)
 	 (cursor-color . "red"))
        (if mdw-black-background
-	   '((background-color . "black")
-	     (foreground-color . "white")
-	     (background-mode . dark))
+	   '((background-mode . dark))
 	 '((background-mode . light)))
        (and (eq window-system 'pm)
 	    '((font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
 	      (menu-font . "8.Helv")
 	      (background-color . "lightgrey")))
-       '((transparency . t))
        default-frame-alist))
 
 ;; Other frame fiddling.
@@ -520,22 +521,18 @@
 	       (tramp-copy-program nil)
 	       (tramp-copy-args nil)
 	       (tramp-copy-keep-date-arg nil)
-	       (tramp-login-args ("TERM=dumb" "%u")))
+	       (tramp-login-args (("TERM=dumb" "%u"))))
 	      ("really"
 	       (tramp-connection-function tramp-open-connection-su)
 	       (tramp-login-program "really")
-	       (tramp-login-args ("-u" "%u" "--"
-				  "env" "TERM=dumb" "/bin/sh"))
+	       (tramp-login-args (("-u" "%u")
+				  ("--")
+				  ("env" "TERM=dumb" "/bin/sh")))
 	       (tramp-copy-program nil)
 	       (tramp-copy-args nil)
 	       (tramp-copy-keep-date-arg nil)
 	       (tramp-remote-sh "/bin/sh"))
 	      ,@tramp-methods)))
-     (setq tramp-multi-connection-function-alist
-	   (mdw-uniquify-alist
-	    '(("bc" tramp-multi-connect-su "become TERM=dumb %u%n"))
-	    '(("r" tramp-multi-connect-su "really -u %u%n"))
-	    tramp-multi-connection-function-alist))
      (setq tramp-default-method "ssh")
      (setq tramp-default-method-alist
 	   `(("\\`localhost\\'" ""
@@ -727,8 +724,8 @@
 
 (setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *")
 (setq comint-password-prompt-regexp
-      (concat "\\(\\([Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
-	      "[Pp]assword\\|pass phrase\\):\\s *\\'"))
+      (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
+	      "[Pp]assword\\|pass phrase\\):"))
 
 ;; Notice passwords, and make C-a work right.