From e76fdf5307ec8c76b2c531d3f0171a79e0afaca3 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Sat, 10 May 2008 13:06:33 +0000 Subject: [PATCH] (smerge-command-prefix): Fix custom type. --- lisp/ChangeLog | 4 ++++ lisp/smerge-mode.el | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 71d17168f09..5889ab5fa81 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +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 diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 9ef2dade0e0..451b96a261b 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -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" "") + string)) (easy-mmode-defmap smerge-mode-map `((,smerge-command-prefix . ,smerge-basic-map)) -- 2.39.5