Commit 1b7c198a authored by Thien-Thi Nguyen's avatar Thien-Thi Nguyen
Browse files

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

parent d0a76a6e
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)
......@@ -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'."
(smerge-mode 1)
(condition-case nil
(unless (looking-at smerge-begin-re)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment