Mercurial > emacs
changeset 34841:43f31a211e9b
*** empty log message ***
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 22 Dec 2000 22:59:17 +0000 |
| parents | 509ed3724af0 |
| children | f05ec8dfc452 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Dec 22 22:58:57 2000 +0000 +++ b/lisp/ChangeLog Fri Dec 22 22:59:17 2000 +0000 @@ -1,5 +1,9 @@ 2000-12-22 Stefan Monnier <monnier@cs.yale.edu> + * smerge-mode.el (smerge-basic-map): Use `=' rather than `d'. + Use minibuffer menu prompt for the `=' prefix. + (smerge-command-prefix): Change default to C-^. + * skeleton.el (skeleton-internal-1): Make sure the first line of the region is also re-indented. (skeleton-end-newline): New var.