From 17981d6a61561c089000ccd5d146cf4a9a1f294f Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 17 Jun 2018 02:13:46 +0200
Subject: [PATCH] Conform hook names to conventions

Also minor reformatting & comment corrections.
---
 modules/completion/company/autoload.el        | 2 +-
 modules/emacs/electric/autoload.el            | 2 +-
 modules/feature/lookup/autoload/lookup.el     | 2 +-
 modules/feature/snippets/autoload/settings.el | 2 +-
 modules/lang/emacs-lisp/config.el             | 5 +----
 modules/lang/latex/config.el                  | 4 ++--
 modules/tools/rotate-text/autoload.el         | 2 +-
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/modules/completion/company/autoload.el b/modules/completion/company/autoload.el
index 393761988..dfbcc6746 100644
--- a/modules/completion/company/autoload.el
+++ b/modules/completion/company/autoload.el
@@ -6,7 +6,7 @@
 
 MODES should be one major-mode symbol or a list of them."
   (dolist (mode (doom-enlist modes))
-    (let ((def-name (intern (format "+company--init-%s" mode))))
+    (let ((def-name (intern (format "+company|init-%s" mode))))
       (fset def-name
             (lambda () (when (or (eq major-mode mode)
                             (and (boundp mode) (symbol-value mode)))
diff --git a/modules/emacs/electric/autoload.el b/modules/emacs/electric/autoload.el
index f10575145..dc22a08b0 100644
--- a/modules/emacs/electric/autoload.el
+++ b/modules/emacs/electric/autoload.el
@@ -10,7 +10,7 @@ trigger electric indentation."
             (list '(:char :words) plist)))
   (cl-destructuring-bind (&key chars words) plist
     (dolist (mode (doom-enlist modes))
-      (let ((fn (intern (format "+electric-indent--init-%s" mode))))
+      (let ((fn (intern (format "+electric|init-%s" mode))))
         (fset fn
               (lambda ()
                 (electric-indent-local-mode +1)
diff --git a/modules/feature/lookup/autoload/lookup.el b/modules/feature/lookup/autoload/lookup.el
index 5f910a3e1..bd3b0570e 100644
--- a/modules/feature/lookup/autoload/lookup.el
+++ b/modules/feature/lookup/autoload/lookup.el
@@ -28,7 +28,7 @@ properties:
 Using this multiple times overwrites previous properties and unsets omitted
 ones."
   (dolist (mode (doom-enlist modes))
-    (let ((def-name (intern (format "+lookup--init-%s" mode))))
+    (let ((def-name (intern (format "+lookup|init-%s" mode))))
       (fset def-name
             (lambda ()
               (when (or (eq major-mode mode)
diff --git a/modules/feature/snippets/autoload/settings.el b/modules/feature/snippets/autoload/settings.el
index 7eff149b3..f02d5f187 100644
--- a/modules/feature/snippets/autoload/settings.el
+++ b/modules/feature/snippets/autoload/settings.el
@@ -5,7 +5,7 @@
   "Register a minor MODE with yasnippet so it can have its own snippets
 category, if the folder exists."
   (after! yasnippet
-    (let ((fn (intern (format "+snippets--register-%s" mode))))
+    (let ((fn (intern (format "+snippets|register-%s" mode))))
       (fset fn (lambda () (+snippets|enable-project-modes mode)))
       (add-hook (intern (format "%s-hook" mode)) fn))))
 
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 7ac57c3cb..6c43eda49 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -7,10 +7,7 @@
   (set-eval-handler! 'emacs-lisp-mode #'+emacs-lisp-eval)
   (set-lookup-handlers! 'emacs-lisp-mode :documentation 'info-lookup-symbol)
   (set-docset! '(lisp-mode emacs-lisp-mode) "Emacs Lisp")
-
-  (set-pretty-symbols! 'emacs-lisp-mode
-    :lambda "lambda")
-
+  (set-pretty-symbols! 'emacs-lisp-mode :lambda "lambda")
   (set-rotate-patterns! 'emacs-lisp-mode
     :symbols '(("t" "nil")
                ("let" "let*")
diff --git a/modules/lang/latex/config.el b/modules/lang/latex/config.el
index 5035be1ed..d7e127d2a 100644
--- a/modules/lang/latex/config.el
+++ b/modules/lang/latex/config.el
@@ -202,9 +202,9 @@
   :when (featurep! :completion company)
   :commands (company-auctex-init)
   :init
-  ;; We can't use the (set-company-backend! ...) because Auctex reports its
+  ;; We can't use the `set-company-backend!' because Auctex reports its
   ;; major-mode as `latex-mode', but uses LaTeX-mode-hook for its mode, which is
-  ;; not anticipated by :company-backend (and shouldn't have to!)
+  ;; not something `set-company-backend!' anticipates (and shouldn't have to!)
   (add-hook! LaTeX-mode
     (make-variable-buffer-local 'company-backends)
     (company-auctex-init)))
diff --git a/modules/tools/rotate-text/autoload.el b/modules/tools/rotate-text/autoload.el
index dbdbbf4ac..e7662db99 100644
--- a/modules/tools/rotate-text/autoload.el
+++ b/modules/tools/rotate-text/autoload.el
@@ -6,7 +6,7 @@
 `rotate-text' will cycle through."
   (declare (indent 1))
   (dolist (mode (doom-enlist modes))
-    (let ((fn-name (intern (format "+rotate-text--init-%s" mode))))
+    (let ((fn-name (intern (format "+rotate-text|init-%s" mode))))
       (fset fn-name
             (lambda ()
               (setq-local rotate-text-local-symbols symbols)