Merge branch 'master' of metalzone:etc/profile

* 'master' of metalzone:etc/profile:
  dot/emacs, el/dot-emacs.el: Fix patterns for root prompt.

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\\):"))

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index f3d57e5b66ea20179d30a1423e4e0c8be35388a8..c0ab9a7912164cc1a2c0ec1b8822411c68288aaf 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -2096,7 +2096,7 @@ (defun mdw-eshell-prompt ()
            (eshell/pwd)
            right)))
 (setq eshell-prompt-function 'mdw-eshell-prompt)
-(setq eshell-prompt-regexp "^\\[[^]]+\\]")
+(setq eshell-prompt-regexp "^\\[[^]>]+\\(\\]\\|>>?\\)")
 
 (defalias 'eshell/e 'find-file)
 (defalias 'eshell/w3m 'w3m-goto-url)