Mercurial > emacs
changeset 54587:a9657efd4fc8
*** empty log message ***
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 26 Mar 2004 16:17:33 +0000 |
| parents | c3043c1faed3 |
| children | 3a4518b4fa64 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Mar 26 16:17:12 2004 +0000 +++ b/lisp/ChangeLog Fri Mar 26 16:17:33 2004 +0000 @@ -1,5 +1,7 @@ 2004-03-26 Stefan Monnier <monnier@iro.umontreal.ca> + * vc.el (vc-maybe-resolve-conflicts): Don't prompt the user. + * calc/calc.el (calc-mode-map): Use mapc. * apropos.el (apropos-mode): Don't autoload.