diff --git a/mode-customizations.el b/mode-customizations.el index 33e4228..6a358c0 100644 --- a/mode-customizations.el +++ b/mode-customizations.el @@ -17,7 +17,7 @@ (load-file (config-path "mode-customizations/lisp-mode.el")) (load-file (config-path "mode-customizations/makefile-mode.el")) (load-file (config-path "mode-customizations/markdown-mode.el")) -(load-file (config-path "mode-customizations/php+-mode.el")) +(load-file (config-path "mode-customizations/php-mode.el")) (load-file (config-path "mode-customizations/puppet-mode.el")) (load-file (config-path "mode-customizations/python-mode.el")) (load-file (config-path "mode-customizations/rhtml-mode.el")) diff --git a/mode-customizations/php+-mode.el b/mode-customizations/php-mode.el similarity index 68% rename from mode-customizations/php+-mode.el rename to mode-customizations/php-mode.el index 7d11063..caeb0bb 100644 --- a/mode-customizations/php+-mode.el +++ b/mode-customizations/php-mode.el @@ -1,6 +1,6 @@ -(add-to-list 'auto-mode-alist '("\\.php\\'" . php+-mode)) +(add-to-list 'auto-mode-alist '("\\.php\\'" . php-mode)) -(defun customizations-for-php+-mode () +(defun customizations-for-php-mode () (interactive) (setq whitespace-action (quote (auto-cleanup))) (flyspell-prog-mode) @@ -14,4 +14,4 @@ (highlight-indentation-mode) (highlight-indentation-current-column-mode)) -(add-hook 'php+-mode-hook 'customizations-for-php+-mode) +(add-hook 'php-mode-hook 'customizations-for-php-mode) diff --git a/packages.el b/packages.el index 552273a..3294891 100644 --- a/packages.el +++ b/packages.el @@ -56,7 +56,7 @@ magithub markdown-mode minimap - php+-mode + php-mode puppet-mode rainbow-mode restclient @@ -144,9 +144,6 @@ (when (require 'escreen nil 'noerror) (escreen-install)) - ;; Load php+-mode - (require 'php+-mode) - ;; Load ruby-electric (autoload fails) (require 'ruby-electric)