Merged from miles@gnu.org--gnu-2005 (patch 423-434)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-423
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-424
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-425
   Remove "-face" suffix from gnus faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-426
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-427
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-428
   Remove "-face" suffix from MH-E faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-429
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-430
   Remove "-face" suffix from cc-mode faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-431
   Remove "-face" suffix from eshell faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-432
   Remove "-face" suffix from ediff faces

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-433
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-434
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-351

1 files changed, 27 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 46cab9c1cba..12e52237e9b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,30 @@
+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.
+        (Ftty_no_underline): New function.
+        (syms_of_term): defsubr it.
+        
+        * 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.
+
 2005-06-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macterm.c (mac_compute_glyph_string_overhangs): Don't set
@@ -101,7 +128,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>