Mercurial > emacs
comparison lisp/smerge-mode.el @ 94865:f413ee341af0
(smerge-start-session): Revert unintended change in revision 1.69.
| author | Reiner Steib <Reiner.Steib@gmx.de> |
|---|---|
| date | Sun, 11 May 2008 20:26:00 +0000 |
| parents | cf96e7b08046 |
| children | 4ea0e968c7af |
comparison
equal
deleted
inserted
replaced
| 94864:e2fb0c9c7a42 | 94865:f413ee341af0 |
|---|---|
| 1226 (defun smerge-start-session () | 1226 (defun smerge-start-session () |
| 1227 "Turn on `smerge-mode' and move point to first conflict marker. | 1227 "Turn on `smerge-mode' and move point to first conflict marker. |
| 1228 If no conflict maker is found, turn off `smerge-mode'." | 1228 If no conflict maker is found, turn off `smerge-mode'." |
| 1229 (smerge-mode 1) | 1229 (smerge-mode 1) |
| 1230 (condition-case nil | 1230 (condition-case nil |
| 1231 (smerge-next) | 1231 (unless (looking-at smerge-begin-re) |
| 1232 (smerge-next)) | |
| 1232 (error (smerge-auto-leave)))) | 1233 (error (smerge-auto-leave)))) |
| 1233 | 1234 |
| 1234 (provide 'smerge-mode) | 1235 (provide 'smerge-mode) |
| 1235 | 1236 |
| 1236 ;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690 | 1237 ;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690 |