*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c52c48355ca7e5a132564d85e87dd5fa5d06183..9f7079764cb58753cef9520ad8cda123f714f15d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-19  Gerd Moellmann  <gerd@gnu.org>
+
+       * files.el (auto-mode-alist): Add pattern for `.shrc'.
+
 2000-05-18  Andreas Schwab  <schwab@suse.de>
 
        * dired.el (dired-between-files): Also skip lines beginning with

diff --git a/src/ChangeLog b/src/ChangeLog
index 23d5e01f8339ae4a9c3c0a62cfb4fe5c1b8ca811..bee53b4c5d71b6e70121312b526830e6ab8dd6e5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2000-05-19  Gerd Moellmann  <gerd@gnu.org>
+
+       * dispextern.h (Vimage_types): Add extern declaration.
+
+       * xdisp.c (Vimage_types): Moved here from xfns.c.
+       (syms_of_xdisp): Move `image-types' variable here from xfns.c.
+
+       * xfns.c (Vimages_types): Moved to xdisp.c.
+       (syms_of_xfns): Move `image-types' to xdisp.c.
+
+       * w32fns.c (Vimage_types): Removed.
+       (syms_of_w32fns): Remove `image-types'.
+
 2000-05-18  Kenichi Handa  <handa@etl.go.jp>
 
        * fns.c (map_char_table): Pay attention to character number of