Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
e76fdf53
Commit
e76fdf53
authored
May 10, 2008
by
Reiner Steib
Browse files
(smerge-command-prefix): Fix custom type.
parent
102d70a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/smerge-mode.el
lisp/smerge-mode.el
+4
-1
No files found.
lisp/ChangeLog
View file @
e76fdf53
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
lisp/smerge-mode.el
View file @
e76fdf53
...
...
@@ -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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment