diff --git a/.emacs.d/Cask b/.emacs.d/Cask index fd436a1..0704796 100644 --- a/.emacs.d/Cask +++ b/.emacs.d/Cask @@ -19,8 +19,8 @@ (depends-on "twilight-theme") (depends-on "late-night-theme") ;; PHP -(depends-on "multi-web-mode") (depends-on "php-mode") +(depends-on "web-mode") ;; Python (depends-on "python") diff --git a/.emacs.d/init.d/php.el b/.emacs.d/init.d/php.el index 56eaf59..2ab9d09 100644 --- a/.emacs.d/init.d/php.el +++ b/.emacs.d/init.d/php.el @@ -10,12 +10,3 @@ (c-set-offset 'case-label '+)) (add-hook 'php-mode-hook 'my-php-mode-hook) - -;; Multi-Web-Mode -(require 'multi-web-mode) -(setq mweb-default-major-mode 'html-mode) -(setq mweb-tags '((php-mode "<\\?php\\|<\\? \\|<\\?=" "\\?>") - (js-mode "]*>" "") - (css-mode "]*>" ""))) -(setq mweb-filename-extensions '("php" "htm" "html" "ctp" "phtml" "php4" "php5" "tpl")) -(multi-web-global-mode 1)