about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <vincent@spotify.com>2014-01-07T13·54+0100
committerVincent Ambo <vincent@spotify.com>2014-01-07T13·54+0100
commit490ea14fadb3dabdf71e6ac55a0a2a1e4f3d9330 (patch)
treeab33b6b770c6c1ca761b4f1c523cf11cbc214554
parenta9acb7f560f19a3971922852878418b742872eb3 (diff)
Ignore key-advice from menu-bar options
-rw-r--r--init-settings.el1
-rw-r--r--init.el8
2 files changed, 4 insertions, 5 deletions
diff --git a/init-settings.el b/init-settings.el
index 6388a88ce377..4aaaa622f220 100644
--- a/init-settings.el
+++ b/init-settings.el
@@ -50,6 +50,7 @@
   (add-hook 'after-init-hook 'sml/setup))
 
 (setq smex-save-file (concat user-emacs-directory ".smex-items"))
+(setq smex-key-advice-ignore-menu-bar t)
 (smex-initialize)
 (global-set-key (kbd "M-x") 'smex)
 
diff --git a/init.el b/init.el
index d5455f27dd22..e0a77094541d 100644
--- a/init.el
+++ b/init.el
@@ -12,11 +12,10 @@
 ;; precendence.
 (add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/"))
 
+;; And load things!
+(package-refresh-contents)
 (package-initialize)
 
-(when (not package-archive-contents)
-  (package-refresh-contents))
-
 (defvar my-pkgs
   '(; Basic functionality
     ace-jump-mode
@@ -57,8 +56,7 @@
     evil-paredit
     key-chord
     surround)
-  "Evil related packages"
-)
+  "Evil related packages")
 
 (dolist (p my-pkgs)
   (when (not (package-installed-p p))