From 0179fa3abe05c3837599facfa99eb2cabb78bc6f Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Tue, 19 Jun 2018 10:40:09 -0700
Subject: [PATCH] Stop using Org for PHP config

---
 emacs/.emacs.d/init/oni-php-mode-init.el  | 19 +++++++++
 emacs/.emacs.d/init/oni-php-mode-init.org | 51 -----------------------
 2 files changed, 19 insertions(+), 51 deletions(-)
 create mode 100644 emacs/.emacs.d/init/oni-php-mode-init.el
 delete mode 100644 emacs/.emacs.d/init/oni-php-mode-init.org

diff --git a/emacs/.emacs.d/init/oni-php-mode-init.el b/emacs/.emacs.d/init/oni-php-mode-init.el
new file mode 100644
index 0000000..abf37f2
--- /dev/null
+++ b/emacs/.emacs.d/init/oni-php-mode-init.el
@@ -0,0 +1,19 @@
+(eval-when-compile (require 'company))
+
+(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)
+
+(defun oni:set-require-final-newline ()
+  (setq require-final-newline t))
+
+(add-hook 'php-mode-hook 'oni:set-require-final-newline)
+
+(add-hook 'php-mode-hook 'company-mode)
+
+(with-eval-after-load 'company
+  (add-to-list 'company-backends 'company-ac-php-backend))
+
+(add-hook 'php-mode-hook 'ggtags-mode)
diff --git a/emacs/.emacs.d/init/oni-php-mode-init.org b/emacs/.emacs.d/init/oni-php-mode-init.org
deleted file mode 100644
index 17b6ce7..0000000
--- a/emacs/.emacs.d/init/oni-php-mode-init.org
+++ /dev/null
@@ -1,51 +0,0 @@
-#+TITLE: PHP
-
-Turn on electric pairing in php-mode.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'php-mode-hook 'electric-pair-local-mode)
-#+END_SRC
-
-Turn on electric indenting in php-mode.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'php-mode-hook 'electric-indent-local-mode)
-#+END_SRC
-
-Enable flycheck in php-mode.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'php-mode-hook 'flycheck-mode)
-#+END_SRC
-
-Reset =require-final-newline= because the default php-mode style
-disables it.
-
-#+BEGIN_SRC emacs-lisp
-  (defun oni:set-require-final-newline ()
-    (setq require-final-newline t))
-
-  (add-hook 'php-mode-hook 'oni:set-require-final-newline)
-#+END_SRC
-
-Enable company mode for completion.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'php-mode-hook 'company-mode)
-#+END_SRC
-
-Load a PHP-specific completion back-end when company mode is loaded.
-
-#+BEGIN_SRC emacs-lisp
-  (eval-when-compile (require 'company))
-
-  (with-eval-after-load 'company
-    (require 'company-php)
-    (add-to-list 'company-backends 'company-ac-php-backend))
-#+END_SRC
-
-Enable ggtags-mode for tags browsing with global.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'php-mode-hook 'ggtags-mode)
-#+END_SRC