X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/65e4a94df498c9c83b68d08a17c786f078ad26d5..c4eccb4b3553ba0dbed38e14ce9d1f13899ecb4e:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index a2b6ece..beaf7bf 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -59,6 +59,8 @@
      (not mdw-fast-startup)
      (load "quilt"))
 
+(trap (or mdw-fast-startup (require 'p4)))
+
 (trap (or mdw-fast-startup (require 'tex-site)))
 
 (trap (or mdw-fast-startup (semantic-load-enable-minimum-features)))
@@ -529,11 +531,6 @@
 	       (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\\'" ""
@@ -724,8 +721,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.