diff options
| author | Dan Nicolaescu <[email protected]> | 2008-01-14 07:38:05 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2008-01-14 07:38:05 +0000 |
| commit | ba463d9eca5f05817eb843372ebc9e46ecbb471f (patch) | |
| tree | bc0b28bf00715380c7a0ea0d59e1bcbc6a1e1e48 /lisp/smerge-mode.el | |
| parent | 944df51178e5c6617e89d28a2e6797b02550fde0 (diff) | |
* smerge-mode.el (smerge-auto): New function.
* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook):
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode.
(top-level): Add a Todo list.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index b72107eb6c..fe7d06e537 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1021,6 +1021,14 @@ buffer names." (unless smerge-mode (smerge-remove-props (point-min) (point-max)))) +;;;###autoload +(defun smerge-auto () + "Turn on `smerge-mode' and move point to first conflict marker. +If no conflict maker is found, turn off `smerge-mode'." + (smerge-mode 1) + (condition-case nil + (smerge-next) + (error (smerge-auto-leave)))) (provide 'smerge-mode) |