Mercurial > emacs
changeset 80570:361a7f0f2540
(smerge-command-prefix): Fix custom type.
| author | Reiner Steib <Reiner.Steib@gmx.de> |
|---|---|
| date | Sat, 10 May 2008 13:06:33 +0000 |
| parents | fdbeaccc258a |
| children | 2143d86d5d7c |
| files | lisp/ChangeLog lisp/smerge-mode.el |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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))