23.0.60; smerge-command-prefix custom type

[Reiner Steib]

Hi,

customizing `smerge-command-prefix' ends up like this:

,----[ M-x customize-variable RET smerge-command-prefix RET ]
| Smerge Command Prefix: [Hide Value] [Value Menu] String: ^C^   
|    [State]: STANDARD.
|    Prefix for `smerge-mode' commands.
| -UUU:**--F1  *Customize Option: Smerge Command Prefix*   (Custom)----
| Available choices:
| 
| 0 = String
| 1 = String
| 2 = String
| 3 = String
`----

All choices look the same.

I'd suggest to install this patch...

--8<---------------cut here---------------start------------->8---
--- smerge-mode.el      12 Apr 2008 11:36:45 +0200      1.66
+++ smerge-mode.el      08 May 2008 23:05:59 +0200      
@@ -160,7 +160,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))
--8<---------------cut here---------------end--------------->8---

... so that we get:

,----[ M-x customize-variable RET smerge-command-prefix RET ]
| Smerge Command Prefix: [Hide Value] [Value Menu] C-c ^
|    [State]: STANDARD.
|    Prefix for `smerge-mode' commands.
| -UUU:**--F1  *Customize Option: Smerge Command Prefix*   (Custom)----
| Available choices:
| 
| 0 = ESC
| 1 = C-c ^
| 2 = none
| 3 = String
`----

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/