diff options
| author | Reiner Steib <Reiner.Steib@gmx.de> | 2008-05-10 13:06:33 +0000 |
|---|---|---|
| committer | Reiner Steib <Reiner.Steib@gmx.de> | 2008-05-10 13:06:33 +0000 |
| commit | e76fdf5307ec8c76b2c531d3f0171a79e0afaca3 (patch) | |
| tree | 580bd75854b11bbbc0b431df304ade0131aeb32c /lisp | |
| parent | 102d70a83d45105b2580fcebbef3360848ddfe18 (diff) | |
| download | emacs-e76fdf5307ec8c76b2c531d3f0171a79e0afaca3.tar.gz emacs-e76fdf5307ec8c76b2c531d3f0171a79e0afaca3.tar.bz2 emacs-e76fdf5307ec8c76b2c531d3f0171a79e0afaca3.zip | |
(smerge-command-prefix): Fix custom type.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/smerge-mode.el | 5 |
2 files changed, 8 insertions, 1 deletions
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 <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 --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)) |