diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index b57ac30..b9cbffd 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -229,7 +229,6 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified" (with-eval-after-load 'js (load "oni-js-mode-init")) (with-eval-after-load 'lui (load "oni-lui-init")) (with-eval-after-load 'magit (load "oni-magit-init")) -(with-eval-after-load 'php-mode (load "oni-php-mode-init")) (with-eval-after-load 'ruby-mode (load "oni-ruby-init")) (with-eval-after-load 'scheme (load "oni-scheme-init")) (with-eval-after-load 'sh-mode (load "oni-sh-mode-init")) @@ -251,11 +250,9 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified" :interactive) (add-to-list 'auto-mode-alist '("\\.blade\\.php\\'" . web-mode)) -(add-to-list 'auto-mode-alist '("\\.inc\\'" . php-mode)) (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)) (add-to-list 'auto-mode-alist '("\\.jsx\\'" . rjsx-mode)) (add-to-list 'auto-mode-alist '("\\.mbsyncrc\\'" . mbsync-conf-mode)) -(add-to-list 'auto-mode-alist '("\\.module\\'" . php-mode)) (add-to-list 'auto-mode-alist '("\\.msmtprc\\'" . msmtprc-mode)) (add-to-list 'auto-mode-alist '("\\.targets\\'" . nxml-mode)) (add-to-list 'auto-mode-alist '("\\.proj\\'" . nxml-mode)) @@ -278,7 +275,6 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified" (add-to-list 'grep-files-aliases '("js" . "*.js *.jsx *.json")) (add-to-list 'grep-files-aliases '("css" . "*.css *.less *.sass *.scss")) -(add-to-list 'grep-files-aliases '("php" . "*.php *.inc *.module")) (add-to-list 'grep-files-aliases '("msbuild" . "*.targets *.proj")) (add-hook 'before-save-hook 'time-stamp) diff --git a/emacs/.emacs.d/init/oni-align.el b/emacs/.emacs.d/init/oni-align.el index 3e45844..8e63d27 100644 --- a/emacs/.emacs.d/init/oni-align.el +++ b/emacs/.emacs.d/init/oni-align.el @@ -74,37 +74,5 @@ (group . (1)) (modes . '(scss-mode css-mode)))) -;; In PHP code it's nice to have any ~=>~ aligned. - -;; 'bar', -;; 'frob' => 'baz' -;; ); -;; ?> - -(add-to-list 'align-rules-list - `(php-array-arrow - (regexp . ,(rx any (group (zero-or-more whitespace)) "=>" any)) - (group . (1)) - (modes . '(php-mode web-mode)) - (repeat . t))) - -;; The WordPress coding standards specify that multiple assignments -;; should have their assignment operators aligned. - -;; -;; Keywords: local - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . - -;;; Commentary: - -;; My PHP mode configuration. - -;;; Code: - -(require 'php-mode) -(require 'hydra) -(eval-when-compile - (require 'company)) - -(defun oni-php-mode-init--set-require-final-newline () - "Set `require-final-newline' to t." - (setq require-final-newline t)) - -(defhydra php-mode-hydra (:color blue) - ("a" align-current "Align current selection")) - -(add-hook 'php-mode-hook 'electric-pair-local-mode) -(add-hook 'php-mode-hook 'electric-indent-local-mode) -(add-hook 'php-mode-hook 'flycheck-mode) -(add-hook 'php-mode-hook #'oni-php-mode-init--set-require-final-newline) -(add-hook 'php-mode-hook 'company-mode) -(add-hook 'php-mode-hook 'ggtags-mode) -(add-hook 'php-mode-hook 'fci-mode) -(add-hook 'php-mode-hook 'fic-mode) -(add-hook 'php-mode-hook 'whitespace-only-tabs-mode) - -(with-eval-after-load 'company - (add-to-list 'company-backends 'company-ac-php-backend)) - -(define-key php-mode-map (kbd "C-c m") #'php-mode-hydra/body) - -(provide 'oni-php-mode-init) -;;; oni-php-mode-init.el ends here