*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 5eab222df1a76ec26969db0ea40e6e08ae0a885a..26c95fcd5925217b1c2e7db347b4b65e6097bb68 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1588,6 +1588,13 @@ containing diff3-style conflict markers, such as generated by RCS.
 
 *** ansi-color.el translates ANSI terminal escapes into text-properties.
 
+Please note: if `ansi-color-for-shell-mode' and
+`global-font-lock-mode' are non-nil, loading ansi-color.el will
+disable font-lock and add `ansi-color-apply' to
+`comint-preoutput-filter-functions' for all shell-mode buffers.  This
+displays the output of "ls --color=yes" using the correct foreground
+and background colors.
+
 *** delphi.el provides a major mode for editing the Delphi (Object
 Pascal) language.
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 67a43e73e6ae3c98a09038201d27ba1f8d5e930e..c144379e6664ae71ea1992384783a61131367583 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2000-09-27  Gerd Moellmann  <gerd@gnu.org>
+
+       * dispnew.c (adjust_glyph_matrix, enable_glyph_matrix_rows): 
+       Add assertions.
+
+       * xdisp.c (window_box_height): Add an assertion.
+
+       * xfns.c (x_set_tool_bar_lines): Don't use more lines for the
+       tool-bar than is available.
+       (x_change_window_heights): Renamed from x_set_menu_bar_lines_1.
+
 2000-09-27  Dave Love  <fx@gnu.org>
 
        * s/irix6-5.h (IRIX6): Now works 64-bit.  Tidied.