Commit e76fdf53 authored by Reiner Steib's avatar Reiner Steib
Browse files

(smerge-command-prefix): Fix custom type.

parent 102d70a8
2008-05-10 Reiner Steib <>
* smerge-mode.el (smerge-command-prefix): Fix custom type.
2008-05-05 Carsten Dominik <>
* textmodes/org.el (org-read-date-get-relative): Interpret lone
......@@ -155,7 +155,10 @@ Used in `smerge-diff-base-mine' and related functions."
(defcustom smerge-command-prefix "\C-c^"
"Prefix for `smerge-mode' commands."
:group 'smerge
:type '(choice (string "\e") (string "\C-c^") (string "") string))
:type '(choice (const :tag "ESC" "\e")
(const :tag "C-c ^" "\C-c^" )
(const :tag "none" "")
(easy-mmode-defmap smerge-mode-map
`((,smerge-command-prefix . ,smerge-basic-map))
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