[Emacs-diffs] emacs/lisp smerge-mode.el

[Thien-Thi Nguyen]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Thien-Thi Nguyen <ttn>  09/02/02 13:01:06

Modified files:
        lisp           : smerge-mode.el 

Log message:
        (smerge-start-session): Add interactive spec.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&r1=1.75&r2=1.76

Patches:
Index: smerge-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- smerge-mode.el      5 Jan 2009 03:19:46 -0000       1.75
+++ smerge-mode.el      2 Feb 2009 13:01:06 -0000       1.76
@@ -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)