# HG changeset patch # User Thien-Thi Nguyen # Date 1233579666 0 # Node ID 1d5d501c3c03802c472c15cfdc406a91f253dbfd # Parent 716aa53f3609a0181e0c4b542a30778637b1d431 (smerge-start-session): Add interactive spec. diff -r 716aa53f3609 -r 1d5d501c3c03 lisp/smerge-mode.el --- 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)