-

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

diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 3e87acc6d1ebcf94cba8b948eb3cb3edc064b6ce..578b6d6a7bc74f8ca62bbac1ab49a10adfeec5ec 100644 (file)
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -1,6 +1,6 @@
-;;; em-prompt.el --- command prompts
+;;; em-prompt.el --- command prompts  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2016 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
@@ -26,14 +26,16 @@
 
 ;;; Code:
 
+(require 'esh-mode)
 (eval-when-compile (require 'eshell))
 
 ;;;###autoload
-(eshell-defgroup eshell-prompt nil
+(progn
+(defgroup eshell-prompt nil
   "This module provides command prompts, and navigation between them,
 as is common with most shells."
   :tag "Command prompts"
-  :group 'eshell-module)
+  :group 'eshell-module))
 
 ;;; User Variables:
 
@@ -43,6 +45,8 @@ as is common with most shells."
   :type 'hook
   :group 'eshell-prompt)
 
+(autoload 'eshell/pwd "em-dirs")
+
 (defcustom eshell-prompt-function
   (function
    (lambda ()
@@ -69,9 +73,9 @@ re-entered for it to take effect."
   :group 'eshell-prompt)
 
 (defface eshell-prompt
-  '((((class color) (background light)) (:foreground "Red" :bold t))
-    (((class color) (background dark)) (:foreground "Pink" :bold t))
-    (t (:bold t)))
+  '((default :weight bold)
+    (((class color) (background light)) :foreground "Red")
+    (((class color) (background dark))  :foreground "Pink"))
   "The face used to highlight prompt strings.
 For highlighting other kinds of strings -- similar to shell mode's
 behavior -- simply use an output filer which changes text properties."
@@ -120,8 +124,9 @@ arriving, or after."
       (and eshell-highlight-prompt
           (add-text-properties 0 (length prompt)
                                '(read-only t
-                                 face eshell-prompt
-                                 rear-nonsticky (face read-only))
+                                 font-lock-face eshell-prompt
+                                 front-sticky (font-lock-face read-only)
+                                 rear-nonsticky (font-lock-face read-only))
                                prompt))
       (eshell-interactive-print prompt)))
   (run-hooks 'eshell-after-prompt-hook))