]> git.eshelyaron.com Git - emacs.git/commit
(smerge-basic-map): Use `=' rather than `d'.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 22 Dec 2000 23:19:47 +0000 (23:19 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 22 Dec 2000 23:19:47 +0000 (23:19 +0000)
commit6eabfb2600e07362acc22f6ffcdc35e1cc758eb0
treed5780fffd5c40681baf862bd779906049407b7c7
parent0e86b6b04b7700833e139303e311ae7a8c4088a3
(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.
lisp/ChangeLog
lisp/smerge-mode.el