Merge branch 'master' of metalzone:etc/profile

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 9067aa85f41e8eff71d3949b56b8829f1b0dc0d1..b2c35ecb19e179f2b735189a888c503a05151ef2 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -726,7 +726,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\\):"))