# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1104707486 0
# Node ID f3839cb9f16c86e51e19c0650eed01bc9c41d12a
# Parent  c5ee87e891473865121ba27cc8ab10b45481a7da
*** empty log message ***

diff -r c5ee87e89147 -r f3839cb9f16c lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 02 23:11:03 2005 +0000
+++ b/lisp/ChangeLog	Sun Jan 02 23:11:26 2005 +0000
@@ -1,3 +1,8 @@
+2005-01-02  Richard M. Stallman  <rms@gnu.org>
+
+	* electric.el (Electric-pop-up-window): Use fit-window-to-buffer
+	instead of calculating the right size.
+
 2005-01-02  Stefan  <monnier@iro.umontreal.ca>
 
 	* vc-arch.el (vc-arch-workfile-version): Handle the empty-branch case.
@@ -49,6 +54,7 @@
 
 	* ses.el (copy-region-as-kill): Deactivate mark.
 
+>>>>>>> 1.6818
 2005-01-01  Richard M. Stallman  <rms@gnu.org>
 
 	* replace.el (occur-1): If the output buffer is also an input,