Mercurial > hg > xemacs-beta
changeset 2146:e4307a6b9ebb
[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.
| author | adrian |
|---|---|
| date | Mon, 21 Jun 2004 18:26:18 +0000 |
| parents | f0cb4110f17e |
| children | c42018e7d790 |
| files | lisp/ChangeLog lisp/package-ui.el |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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