diff options
| author | Thien-Thi Nguyen <[email protected]> | 2009-02-02 13:01:32 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <[email protected]> | 2009-02-02 13:01:32 +0000 |
| commit | 1b7c198ad16aac7eae623980acce27eec671df46 (patch) | |
| tree | 06975365c28fb18f6a277c03f89ab0e02d1eb991 /lisp/smerge-mode.el | |
| parent | d0a76a6eceb0b6f31d4d97e2f709543a863dc16d (diff) | |
(smerge-start-session): Add interactive spec.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 05e0445f76..a942d09c6a 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) |