Merge commit 'origin'

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index aa206cf..b1c5e4b 100644 (file)
--- 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)))
@@ -89,8 +91,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.
 
@@ -727,8 +728,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.