[Emacs-diffs] trunk r115565: * net/rcirc.el (rcirc-add-face):

[Leo Liu]

------------------------------------------------------------
revno: 115565
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16167
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-17 23:15:00 +0800
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/eshell/em-ls.el           emls.el-20091113204419-o5vbwnq5f7feedwu-1858
  lisp/eshell/em-prompt.el       
emprompt.el-20091113204419-o5vbwnq5f7feedwu-1860
  lisp/net/rcirc.el              rcirc.el-20091113204419-o5vbwnq5f7feedwu-4032

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-17 15:09:13 +0000
+++ b/lisp/ChangeLog    2013-12-17 15:15:00 +0000
@@ -1,3 +1,10 @@
+2013-12-17  Leo Liu  <address@hidden>
+
+       * 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  <address@hidden>
 
        * files.el (break-hardlink-on-save): Doc fix (Bug#13801).

=== modified file 'lisp/eshell/em-ls.el'
--- a/lisp/eshell/em-ls.el      2013-10-30 06:29:22 +0000
+++ b/lisp/eshell/em-ls.el      2013-12-17 15:15:00 +0000
@@ -919,7 +919,7 @@
                 value)))))
        (if face
            (add-text-properties 0 (length (car file))
-                                (list 'face face)
+                                (list 'font-lock-face face)
                                 (car file)))))
   (car file))
 

=== modified file 'lisp/eshell/em-prompt.el'
--- a/lisp/eshell/em-prompt.el  2013-09-13 07:07:07 +0000
+++ b/lisp/eshell/em-prompt.el  2013-12-17 15:15:00 +0000
@@ -124,7 +124,7 @@
       (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))

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2013-11-05 14:32:01 +0000
+++ b/lisp/net/rcirc.el 2013-12-17 15:15:00 +0000
@@ -2361,10 +2361,11 @@
     (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)