# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 975681381 0
# Node ID 72b6d537203d9edf1855862321af570fc7e97523
# Parent  d5109115f8cc4df6bbdc28235c604ffc5533e071
*** empty log message ***

diff -r d5109115f8cc -r 72b6d537203d lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 01 14:13:31 2000 +0000
+++ b/lisp/ChangeLog	Fri Dec 01 14:36:21 2000 +0000
@@ -25,7 +25,8 @@
 	* filecache.el (file-cache-directory-name)
 	(file-cache-minibuffer-complete): Ignore the minibuffer prompt.
 
-	From Milan Zamazal <Milan.Zamazal@qbizm.com>:
+2000-12-01 Milan Zamazal <Milan.Zamazal@qbizm.com>
+	
 	* filecache.el (file-cache-minibuffer-complete): Don't try to
 	delete the minibuffer prompt.
 
@@ -710,9 +711,11 @@
 
 	* Makefile.in (DONTCOMPILE): Omit bindings.el.
 
-2000-11-20  Gerd Moellmann  <gerd@gnu.org>
-
-	* calculator.el: New version from author.
+2000-11-20  Eli Barzilay <eli@www.barzilay.org>
+
+	* calculator.el (calculator-paste): Use `if' instead of `and'
+	and `or'.
+	(calculator-help): Don't use electric-describe-mode for XEmacs.
 
 2000-11-19  Gerd Moellmann  <gerd@gnu.org>
 
@@ -749,9 +752,10 @@
 	(mode-line-toggle-modified, mode-line-widen)
 	(mode-line-abbrev-mode, mode-line-auto-fill-mode): Fix typos.
 
-2000-11-17  Gerd Moellmann  <gerd@gnu.org>
-
-	* ps-print.el: Minor fixes from author.
+2000-11-17  Vinicius Jose Latorre <vinicius@cpqd.com.br>
+
+	* ps-print.el (toplevel): Test for find-coding-system being
+	fboundp before calling ps-x-find-coding-system.
 
 2000-11-16  Stefan Monnier  <monnier@cs.yale.edu>