From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 12 Jan 2001 12:38:50 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.96~327
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3cccce8d1b2e454270d011afeba0edf74c651f68;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71e3ac1410f..1ebbc1e7883 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-12  Gerd Moellmann  <gerd@gnu.org>
+
+	* calendar/calendar.el (calendar-basic-setup): Doc fix.
+
 2001-01-12  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/mule-cmds.el (prefer-coding-system): Fix
diff --git a/src/ChangeLog b/src/ChangeLog
index e5c1b6b1d0a..025d96529f2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2001-01-12  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfns.c (x_set_mouse_color): Fix color allocation.
+
 	* keyboard.c: Call get_local_map with new argument list.
 
 	* intervals.c (get_local_map): Change TYPE to Lisp_Object.