Mercurial > hg > xemacs-beta
comparison lisp/package-ui.el @ 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 | 7f92ee59c996 |
children | ecf1ebac70d8 |
comparison
equal
deleted
inserted
replaced
2145:f0cb4110f17e | 2146:e4307a6b9ebb |
---|---|
478 (if (not inst-ver) | 478 (if (not inst-ver) |
479 (setq inst-ver 0)) | 479 (setq inst-ver 0)) |
480 (if (featurep 'balloon-help) | 480 (if (featurep 'balloon-help) |
481 (progn | 481 (progn |
482 (setq balloon (format " | 482 (setq balloon (format " |
483 Package Information: [For package: \"%s\"] | 483 Package Information: [For package: \"%s\"]\n================ |
484 ================ | |
485 Installed Upstream Ver: %s Available Upstream Ver: %s | 484 Installed Upstream Ver: %s Available Upstream Ver: %s |
486 Maintainer : %s | 485 Maintainer : %s |
487 Released : %s | 486 Released : %s |
488 Required Packages : %s\n\n" | 487 Required Packages : %s\n\n" |
489 pkg-sym inst-auth-ver auth-ver maintainer | 488 pkg-sym inst-auth-ver auth-ver maintainer |