diff options
Diffstat (limited to 'emacs/.emacs.d/init')
-rw-r--r-- | emacs/.emacs.d/init/oni-align.el | 32 | ||||
-rw-r--r-- | emacs/.emacs.d/init/oni-php-mode-init.el | 55 |
2 files changed, 0 insertions, 87 deletions
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. - -;; <?php -;; array( -;; 'foo' => '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. - -;; <?php -;; $variable = "value"; -;; $other_variable = "other value"; -;; $one_more_variable = "one more variable"; - -(add-to-list align-rules-list - `(php-assignment-equals - (regexp . ,(rx any (group (zero-or-more whitespace)) "=" - (zero-or-more whitespace) any)) - (group . (1)) - (modes . '(php-mode web-mode)) - (repeat . t))) - (provide 'oni-align) ;;; oni-align.el ends here diff --git a/emacs/.emacs.d/init/oni-php-mode-init.el b/emacs/.emacs.d/init/oni-php-mode-init.el deleted file mode 100644 index 4f37fab..0000000 --- a/emacs/.emacs.d/init/oni-php-mode-init.el +++ /dev/null @@ -1,55 +0,0 @@ -;;; oni-php-mode-init.el --- PHP mode configuration -*- lexical-binding: t; -*- - -;; Copyright (C) 2018 Tom Willemse - -;; Author: Tom Willemse <tom@ryuslash.org> -;; 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 <https://www.gnu.org/licenses/>. - -;;; 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 |