Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix "magit-key-mode-generate" name collision

magit-simple-keys.el and magit-key-mode.el were defining and using this function differently
  • Loading branch information...
commit ee7431ce6be34cc2cc5e8c6e7ba458dbafd5da35 1 parent d00b478
@wrog wrog authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 contrib/magit-simple-keys.el
View
4 contrib/magit-simple-keys.el
@@ -37,7 +37,7 @@
(merging magit-merge)
(submodule magit-submodule-update)))
-(defun magit-key-mode-generate (term mapping-function)
+(defun magit-simple-keys-key-mode-generate (term mapping-function)
"Generate alias for the key-group term"
(eval
`(defalias ',(intern (concat "magit-key-mode-popup-" (symbol-name term)))
@@ -45,7 +45,7 @@
;; generate the aliases using the mapping in key-mode-mapping
(mapc (lambda (g)
- (magit-key-mode-generate (car g) (cadr g)))
+ (magit-simple-keys-key-mode-generate (car g) (cadr g)))
magit-key-mode-mapping)
(provide 'magit-simple-keys)
Please sign in to comment.
Something went wrong with that request. Please try again.