From 48b21ea2677160f3e492b3f4ebbb01bf27a745ee Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 5 Aug 2012 18:56:35 +0100
Subject: [PATCH] Enable php+-mode, and adapt old php-mode customizations for
 it

---
 mode-customizations.el                            | 2 +-
 mode-customizations/{php-mode.el => php+-mode.el} | 6 +++---
 packages.el                                       | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)
 rename mode-customizations/{php-mode.el => php+-mode.el} (53%)

diff --git a/mode-customizations.el b/mode-customizations.el
index cebcbde..c96bcbd 100644
--- a/mode-customizations.el
+++ b/mode-customizations.el
@@ -15,7 +15,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/python-mode.el"))
 (load-file (config-path "mode-customizations/rhtml-mode.el"))
 (load-file (config-path "mode-customizations/ruby-mode.el"))
diff --git a/mode-customizations/php-mode.el b/mode-customizations/php+-mode.el
similarity index 53%
rename from mode-customizations/php-mode.el
rename to mode-customizations/php+-mode.el
index 26e911a..e6be759 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)
@@ -9,4 +9,4 @@
   (auto-complete-mode)
   (highlight-indentation-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 9bc3da0..7317bf1 100644
--- a/packages.el
+++ b/packages.el
@@ -133,6 +133,9 @@
   ;; Load fill-column-indicator
   (require 'fill-column-indicator)
 
+  ;; Load php+-mode
+  (require 'php+-mode)
+
   ;; Load Undo-Tree
   (require 'undo-tree)