# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1105236763 0
# Node ID 100bcbece57b32cb4cfc6f44edb559ced33d82fd
# Parent  b6b9daefbc429556d5184d0848689d3e34451477
*** empty log message ***

diff -r b6b9daefbc42 -r 100bcbece57b etc/NEWS
--- a/etc/NEWS	Sun Jan 09 02:05:41 2005 +0000
+++ b/etc/NEWS	Sun Jan 09 02:12:43 2005 +0000
@@ -99,7 +99,15 @@
 
 * Changes in Emacs 21.4
 
+** Control characters and escape glyphs are now shown in the new
+escape-glyph face.
+
+** Non-breaking space and hyphens are now prefixed with an escape
+character, unless the new user variable `show-nonbreak-escape' is set
+to nil.
+
 ** display-battery has been replaced by display-battery-mode.
+
 ** calculator.el now has radix grouping mode, which is available when
 `calculator-output-radix' is non-nil.  In this mode a separator
 character is used every few digits, making it easier to see byte
diff -r b6b9daefbc42 -r 100bcbece57b src/ChangeLog
--- a/src/ChangeLog	Sun Jan 09 02:05:41 2005 +0000
+++ b/src/ChangeLog	Sun Jan 09 02:12:43 2005 +0000
@@ -1,3 +1,26 @@
+2005-01-09  Kim F. Storm  <storm@cua.dk>
+
+	* dispextern.h (struct it): New member dpvec_face_id.
+	(merge_into_realized_face): Add prototype.
+
+	* xfaces.c (merge_into_realized_face): New function.  Used to
+	merge escape-glyph face or face from display table into current	face.
+
+	* xdisp.c (Vshow_nonbreak_escape): New lisp var.
+	(syms_of_xdisp): DEFVAR_LISP it.
+	(escape_glyph_face): Remove var.
+	(redisplay_window): Don't initialize it.
+	(setup_for_ellipsis, get_next_display_element):
+	Set it->dpvec_face_id to -1.
+	(get_next_display_element): Test Vshow_nonbreak_escape.
+	Do not setup escape_glyph_face.
+	Properly merge escape-glyph face or face from display table with
+	current face for escape and control characters.  Set
+	it->dpvec_face_id to relevant face id instead of adding it to each
+	element of display vector.
+	(next_element_from_display_vector): If it->dpvec_face_id is set,
+	use that instead of lface_id from glyph itself.
+
 2005-01-08  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xterm.h (struct x_output): New member, toolbar_detached.
@@ -21,7 +44,7 @@
 	warning.
 
 	* xselect.c (x_get_foreign_selection, x_fill_property_data)
-	(Fx_get_atom_name, Fx_send_client_event): Replace XFLOAT with 
+	(Fx_get_atom_name, Fx_send_client_event): Replace XFLOAT with
 	XFLOAT_DATA to get extract number from Lisp object.
 
 2005-01-07  Kim F. Storm  <storm@cua.dk>