summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2005-06-17 14:10:09 +0000
committerRichard M. Stallman <rms@gnu.org>2005-06-17 14:10:09 +0000
commitb7da00ba48488d629814b441c5e0b0e683d33d9e (patch)
tree629ffbe95b6db4b0de2821c7f33e6b9612f68d31
parent072d84a6c24258f78a772a54cbdfaa96efcca85b (diff)
downloademacs-b7da00ba48488d629814b441c5e0b0e683d33d9e.tar.gz
(get_next_display_element): Reverse test of Vshow_nonbreak_escape.
-rw-r--r--src/ChangeLog22
-rw-r--r--src/xdisp.c2
2 files changed, 22 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 99a208586a5..fbb8d887533 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,24 @@
+2005-06-17 Richard M. Stallman <rms@gnu.org>
+
+ * xdisp.c (get_next_display_element): Reverse
+ test of Vshow_nonbreak_escape.
+
+ * term.c (produce_special_glyphs): Use spec_glyph_lookup_face.
+
+ * keyboard.c (read_char): Call restore_getcjmp after jump occurs.
+
+ * dispnew.c (spec_glyph_lookup_face): New function.
+ (build_frame_matrix_from_leaf_window): Use it.
+
+ * dispextern.h (spec_glyph_lookup_face): Add declaration.
+
+ * buffer.c (syms_of_buffer) <cursor-type>: Doc fix.
+
+2005-06-12 Richard M. Stallman <rms@gnu.org>
+
+ * keyboard.c (read_char): After catching a longjmp,
+ call restore_getcjmp.
+
2005-06-17 Juanma Barranquero <lekktu@gmail.com>
* xselect.c (lisp_data_to_selection_data): Fix spelling.
@@ -105,7 +126,6 @@
* xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face
when mouse_face is not given.
- Remove unnecessary tabs.
2005-06-09 Luc Teirlinck <teirllm@auburn.edu>
diff --git a/src/xdisp.c b/src/xdisp.c
index 7ce461c1897..4128f354442 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5152,7 +5152,7 @@ get_next_display_element (it)
/* Handle non-break space in the mode where it only gets
highlighting. */
- if (! EQ (Vshow_nonbreak_escape, Qt)
+ if (EQ (Vshow_nonbreak_escape, Qt)
&& (it->c == 0x8a0 || it->c == 0x920
|| it->c == 0xe20 || it->c == 0xf20))
{