[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el, v [EMACS_22_BASE]

[Reiner Steib]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Reiner Steib <rsteib>   08/05/10 13:06:39

Index: smerge-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.50.2.3
retrieving revision 1.50.2.4
diff -u -b -r1.50.2.3 -r1.50.2.4
--- smerge-mode.el      7 Jan 2008 02:44:15 -0000       1.50.2.3
+++ smerge-mode.el      10 May 2008 13:06:32 -0000      1.50.2.4
@@ -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))