From 36c8b991eeaa75ac2572faff2c4ce58b426a1620 Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Sun, 16 Oct 2016 22:32:11 +0200
Subject: [PATCH] Make sure init files have unique names

---
 emacs/.emacs.d/init.org                              | 12 ++++++------
 .../init/{dired-init.org => oni-dired-init.org}      |  0
 .../init/{ediff-init.org => oni-ediff-init.org}      |  0
 .../init/{js-mode-init.org => oni-js-mode-init.org}  |  0
 .../init/{magit-init.org => oni-magit-init.org}      |  0
 .../{php-mode-init.org => oni-php-mode-init.org}     |  6 ++++++
 .../init/{sh-mode-init.org => oni-sh-mode-init.org}  |  0
 7 files changed, 12 insertions(+), 6 deletions(-)
 rename emacs/.emacs.d/init/{dired-init.org => oni-dired-init.org} (100%)
 rename emacs/.emacs.d/init/{ediff-init.org => oni-ediff-init.org} (100%)
 rename emacs/.emacs.d/init/{js-mode-init.org => oni-js-mode-init.org} (100%)
 rename emacs/.emacs.d/init/{magit-init.org => oni-magit-init.org} (100%)
 rename emacs/.emacs.d/init/{php-mode-init.org => oni-php-mode-init.org} (88%)
 rename emacs/.emacs.d/init/{sh-mode-init.org => oni-sh-mode-init.org} (100%)

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 4e79fb0..39cdc45 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -697,21 +697,21 @@ To start off, first I need to enable lexical binding.
        errors.
 
        #+BEGIN_SRC emacs-lisp
-         (with-eval-after-load 'js (load "js-mode-init"))
+         (with-eval-after-load 'js (load "oni-js-mode-init"))
        #+END_SRC
 
   - [[file:init/php-mode-init.org][php-mode]] :: I use PHP mode for files that only contain PHP code,
        no HTML or anything.
 
        #+BEGIN_SRC emacs-lisp
-         (with-eval-after-load 'php-mode (load "php-mode-init"))
+         (with-eval-after-load 'php-mode (load "oni-php-mode-init"))
        #+END_SRC
 
   - [[file:init/sh-mode-init.org][sh-mode]] :: Used for most types of shell scripting (bash, zsh,
        etc.).
 
        #+BEGIN_SRC emacs-lisp
-         (with-eval-after-load 'sh-mode (load "sh-mode-init"))
+         (with-eval-after-load 'sh-mode (load "oni-sh-mode-init"))
        #+END_SRC
 
 ** Emacs lisp mode
@@ -932,20 +932,20 @@ To start off, first I need to enable lexical binding.
        enough /yet/.
 
        #+BEGIN_SRC emacs-lisp
-         (with-eval-after-load 'dired (load "dired-init"))
+         (with-eval-after-load 'dired (load "oni-dired-init"))
        #+END_SRC
 
   - [[file:init/magit-init.org][Magit]] :: The Emacs git interface. By now I think I may know magit
        better than the git cli.
 
        #+BEGIN_SRC emacs-lisp
-         (with-eval-after-load 'magit (load "magit-init"))
+         (with-eval-after-load 'magit (load "oni-magit-init"))
        #+END_SRC
 
   - [[file:init/ediff-init.org][Ediff]] :: A reall diff application.
 
        #+BEGIN_SRC emacs-lisp
-         (with-eval-after-load 'ediff (load "ediff-init"))
+         (with-eval-after-load 'ediff (load "oni-ediff-init"))
        #+END_SRC
 
 ** Gnus
diff --git a/emacs/.emacs.d/init/dired-init.org b/emacs/.emacs.d/init/oni-dired-init.org
similarity index 100%
rename from emacs/.emacs.d/init/dired-init.org
rename to emacs/.emacs.d/init/oni-dired-init.org
diff --git a/emacs/.emacs.d/init/ediff-init.org b/emacs/.emacs.d/init/oni-ediff-init.org
similarity index 100%
rename from emacs/.emacs.d/init/ediff-init.org
rename to emacs/.emacs.d/init/oni-ediff-init.org
diff --git a/emacs/.emacs.d/init/js-mode-init.org b/emacs/.emacs.d/init/oni-js-mode-init.org
similarity index 100%
rename from emacs/.emacs.d/init/js-mode-init.org
rename to emacs/.emacs.d/init/oni-js-mode-init.org
diff --git a/emacs/.emacs.d/init/magit-init.org b/emacs/.emacs.d/init/oni-magit-init.org
similarity index 100%
rename from emacs/.emacs.d/init/magit-init.org
rename to emacs/.emacs.d/init/oni-magit-init.org
diff --git a/emacs/.emacs.d/init/php-mode-init.org b/emacs/.emacs.d/init/oni-php-mode-init.org
similarity index 88%
rename from emacs/.emacs.d/init/php-mode-init.org
rename to emacs/.emacs.d/init/oni-php-mode-init.org
index 0b425fe..17b6ce7 100644
--- a/emacs/.emacs.d/init/php-mode-init.org
+++ b/emacs/.emacs.d/init/oni-php-mode-init.org
@@ -43,3 +43,9 @@ Load a PHP-specific completion back-end when company mode is loaded.
     (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
diff --git a/emacs/.emacs.d/init/sh-mode-init.org b/emacs/.emacs.d/init/oni-sh-mode-init.org
similarity index 100%
rename from emacs/.emacs.d/init/sh-mode-init.org
rename to emacs/.emacs.d/init/oni-sh-mode-init.org