Mercurial > emacs
comparison lisp/smerge-mode.el @ 87785:8f1628da223f
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Rename callers.
* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook): Undo previous change.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 16 Jan 2008 06:22:59 +0000 |
| parents | 90318261ac4d |
| children | c70e45a7acfd ca1e1298a3d8 |
comparison
equal
deleted
inserted
replaced
| 87784:01f002639254 | 87785:8f1628da223f |
|---|---|
| 1048 (concat smerge-parsep-re paragraph-separate)))) | 1048 (concat smerge-parsep-re paragraph-separate)))) |
| 1049 (unless smerge-mode | 1049 (unless smerge-mode |
| 1050 (smerge-remove-props (point-min) (point-max)))) | 1050 (smerge-remove-props (point-min) (point-max)))) |
| 1051 | 1051 |
| 1052 ;;;###autoload | 1052 ;;;###autoload |
| 1053 (defun smerge-auto () | 1053 (defun smerge-start-session () |
| 1054 "Turn on `smerge-mode' and move point to first conflict marker. | 1054 "Turn on `smerge-mode' and move point to first conflict marker. |
| 1055 If no conflict maker is found, turn off `smerge-mode'." | 1055 If no conflict maker is found, turn off `smerge-mode'." |
| 1056 (smerge-mode 1) | 1056 (smerge-mode 1) |
| 1057 (condition-case nil | 1057 (condition-case nil |
| 1058 (smerge-next) | 1058 (smerge-next) |