summaryrefslogtreecommitdiff
path: root/lisp/eshell
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2009-11-28 17:06:30 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2009-11-28 17:06:30 +0000
commitf5467d3f9e26c60211a247cf256422149ffe8c97 (patch)
tree1b9bf6a9a3de135cc1a547196fc6067a5b5603fa /lisp/eshell
parentb55fa3c00f25d2070870c24aa19faa434fdcb452 (diff)
downloademacs-f5467d3f9e26c60211a247cf256422149ffe8c97.tar.gz
* eshell/em-prompt.el (eshell-prompt-function): Abbreviate pwd, since
`cd' doesn't always do it for us (bug#5067). * pcomplete.el (pcomplete-entries): Revert change installed mistakenly on 2009-10-25 as part of some other change (bug#5067).
Diffstat (limited to 'lisp/eshell')
-rw-r--r--lisp/eshell/em-prompt.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 6780c98374a..8d319406755 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -46,9 +46,9 @@ as is common with most shells."
(defcustom eshell-prompt-function
(function
(lambda ()
- (concat (eshell/pwd)
+ (concat (abbreviate-file-name (eshell/pwd))
(if (= (user-uid) 0) " # " " $ "))))
- "*A function that returns the Eshell prompt string.
+ "A function that returns the Eshell prompt string.
Make sure to update `eshell-prompt-regexp' so that it will match your
prompt."
:type 'function