diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-12-22 23:16:22 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-12-22 23:16:22 +0000 |
| commit | d2aa5c795cf233c7928d5c6a5a3e88b071d4dd06 (patch) | |
| tree | be6421e090787d1c761bc3dfc708113c2a224b65 /lisp/smerge-mode.el | |
| parent | 86b9f720a49b222e78b62e3d1323ede9f0626659 (diff) | |
| download | emacs-d2aa5c795cf233c7928d5c6a5a3e88b071d4dd06.tar.gz | |
(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.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 10 |
1 files changed, 8 insertions, 2 deletions
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. |