Merge pull request #551 from toctan/fix-define-key

Fix define-key 'help-command

core/prelude-global-keybindings.el

@@ -65,6 +65,9 @@
 ;; A complementary binding to the apropos-command (C-h a)
 (define-key 'help-command "A" 'apropos)
 
+;; A quick major mode help with discover-my-major
+(define-key 'help-command (kbd "C-m") 'discover-my-major)
+
 (define-key 'help-command (kbd "C-f") 'find-function)
 (define-key 'help-command (kbd "C-k") 'find-function-on-key)
 (define-key 'help-command (kbd "C-v") 'find-variable)

core/prelude-mode.el

@@ -65,7 +65,6 @@
     (define-key map (kbd "C-c h") 'helm-prelude)
     (define-key map (kbd "C-c I") 'prelude-find-user-init-file)
     (define-key map (kbd "C-c S") 'prelude-find-shell-init-file)
-    (define-key map 'help-command (kbd "C-m") 'discover-my-major)
     ;; make some use of the Super key
     (define-key map [?\s-d] 'projectile-find-dir)
     (define-key map [?\s-p] 'projectile-switch-project)