*** empty log message ***

2 files changed, 24 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c91adf52d3..9c83f1f0eb6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-19  Jason Rumney  <jasonr@gnu.org>
+
+        * dired.el (dired-insert-directory): Do not let errors signalled by
+        attempt to run dired-free-space-program prevent dired from working.
+
 2000-10-19  Stefan Monnier  <monnier@cs.yale.edu>
 
         * diff-mode.el (diff-find-file-name): Fix regex subgroup number.
@@ -10867,5 +10872,5 @@
 See ChangeLog.8 for earlier changes.
 
 ;; Local Variables:
-;; coding: iso-2022-7bit-unix
+;; coding: iso-2022-7bit
 ;; End:
diff --git a/src/ChangeLog b/src/ChangeLog
index 69651dc5ce9..c8f3fdf0be6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2000-10-19  Jason Rumney  <jasonr@altavista.net>
+
+        * w32console.c: Do not undef HAVE_WINDOW_SYSTEM before
+        including dispextern.h, as it stops faces from working.
+
+        * w32fns.c (Fx_create_frame): Don't bother calling
+        face-set-after-frame-default since the caller does it for us
+        anyway. Clean up calls to x_get_arg to be consistent with X.
+
+        * w32term.c (x_produce_glyphs): Handle
+        unibyte_display_via_language_environment correctly.
+        (w32_draw_box_rect): Fix the calculation of width and height.
+
+        * w32menu.c (add_menu_item): Do not use MF_OWNERDRAW for titles,
+        as it has stopped working.
+        (Fx_popup_menu, Fx_popup_dialog): Check for tool-bar position like
+        menu-bar.
+
 2000-10-19  Gerd Moellmann  <gerd@gnu.org>
 
         * eval.c (skip_debugger): Prevent a compiler warning.