ryuslash/legacy-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move PHP commands to separate library

Browse source
This commit is contained in:
Tom Willemse 2015-12-18 00:31:39 +01:00
parent ab94c9ab96
commit 4a8201fc9a
2 changed files with 53 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
emacs/.emacs.d/init.el
View file

@ -141,12 +141,6 @@ MODE1 is enabled and vice-versa."
"Set the `disabled' property for each item in FUNCTIONS to nil." "Set the `disabled' property for each item in FUNCTIONS to nil."
(mapc #'(lambda (f) (put f 'disabled nil)) functions)) (mapc #'(lambda (f) (put f 'disabled nil)) functions))
(defun oni:php-mode-func ()
"Function for `php-mode-hook'."
(c-set-offset 'arglist-intro '+)
(c-set-offset 'arglist-close '0)
(setq-local fci-rule-column 80))
(defun oni:pop-to-buffer-in-side-window (buffer alist) (defun oni:pop-to-buffer-in-side-window (buffer alist)
(display-buffer-in-side-window buffer alist) (display-buffer-in-side-window buffer alist)
(select-window (get-buffer-window buffer))) (select-window (get-buffer-window buffer)))
@ -885,6 +879,14 @@ If no direction is given, don't split."
(add-hook 'prog-mode-hook 'highlight-numbers-mode) (add-hook 'prog-mode-hook 'highlight-numbers-mode)
(add-hook 'compilation-filter-hook 'colorize-compilation-buffer) (add-hook 'compilation-filter-hook 'colorize-compilation-buffer)
;; Set the FCI column to the PSR-2 recommended column
(add-hook 'php-mode-hook 'oni:set-psr2-margin)
;; Set the argument list opener and closer according to the PSR-2
;; recommendation.
(add-hook 'php-mode-hook 'oni:set-psr2-arglist-intro)
(add-hook 'php-mode-hook 'oni:set-psr2-arglist-close)
;; Notify me of the finished status of compilation. ;; Notify me of the finished status of compilation.
(add-hook 'compilation-finish-functions 'oni:alert-compilation-finish) (add-hook 'compilation-finish-functions 'oni:alert-compilation-finish)
@ -942,9 +944,6 @@ If no direction is given, don't split."
(oni:add-hooks 'markdown-mode-hook (oni:add-hooks 'markdown-mode-hook
#'whitespace-mode 'oni:show-trailing-whitespace) #'whitespace-mode 'oni:show-trailing-whitespace)
(oni:add-hooks 'php-mode-hook
#'oni:php-mode-func)
(oni:add-hooks 'prog-mode-hook (oni:add-hooks 'prog-mode-hook
#'oni:prog-mode-func 'oni:maybe-fci-mode #'rainbow-delimiters-mode #'oni:prog-mode-func 'oni:maybe-fci-mode #'rainbow-delimiters-mode
'oni:maybe-prettify-symbols-mode) 'oni:maybe-prettify-symbols-mode)

45
emacs/.emacs.d/site-lisp/oni-php.el Normal file
View file

@ -0,0 +1,45 @@
;;; oni-php.el --- Extra PHP mode functions and commands -*- lexical-binding: t; -*-
;; Copyright (C) 2015 Tom Willemse
;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords:
;; 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 <http://www.gnu.org/licenses/>.
;;; Commentary:
;; Here are some PHP-related commands and functions.
;;; Code:
(require 'fill-column-indicator)
;;;###autoload
(defun oni:set-psr2-arglist-close ()
"Set the argument list closer indentation to the PSR-2 recommendation."
(c-set-offset 'arglist-close '0))
;;;###autoload
(defun oni:set-psr2-arglist-intro ()
"Set the argument list opener indentation to the PSR-2 recommendation."
(c-set-offset 'arglist-intro '+))
;;;###autoload
(defun oni:set-psr2-margin ()
"Set the `fci-rule-column' to the PSR-2 recommended width."
(setq-local fci-rule-column 80))
(provide 'oni-php)
;;; oni-php.el ends here