From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 19 May 2000 11:58:45 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~3898
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5f64c9e0cdca35a7ef9cade62435ce74e84091d4;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c52c48355c..9f7079764cb 100644
--- 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 23d5e01f833..bee53b4c5d7 100644
--- 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