From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 3 Dec 2009 13:25:57 +0000 (+0000)
Subject: dot/emacs: Some Perforce tweaks.
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/ab9e097f3a2b6fb3774c57a5cbca7ec67eb25a65?hp=c383eb8af65757b6e0a981f3ad079851d021230c

dot/emacs: Some Perforce tweaks.

  * Load Perforce support if it's available and we don't mind taking
    some time over it.

  * Persuade `shell' mode to notice `Enter password:' as soliciting a
    password.
---

diff --git a/dot/emacs b/dot/emacs
index a2b6ece..482e561 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)))
@@ -724,8 +726,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.