Mercurial > emacs
changeset 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 | 716aa53f3609 |
| children | 88331f228f40 |
| files | lisp/smerge-mode.el |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Mon Feb 02 12:33:07 2009 +0000 +++ b/lisp/smerge-mode.el Mon Feb 02 13:01:06 2009 +0000 @@ -1222,6 +1222,7 @@ (defun smerge-start-session () "Turn on `smerge-mode' and move point to first conflict marker. If no conflict maker is found, turn off `smerge-mode'." + (interactive) (smerge-mode 1) (condition-case nil (unless (looking-at smerge-begin-re)