dot/emacs, el/dot-emacs.el: Fix patterns for root prompt.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index fe58c97..c291fdd 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -55,6 +55,7 @@
 (and (library-exists-p "vc-git")
      (not (memq 'GIT vc-handled-backends))
      (not (memq 'Git vc-handled-backends))
+     (not (memq 'git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
 (trap (or mdw-fast-startup (require 'p4)))
@@ -723,7 +724,7 @@
 
 ;; Make the shell mode aware of my prompt.
 
-(setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *")
+(setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *")
 (setq comint-password-prompt-regexp
       (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
              "[Pp]assword\\|pass phrase\\):"))