Mercurial > emacs
changeset 34843:54228e607df5
*** empty log message ***
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 22 Dec 2000 23:19:47 +0000 |
| parents | f05ec8dfc452 |
| children | 4756a759c825 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Dec 22 23:16:22 2000 +0000 +++ b/lisp/ChangeLog Fri Dec 22 23:19:47 2000 +0000 @@ -3,6 +3,7 @@ * smerge-mode.el (smerge-basic-map): Use `=' rather than `d'. Use minibuffer menu prompt for the `=' prefix. (smerge-command-prefix): Change default to C-^. + (smerge-mode): Don't assume font-lock doesn't move point. * skeleton.el (skeleton-internal-1): Make sure the first line of the region is also re-indented.