Merge branch 'master' of metalzone:etc/profile

[profile] / el / dot-emacs.el

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)