diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-19 00:53:51 +0200 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-19 00:53:51 +0200 |
| commit | d9088290efb49a352c3c23da25a734ed3e269923 (patch) | |
| tree | e9c09623885e31c90756c0c74373b2e7886674e7 /src/xfaces.c | |
| parent | 8085d5fcc4240a39458ead26ae2279590bb9f629 (diff) | |
| parent | 2317c61868044dc1fea58d9e81f35d354f24fd69 (diff) | |
| download | emacs-d9088290efb49a352c3c23da25a734ed3e269923.tar.gz | |
Merge from origin/emacs-25
2317c61 Fix last todo-mode change
5d4d8a3 Improve last todo-mode fix
d7084f2 Fix todo-mode use of minibuffer completion keymap (bug#23695).
27dec52 * src/alloc.c (ALIGN): Avoid error on DragonFly BSD. (Bug#23...
f526191 * lisp/emacs-lisp/nadvice.el (advice--make-docstring): Avoid ...
e881070 * lisp/help-fns.el (describe-function-1): Avoid reporting adv...
d308aa1 Minor grammar fix (bug#23746)
20de667 Doc fixes for grammar and typos (bug#23746)
a67a4e5 * doc/lispref/processes.texi (Process Buffers): Minor rewordi...
27f440e Add cross-reference to ELisp manual
10802d8 ; make change-history-commit
4b2d77d * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix (bu...
12e009e Restore initial undo boundary with viper
291fe0a Revert "Fix viper undo breakage from undo-boundary changes"
6921f4a Fix dbus crash on 32-bit Cygwin
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index de73c010d54..ea02ee7ccbe 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6494,8 +6494,8 @@ REPLACEMENT is a face specification, i.e. one of the following: (3) a list in which each element has the form of (1) or (2). List values for REPLACEMENT are merged to form the final face -specification, with earlier entries taking precedence, in the same as -as in the `face' text property. +specification, with earlier entries taking precedence, in the same way +as with the `face' text property. Face-name remapping cycles are suppressed; recursive references use the underlying face instead of the remapped face. So a remapping of |