Merge branch 'master' of server.home:dotfiles

1 files changed, 13 insertions, 3 deletions

diff --git a/emacs/init.el b/emacs/init.el
index 4eab004e..337d6630 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -539,7 +539,9 @@ Values: `desktop', `server', `laptop'")
             (ido-mode 1)
             (setq ido-decorations (quote ("\n›" "" "\n " "\n …" "[" "]" " [No match]" " [Matched]" " [Not readable]" " [Too big]" " [Confirm]")))
             (setq ido-auto-merge-delay-time 99999
-                  ido-enable-flex-matching t)
+                  ido-enable-flex-matching t
+                  ido-save-directory-list-file (expand-file-name user-emacs-directory
+                                                                 "ido-state"))
             (ido-init-completion-maps)
             (defun ido-manual-merge ()
               (interactive)
@@ -557,13 +559,13 @@ Values: `desktop', `server', `laptop'")
             (setq smex-history-length 100
                   smex-save-file (concat user-emacs-directory
                                          "smex-items"))
-            (smex-initialize)
             (setq smex-key-advice-ignore-menu-bar t
                   smex-auto-update nil)
             (defun smex-update-after-load (unused)
               (if (boundp 'smex-cache)
                   (smex-update)))
-            (add-hook 'after-load-functions 'smex-update-after-load)))
+            (add-hook 'after-load-functions 'smex-update-after-load))
+  :init (smex-initialize))
 
 ;;;; Modeline
 
@@ -1168,6 +1170,14 @@ Works with: arglist-cont-nonempty, arglist-close."
   :defer t
   :config (setq sgml-basic-offset 4))
 
+(use-package web-mode
+  :defer t
+  :mode (("/views/.*\\.php\\'" . web-mode)
+         ("/templates/.*\\.php\\'" . web-mode))
+  :config (setq web-mode-code-indent-offset 4
+                web-mode-css-indent-offset 4
+                web-mode-markup-indent-offset 4))
+
 ;;;; Windows & Frames
 
 (setq frame-title-format