From 76b1bcd59a80b866179da26bde65f77172111d83 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Mon, 31 Aug 2020 12:22:58 +0100 Subject: Drop support for wpc-java 1. I don't use this. 2. This is breaking CI because google-java-format cannot be found. --- emacs/.emacs.d/init.el | 1 - emacs/.emacs.d/wpc/wpc-java.el | 42 ------------------------------------------ 2 files changed, 43 deletions(-) delete mode 100644 emacs/.emacs.d/wpc/wpc-java.el (limited to 'emacs') diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index c610ce7db7a8..d3cc4f2dc53e 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -51,6 +51,5 @@ (require 'wpc-clojure) (require 'wpc-python) (require 'wpc-javascript) -(require 'wpc-java) (require 'wpc-prolog) (require 'wpc-golang) diff --git a/emacs/.emacs.d/wpc/wpc-java.el b/emacs/.emacs.d/wpc/wpc-java.el deleted file mode 100644 index 4f33ba962e5d..000000000000 --- a/emacs/.emacs.d/wpc/wpc-java.el +++ /dev/null @@ -1,42 +0,0 @@ -;;; wpc-java.el --- Java configuration -*- lexical-binding: t -*- -;; Author: William Carroll - -;;; Commentary: -;; When life gets you down, and you find yourself writing Java, remember: at -;; least you're using Emacs. - -;;; Code: - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Dependencies -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(require 'prelude) -(require 'macros) - -(prelude/assert - (prelude/executable-exists? "google-java-format")) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Configuration -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; TODO: Troubleshoot why this isn't running. -(add-hook-before-save - 'java-mode-hook - (lambda () - (call-interactively - #'google-java-format))) - -(add-hook 'java-mode-hook - (lambda () - (setq c-basic-offset 2 - tab-width 2))) - -;; TODO: Figure out whether I should use this or google-emacs. -;; (use-package lsp-java -;; :config -;; (add-hook 'java-mode-hook #'lsp)) - -(provide 'wpc-java) -;;; wpc-java.el ends here -- cgit 1.4.1