*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index d3688cf36fda218b27ca6b8086b503b713663cc4..28584409e114e578e6890c5896a4491ab7e42ee0 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -99,7 +99,15 @@ types any more.  Add -DUSE_LISP_UNION_TYPE if you want union types.
 \f
 * 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 --git a/src/ChangeLog b/src/ChangeLog
index 2326957d4e0058e3b993f75f0047f294740473f2..2635af04ee5d0682394f7fb0df5004e53d6f0a33 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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\e,Ad\e(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>