Mercurial > emacs
comparison lisp/smerge-mode.el @ 101752:1d5d501c3c03
(smerge-start-session): Add interactive spec.
| author | Thien-Thi Nguyen <ttn@gnuvola.org> |
|---|---|
| date | Mon, 02 Feb 2009 13:01:06 +0000 |
| parents | a9dc0e7c3f2b |
| children | afa0e028ba97 |
comparison
equal
deleted
inserted
replaced
| 101751:716aa53f3609 | 101752:1d5d501c3c03 |
|---|---|
| 1220 | 1220 |
| 1221 ;;;###autoload | 1221 ;;;###autoload |
| 1222 (defun smerge-start-session () | 1222 (defun smerge-start-session () |
| 1223 "Turn on `smerge-mode' and move point to first conflict marker. | 1223 "Turn on `smerge-mode' and move point to first conflict marker. |
| 1224 If no conflict maker is found, turn off `smerge-mode'." | 1224 If no conflict maker is found, turn off `smerge-mode'." |
| 1225 (interactive) | |
| 1225 (smerge-mode 1) | 1226 (smerge-mode 1) |
| 1226 (condition-case nil | 1227 (condition-case nil |
| 1227 (unless (looking-at smerge-begin-re) | 1228 (unless (looking-at smerge-begin-re) |
| 1228 (smerge-next)) | 1229 (smerge-next)) |
| 1229 (error (smerge-auto-leave)))) | 1230 (error (smerge-auto-leave)))) |