mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-11 16:08:13 +00:00
Code Issues Releases Activity

(smerge-ediff): Autoload.

Browse Source 
(smerge-match-conflict): Don't assume as much about smerge-begin-re.
(smerge-resolve-function): New var.
(smerge-resolve): New command.
(smerge-basic-map): Bind it.
This commit is contained in:
Stefan Monnier 2002-10-10 17:30:20 +00:00
parent 7884cd32d0
commit a48402c999
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lisp/smerge-mode.el
View File

@ -4,7 +4,7 @@
;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: merge diff3 cvs conflict ;; Keywords: merge diff3 cvs conflict
;; Revision: $Id: smerge-mode.el,v 1.18 2002/10/04 15:25:22 monnier Exp $ ;; Revision: $Id: smerge-mode.el,v 1.19 2002/10/10 13:01:14 monnier Exp $
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
@ -115,6 +115,7 @@ Used in `smerge-diff-base-mine' and related functions."
(easy-mmode-defmap smerge-basic-map (easy-mmode-defmap smerge-basic-map
`(("n" . smerge-next) `(("n" . smerge-next)
("p" . smerge-prev) ("p" . smerge-prev)
("r" . smerge-resolve)
("a" . smerge-keep-all) ("a" . smerge-keep-all)
("b" . smerge-keep-base) ("b" . smerge-keep-base)
("o" . smerge-keep-other) ("o" . smerge-keep-other)
@ -248,6 +249,21 @@ Convenient for the kind of conflicts that can arise in ChangeLog files."
(dolist (m match-data) (if m (move-marker m nil))) (dolist (m match-data) (if m (move-marker m nil)))
(mapc (lambda (m) (if m (move-marker m nil))) ends))))) (mapc (lambda (m) (if m (move-marker m nil))) ends)))))
(defvar smerge-resolve-function
(lambda () (error "Don't know how to resolve"))
"Mode-specific merge function.
The function is called with no argument and with the match data set
according to `smerge-match-conflict'.")
(defun smerge-resolve ()
"Resolve the conflict at point intelligently.
This relies on mode-specific knowledge and thus only works in
some major modes. Uses `smerge-resolve-function' to do the actual work."
(interactive)
(smerge-match-conflict)
(funcall smerge-resolve-function)
(smerge-auto-leave))
(defun smerge-keep-base () (defun smerge-keep-base ()
"Revert to the base version." "Revert to the base version."
(interactive) (interactive)
@ -317,7 +333,7 @@ An error is raised if not inside a conflict."
(start (match-beginning 0)) (start (match-beginning 0))
(mine-start (match-end 0)) (mine-start (match-end 0))
(filename (match-string 1)) (filename (or (match-string 1) ""))
(_ (re-search-forward smerge-end-re)) (_ (re-search-forward smerge-end-re))
(_ (assert (< orig-point (match-end 0)))) (_ (assert (< orig-point (match-end 0))))