# HG changeset patch
# User adrian
# Date 1087842378 0
# Node ID e4307a6b9ebb390f8ea99f02085402c686ee4b8c
# Parent  f0cb4110f17e5d86c5c28dcfbdd3135f05011f0f
[xemacs-hg @ 2004-06-21 18:26:18 by adrian]
[R21.4] [PATCH] xemacs-21.5: Fix false cvs conflict in lisp/package-ui.el

-------------------- ChangeLog entries follow: --------------------

lisp/ChangeLog addition:

2004-06-21  Adrian Aichner  <adrian@xemacs.org>

	* package-ui.el (pui-help-echo): Fix false cvs conflict by
	avoiding line solely composed of equal signs.

diff -r f0cb4110f17e -r e4307a6b9ebb lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jun 20 21:50:26 2004 +0000
+++ b/lisp/ChangeLog	Mon Jun 21 18:26:18 2004 +0000
@@ -1,3 +1,8 @@
+2004-06-21  Adrian Aichner  <adrian@xemacs.org>
+
+	* package-ui.el (pui-help-echo): Fix false cvs conflict by
+	avoiding line solely composed of equal signs.
+
 2004-06-18  Jerry James  <james@xemacs.org>
 
 	* derived.el (define-derived-mode): Put the arguments to
diff -r f0cb4110f17e -r e4307a6b9ebb lisp/package-ui.el
--- a/lisp/package-ui.el	Sun Jun 20 21:50:26 2004 +0000
+++ b/lisp/package-ui.el	Mon Jun 21 18:26:18 2004 +0000
@@ -480,8 +480,7 @@
 	  (if (featurep 'balloon-help)
 	      (progn
 		(setq balloon (format "
-Package Information:  [For package: \"%s\"]
-================
+Package Information:  [For package: \"%s\"]\n================
 Installed Upstream Ver: %s  Available Upstream Ver: %s
 Maintainer : %s
 Released : %s