Mercurial > emacs
changeset 34842:f05ec8dfc452
(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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 22 Dec 2000 23:16:22 +0000 |
| parents | 43f31a211e9b |
| children | 54228e607df5 |
| files | lisp/smerge-mode.el |
| diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Fri Dec 22 22:59:17 2000 +0000 +++ b/lisp/smerge-mode.el Fri Dec 22 23:16:22 2000 +0000 @@ -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 @@ (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.