diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/smerge-mode.el | 1 |
2 files changed, 5 insertions, 0 deletions
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 <ttn@gnuvola.org> + + * smerge-mode.el (smerge-start-session): Add interactive spec. + 2009-02-02 Glenn Morris <rgm@gnu.org> * 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) |