diff .elisp/settings/00.bootstrap.el @ 306:ae22ef7859eb

Merge.
author Augie Fackler <raf@durin42.com>
date Tue, 04 Dec 2012 11:08:15 -0600
parents 6fd7c78744a6
children 7cb31ed262f0
line wrap: on
line diff
--- a/.elisp/settings/00.bootstrap.el
+++ b/.elisp/settings/00.bootstrap.el
@@ -5,6 +5,7 @@
 (package-initialize)
 
 (setq package-archives '(("durin42" . "http://durin42.com/elpa/")
+                         ("marmalade" . "http://marmalade-repo.org/packages/")
                          ("elpa" . "http://tromey.com/elpa/")))
 
 (defun af-bootstrap-packages ()
@@ -24,7 +25,9 @@
                   paredit
                   smex
                   yaml-mode
-                  company))
+                  company
+                  wgrep
+                  ))
     (unless (or (member pack package-activated-list)
                 (functionp pack))
       (message "Installing %s" (symbol-name pack))