# HG changeset patch
# User Reiner Steib <Reiner.Steib@gmx.de>
# Date 1210424793 0
# Node ID 361a7f0f25404eb119cd0e209d007fd1ee2a0a16
# Parent  fdbeaccc258ac6601f338d5de50a58306b076810
(smerge-command-prefix): Fix custom type.

diff -r fdbeaccc258a -r 361a7f0f2540 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat May 10 09:01:28 2008 +0000
+++ b/lisp/ChangeLog	Sat May 10 13:06:33 2008 +0000
@@ -1,3 +1,7 @@
+2008-05-10  Reiner Steib  <reiner.steib@gmx.de>
+
+	* smerge-mode.el (smerge-command-prefix): Fix custom type.
+
 2008-05-05  Carsten Dominik  <dominik@science.uva.nl>
 
 	* textmodes/org.el (org-read-date-get-relative): Interpret lone
diff -r fdbeaccc258a -r 361a7f0f2540 lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Sat May 10 09:01:28 2008 +0000
+++ b/lisp/smerge-mode.el	Sat May 10 13:06:33 2008 +0000
@@ -155,7 +155,10 @@
 (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"  "")
+		 string))
 
 (easy-mmode-defmap smerge-mode-map
   `((,smerge-command-prefix . ,smerge-basic-map))