* net/rcirc.el (rcirc-add-face):

* eshell/em-prompt.el (eshell-emit-prompt):
* eshell/em-ls.el (eshell-ls-decorated-name): Use font-lock-face.

Fixes: debbugs:16167

4 files changed, 14 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 728405eeb2e..23c146fb128 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-17  Leo Liu  <sdl.web@gmail.com>
+
+        * net/rcirc.el (rcirc-add-face):
+        * eshell/em-prompt.el (eshell-emit-prompt):
+        * eshell/em-ls.el (eshell-ls-decorated-name): Use font-lock-face.
+        (Bug#16167)
+
 2013-12-17  Chong Yidong  <cyd@gnu.org>
 
         * files.el (break-hardlink-on-save): Doc fix (Bug#13801).
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 06c519c104b..34ca3b39eb2 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -919,7 +919,7 @@ to use, and each member of which is the width of that column
                  value)))))
         (if face
             (add-text-properties 0 (length (car file))
-                                 (list 'face face)
+                                 (list 'font-lock-face face)
                                  (car file)))))
   (car file))
 
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index e79c7d7ba63..1092eb5b4de 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -124,7 +124,7 @@ arriving, or after."
       (and eshell-highlight-prompt
            (add-text-properties 0 (length prompt)
                                 '(read-only t
-                                  face eshell-prompt
+                                  font-lock-face eshell-prompt
                                   front-sticky (face read-only)
                                   rear-nonsticky (face read-only))
                                 prompt))
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index f7d43989868..fa15e68baa8 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2361,10 +2361,11 @@ keywords when no KEYWORD is given."
     (let ((pos start)
           next prop)
       (while (< pos end)
-        (setq prop (get-text-property pos 'face object)
-              next (next-single-property-change pos 'face object end))
-        (unless (member name (get-text-property pos 'face object))
-          (add-text-properties pos next (list 'face (cons name prop)) object))
+        (setq prop (get-text-property pos 'font-lock-face object)
+              next (next-single-property-change pos 'font-lock-face object end))
+        (unless (member name (get-text-property pos 'font-lock-face object))
+          (add-text-properties pos next
+                               (list 'font-lock-face (cons name prop)) object))
         (setq pos next)))))
 
 (defun rcirc-facify (string face)