Moved away from pi-php-mode again

Using php-mode by ejmr.

.emacs.d/elisp/php-mode

@@ -0,0 +1 @@
+Subproject commit 4657723f7315f1e2873cb86b3000e225551b0c89

.emacs.d/elisp/pi-php-mode

@@ -1 +0,0 @@
-Subproject commit 32c5b60b1748f8df4f6d1472e05679a443a1dea0

.emacs.d/functions.el

@@ -181,9 +181,6 @@ Currently adds | & ! . + = - / % * , < > ? : ->"
   (setq fill-column 73)
   (auto-fill-mode))
 
-(defun on-php-mode ()
-  (local-set-key [f6] 'comment-line))
-
 (defun on-mail-mode ()
   (turn-on-auto-fill)
   (search-forward "\n\n"))

.emacs.d/init.el

@@ -1,5 +1,6 @@
 ;; -*- mode: Emacs-Lisp; -*-
 (load "~/.emacs.d/ryuslash-load-path")
+(load-file "~/.emacs.d/functions.el")
 
 ;;; Autopair
 (require 'autopair)
@@ -118,11 +119,18 @@
             (gtags-mode t)
             (djcb-gtags-create-or-update)))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; PHP
-;;                          REQUIRES                          ;;
+(autoload 'php-mode "php-mode" "Major mode for PHP" t)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(setq-default php-warn-if-mumamo-off nil) ; don't warn me about this
+(setq php-mode-force-pear t)
+(add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode))
+(add-hook 'php-mode-hook
+          (lambda ()
+            (c-set-offset 'arglist-intro '+)
+            (c-set-offset 'arglist-close '0)
+            (local-set-key [f6] 'comment-line)))
+(add-php-keywords)
 
-(load-file "~/.emacs.d/functions.el")
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                         AUTOLOADS                          ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -131,7 +139,6 @@
 (autoload 'sqlplus-mode      "sqlplus"         "Major mode for PL/SQL" t)
 (autoload 'batch-mode        "batch-mode"       "Major mode for Batch" t)
 (autoload 'lua-mode          "lua-mode"         "A Major mode for Lua" t)
-(autoload 'php-mode          "pi-php-mode"        "Major mode for PHP" t)
 (autoload 'graphviz-dot-mode "graphviz-dot-mode"  "Major mode for dot" t)
 (autoload 'cmake-mode        "cmake-mode"       "Major mode for CMake" t)
 (autoload 'rainbow-mode      "rainbow-mode"    "Minor mode for colors" t)
@@ -156,7 +163,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (setq-default indent-tabs-mode nil)       ; spaces, no tabs
 (setq-default truncate-lines t)           ; don't wrap
-(setq-default php-warn-if-mumamo-off nil) ; don't warn me about this
 (setq-default tab-width 4)
 
 (setq inhibit-startup-message t)        ; Don't show welcome screen
@@ -213,7 +219,6 @@
 (add-to-list 'auto-mode-alist '("\\.cs$"              . csharp-mode))
 (add-to-list 'auto-mode-alist '("\\.bat$"             . batch-mode))
 (add-to-list 'auto-mode-alist '("\\.lua$"             . lua-mode))
-(add-to-list 'auto-mode-alist '("\\.php[345]?$"       . php-mode))
 (add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$"     . js-mode))
 (add-to-list 'auto-mode-alist '("CMakeLists\\.txt$"   . cmake-mode))
 (add-to-list 'auto-mode-alist '("\\.cmake$"           . cmake-mode))
@@ -253,7 +258,6 @@
 
 (add-hook 'c-mode-hook                'on-c-mode)
 (add-hook 'html-mode-hook             'on-html-mode)
-(add-hook 'php-mode-hook              'on-php-mode)
 (add-hook 'message-mode-hook          'on-mail-mode)
 (add-hook 'git-commit-mode-hook       'auto-fill-mode)
 (add-hook 'css-mode-hook              'rainbow-mode)
@@ -342,7 +346,6 @@
   '(indent-region (point-min) (point-max)))
 
 (ad-activate 'server-create-window-system-frame)
-(add-php-keywords)
 (add-html-keywords)
 (make-face 'font-lock-operator-face)
 (make-face 'font-lock-end-statement)

.emacs.d/ryuslash-load-path.el

@@ -2,7 +2,7 @@
 (add-to-list 'load-path "~/.emacs.d/elisp/git-commit-mode")
 (add-to-list 'load-path "~/.emacs.d/elisp/lua-mode")
 (add-to-list 'load-path "~/.emacs.d/elisp/markdown-mode")
-(add-to-list 'load-path "~/.emacs.d/elisp/pi-php-mode")
+(add-to-list 'load-path "~/.emacs.d/elisp/php-mode")
 (add-to-list 'load-path "~/.emacs.d/elisp/rainbow")
 (add-to-list 'load-path "~/.emacs.d/elisp/rainbow-delimiters")
 (add-to-list 'load-path "~/.emacs.d/elisp/zencoding")

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "config/awesome/vicious"]
-	path = config/awesome/vicious
-	url = http://git.sysphere.org/vicious/
 [submodule ".zsh/syntax-highlighting"]
 	path = .zsh/syntax-highlighting
 	url = git://github.com/zsh-users/zsh-syntax-highlighting
@@ -19,9 +16,6 @@
 [submodule ".emacs.d/elisp/lua-mode"]
 	path = .emacs.d/elisp/lua-mode
 	url = https://github.com/immerrr/lua-mode.git
-[submodule ".emacs.d/elisp/pi-php-mode"]
-	path = .emacs.d/elisp/pi-php-mode
-	url = git://piprime.fr/emacs/pi-php-mode.git
 [submodule ".emacs.d/elisp/rainbow-delimiters"]
 	path = .emacs.d/elisp/rainbow-delimiters
 	url = git://github.com/jlr/rainbow-delimiters.git
@@ -31,3 +25,6 @@
 [submodule ".emacs.d/elisp/zencoding"]
 	path = .emacs.d/elisp/zencoding
 	url = git://github.com/rooney/zencoding.git
+[submodule ".emacs.d/elisp/php-mode"]
+	path = .emacs.d/elisp/php-mode
+	url = git://github.com/ejmr/php-mode.git