Merge from emacs-23

[gnu-emacs] / lisp / eshell / em-prompt.el

diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 6780c98374af775e36ab498358d46e6f58de389d..6e8abd660d10fa9033dde757f8401c78b1ce0e56 100644 (file)
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -1,7 +1,7 @@
 ;;; em-prompt.el --- command prompts
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009  Free Software Foundation, Inc.
+;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -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