* 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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 728405eeb2e4f047e0bd70ebb5bc072975211d6f..23c146fb128cc947367de4869918eabe1090a9bb 100644 (file)
--- 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 06c519c104b1d1ec7002f0bc12f0e20e0aa95aa6..34ca3b39eb261d059bea294bf7177c5552ea221d 100644 (file)
--- 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 e79c7d7ba63314f6c74db9f4b409a2148d28890d..1092eb5b4de3c1ea2f973e29d3e89eb92fe72735 100644 (file)
--- 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 f7d4398986894cfa3c31acb8951ad27d64a34615..fa15e68baa82b2acccfef7436395128d0d781a96 100644 (file)
--- 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)