Commit 6eabfb26 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(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.
parent 0e86b6b0
......@@ -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.
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment