From 1b7c198ad16aac7eae623980acce27eec671df46 Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Mon, 2 Feb 2009 13:01:32 +0000 Subject: [PATCH] (smerge-start-session): Add interactive spec. --- lisp/ChangeLog | 4 ++++ lisp/smerge-mode.el | 1 + 2 files changed, 5 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 545cd8f9ab9..dc567340c44 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2009-02-02 Thien-Thi Nguyen + + * smerge-mode.el (smerge-start-session): Add interactive spec. + 2009-02-02 Glenn Morris * mail/rmail.el (rmail-ignored-headers, rmail-displayed-headers) diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 05e0445f76c..a942d09c6a0 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1222,6 +1222,7 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict." (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) -- 2.39.5