From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 26 Jan 2001 09:35:23 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.96~56
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d2906bf8fb65a86a55c390c4ff017b526fe51a56;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3da7892efb0..6281a3857bd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,7 +11,7 @@
 
 	* pcomplete.el (pcomplete-file-ignore): Changed a :type field to
 	allow a choice of regexp or nil.
-	(pcomplete-dir-ignore): same.
+	(pcomplete-dir-ignore): Same.
 
 	* eshell/em-unix.el (eshell/occur): Fixed bug causing `occur' (as
 	a command) to always fail.
diff --git a/src/ChangeLog b/src/ChangeLog
index 4c7b57ccae1..1cf1252f290 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-26  Gerd Moellmann  <gerd@gnu.org>
+
+	* xfns.c (xic_style): New variable.
+	(create_frame_xic): Move static variable to global scope for
+	the case that `static' get's defined away.
+
 2001-01-26  Kenichi Handa  <handa@etl.go.jp>
 
 	* coding.c (decode_coding): Set a flag for inhibiting