Merge branch 'master' of github.com:bbatsov/prelude

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Bozhidar Batsov 2013-08-12 19:04:09 +03:00
commit 22edcac3cb

View file

@ -60,7 +60,7 @@
(global-set-key (kbd "C-x M-m") 'shell) (global-set-key (kbd "C-x M-m") 'shell)
;; If you want to be able to M-x without meta ;; If you want to be able to M-x without meta
(global-set-key (kbd "C-x C-m") 'execute-extended-command) (global-set-key (kbd "C-x C-m") 'smex)
;; A complementary binding to the apropos-command (C-h a) ;; A complementary binding to the apropos-command (C-h a)
(define-key 'help-command "A" 'apropos) (define-key 'help-command "A" 'apropos)