(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.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc123d24185..b9d1f3a283a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 5b182b28e8a..1b7359d4478 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: merge diff3 cvs conflict
-;; Revision: $Id: smerge-mode.el,v 1.7 2000/10/06 16:07:31 monnier Exp $
+;; Revision: $Id: smerge-mode.el,v 1.8 2000/12/22 22:58:57 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -472,13 +472,19 @@ The point is moved to the end of the conflict."
         (font-lock-remove-keywords nil smerge-font-lock-keywords))
       (goto-char (point-min))
       (while (smerge-find-conflict)
-        (font-lock-fontify-region (match-beginning 0) (match-end 0) nil)))))
+        (save-excursion
+          (font-lock-fontify-region (match-beginning 0) (match-end 0) nil))))))
 
 
 (provide 'smerge-mode)
 
 ;;; Change Log:
 ;; $Log: smerge-mode.el,v $
+;; Revision 1.8  2000/12/22 22:58:57  monnier
+;; (smerge-basic-map): Use `=' rather than `d'.
+;; Use minibuffer menu prompt for the `=' prefix.
+;; (smerge-command-prefix): Change default to C-^.
+;;
 ;; Revision 1.7  2000/10/06 16:07:31  monnier
 ;; (smerge-diff): Setup the buffer's default-directory
 ;; and add filename to the names so that diff-mode can jump to source.