andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(smerge-command-prefix): Fix custom type.

Browse source
This commit is contained in:
Reiner Steib 2008-05-10 13:06:33 +00:00
parent 102d70a83d
commit e76fdf5307
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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

5
lisp/smerge-mode.el
View file

@ -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))