Commit 2b84d763 authored by Leo Liu's avatar Leo Liu
Browse files

* 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
parent e2f6a0bc
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).
......
......@@ -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))
......
......@@ -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))
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment