From 3bd8d43a4744bb744340712487b666e5e924590a Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Mon, 9 Jul 2018 19:23:29 -0700 Subject: [PATCH] Move web-mode configuration to separate file --- emacs/.emacs.d/init.el | 9 +---- emacs/.emacs.d/init/oni-php-mode-init.el | 7 +--- emacs/.emacs.d/init/oni-web-mode-init.el | 32 +++++++++++++++++ .../site-lisp/whitespace-only-tabs-mode.el | 34 +++++++++++++++++++ 4 files changed, 68 insertions(+), 14 deletions(-) create mode 100755 emacs/.emacs.d/init/oni-web-mode-init.el create mode 100755 emacs/.emacs.d/site-lisp/whitespace-only-tabs-mode.el diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index e86de9e..c6a57d7 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -25,11 +25,6 @@ ;;; Code: -(defun init-whitespace-only-tabs-mode () - "Enable whitespace mode with only tabs showing." - (setq-local whitespace-style '(face tabs)) - (whitespace-mode)) - (eval-and-compile (let ((load-directory (file-name-directory @@ -317,9 +312,7 @@ (add-hook 'git-commit-mode-hook 'electric-quote-local-mode) -(add-hook 'web-mode-hook 'init-whitespace-only-tabs-mode) - -(add-hook 'makefile-mode-hook 'init-whitespace-only-tabs-mode) +(add-hook 'makefile-mode-hook 'whitespace-only-tabs-mode) (add-hook 'makefile-mode-hook 'electric-pair-local-mode) diff --git a/emacs/.emacs.d/init/oni-php-mode-init.el b/emacs/.emacs.d/init/oni-php-mode-init.el index b0cdfe8..bfbed61 100644 --- a/emacs/.emacs.d/init/oni-php-mode-init.el +++ b/emacs/.emacs.d/init/oni-php-mode-init.el @@ -30,11 +30,6 @@ "Set `require-final-newline' to t." (setq require-final-newline t)) -(defun oni-php-mode-init--whitespace-tabs-mode () - "Set `whitespace-style' to show tabs only." - (setq-local whitespace-style '(face tabs)) - (whitespace-mode)) - (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) @@ -43,7 +38,7 @@ (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 #'oni-php-mode-init--whitespace-tabs-mode) +(add-hook 'php-mode-hook 'whitespace-tabs-mode) (with-eval-after-load 'company (add-to-list 'company-backends 'company-ac-php-backend)) diff --git a/emacs/.emacs.d/init/oni-web-mode-init.el b/emacs/.emacs.d/init/oni-web-mode-init.el new file mode 100755 index 0000000..3538f23 --- /dev/null +++ b/emacs/.emacs.d/init/oni-web-mode-init.el @@ -0,0 +1,32 @@ +;;; oni-web-mode-init.el --- Web mode configuration -*- lexical-binding: t; -*- + +;; Copyright (C) 2018 Tom Willemse + +;; Author: Tom Willemse +;; 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 `web-mode' configuration. + +;;; Code: + +(add-hook 'web-mode-hook 'whitespace-only-tabs-mode) +(add-hook 'web-mode-hook 'flycheck-mode) +(add-hook 'web-mode-hook 'electric-pair-local-mode) + +(provide 'oni-web-mode-init) +;;; oni-web-mode-init.el ends here diff --git a/emacs/.emacs.d/site-lisp/whitespace-only-tabs-mode.el b/emacs/.emacs.d/site-lisp/whitespace-only-tabs-mode.el new file mode 100755 index 0000000..f64e52f --- /dev/null +++ b/emacs/.emacs.d/site-lisp/whitespace-only-tabs-mode.el @@ -0,0 +1,34 @@ +;;; whitespace-only-tabs-mode.el --- Specialized whitespace mode that only shows tabs -*- lexical-binding: t; -*- + +;; Copyright (C) 2018 Tom Willemse + +;; Author: Tom Willemse +;; Keywords: convenience + +;; 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: + +;; A customized version of `whitespace-mode' that only shows tabs. + +;;; Code: + +;;;###autoload +(defun init-whitespace-only-tabs-mode () + "Enable whitespace mode with only tabs showing." + (setq-local whitespace-style '(face tabs)) + (whitespace-mode)) + +(provide 'whitespace-only-tabs-mode) +;;; whitespace-only-tabs-mode.el ends here