aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-04-28 18:09:10 +0200
committerLars Ingebrigtsen2016-04-28 18:09:10 +0200
commitc3ac2cbf73516d2414c845087cac8fc7ec1ce5d7 (patch)
tree6767ba0ab44954d0b8363bf6024993d48d758232 /doc
parent214f85a0a68b96a552ca605d601b33f6eef5c4ca (diff)
downloademacs-c3ac2cbf73516d2414c845087cac8fc7ec1ce5d7.tar.gz
emacs-c3ac2cbf73516d2414c845087cac8fc7ec1ce5d7.zip
Add a new face for non-breaking hyphen characters
* doc/emacs/display.texi (Standard Faces): Mention nobreak-hyphen. (Text Display): Ditto. * lisp/faces.el (nobreak-hyphen): New face (bug#12048). * src/xdisp.c (get_next_display_element): Use it instead of the escape-glyph face. * src/xdisp.c (syms_of_xdisp): New symbil Qnobreak_hyphen.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/display.texi5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 8039291298c..89f5bec3639 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -657,6 +657,9 @@ The face for displaying control characters and escape sequences
657@item nobreak-space 657@item nobreak-space
658The face for displaying no-break space characters (@pxref{Text 658The face for displaying no-break space characters (@pxref{Text
659Display}). 659Display}).
660@item nobreak-hyphen
661The face for displaying no-break hyphen characters (@pxref{Text
662Display}).
660@end table 663@end table
661 664
662 The following faces control the appearance of parts of the Emacs 665 The following faces control the appearance of parts of the Emacs
@@ -1481,7 +1484,7 @@ characters. To deal with this problem, Emacs displays such characters
1481specially: it displays @code{U+00A0} (no-break space) with the 1484specially: it displays @code{U+00A0} (no-break space) with the
1482@code{nobreak-space} face, and it displays @code{U+00AD} (soft 1485@code{nobreak-space} face, and it displays @code{U+00AD} (soft
1483hyphen), @code{U+2010} (hyphen), and @code{U+2011} (non-breaking 1486hyphen), @code{U+2010} (hyphen), and @code{U+2011} (non-breaking
1484hyphen) with the @code{escape-glyph} face. To disable this, change 1487hyphen) with the @code{nobreak-hyphen} face. To disable this, change
1485the variable @code{nobreak-char-display} to @code{nil}. If you give 1488the variable @code{nobreak-char-display} to @code{nil}. If you give
1486this variable a non-@code{nil} and non-@code{t} value, Emacs instead 1489this variable a non-@code{nil} and non-@code{t} value, Emacs instead
1487displays such characters as a highlighted backslash followed by a 1490displays such characters as a highlighted backslash followed by a