procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Thien-Thi Nguyen 2009-02-02 13:01:32 +00:00
parent d0a76a6ece
commit 1b7c198ad1
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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)

1
lisp/smerge-mode.el
View file

@ -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)