Mercurial > emacs
changeset 32239:9f5f8cb6cb32
Fix merge screwup.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 07 Oct 2000 02:38:22 +0000 |
| parents | 2cf1369b3b02 |
| children | f2a40beeddaa |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Oct 06 22:55:11 2000 +0000 +++ b/lisp/ChangeLog Sat Oct 07 02:38:22 2000 +0000 @@ -49,11 +49,6 @@ latter needs the autoloaded define-minor-mode macro during the bootstrap. -2000-10-06 Miles Bader <miles@lsi.nec.co.jp> - - * simple.el (shell-command-on-region): If the output is short - enough to display in an expanded echo area, show it here. - * startup.el (command-line): For now, activate tool-bar-mode only if XPM images are supported.