# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1104722406 0
# Node ID b0bb670d6f7dfd88da5dd174c9fb6268304f4e11
# Parent  00d1c1096a62c6177fc82a82d8547419d20c8dde
*** empty log message ***

diff -r 00d1c1096a62 -r b0bb670d6f7d admin/FOR-RELEASE
--- a/admin/FOR-RELEASE	Mon Jan 03 02:42:25 2005 +0000
+++ b/admin/FOR-RELEASE	Mon Jan 03 03:20:06 2005 +0000
@@ -183,22 +183,6 @@
 Update: Maybe only reveals itself when compiled with GTK+
 
 
-** line-spacing and Electric-pop-up-window
-
-From: SAITO Takuya <tabmore@rivo.mediatti.net>
-Date: Mon, 31 May 2004 02:08:10 +0900 (JST)
-
-Electric-pop-up-window does not work well
-if truncate long lines disabled and/or
-`line-spacing' is set to positive integer.
-
-For example, start emacs -Q --line-spacing 1, and type M-` .
-Then, the last line of *Completions* buffer is not visible.
-
-fit-window-to-buffer works well for me, so I guess
-Electric-pop-up-window can use it.
-
-
 ** Partial highlighting of wrapped overlay
 
 From: Ralf Angeli <angeli@iwi.uni-sb.de>
diff -r 00d1c1096a62 -r b0bb670d6f7d lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jan 03 02:42:25 2005 +0000
+++ b/lisp/ChangeLog	Mon Jan 03 03:20:06 2005 +0000
@@ -8,10 +8,11 @@
 	* 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>
+2005-01-02  Karl Chen  <quarl@cs.berkeley.edu>
 
 	* vc-svn.el (vc-svn-diff): Stay local if possible.
-	From Karl Chen <quarl@cs.berkeley.edu>.
+
+2005-01-02  Stefan  <monnier@iro.umontreal.ca>
 
 	* vc-arch.el (vc-arch-workfile-version): Handle the empty-branch case.