From 8af6f8d1604272a4e2d13a2981f02b6dd6e84bd6 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Wed, 1 Dec 2021 13:43:21 -0800
Subject: Remove autoloads for snippet loading

Loading ‘yasnippet’ shouldn't automatically load my package configuration. If my
package configuration hasn't been loaded it shouldn't try to include my snippets.
---
 oni-bats/oni-bats.el     | 4 +---
 oni-conf/oni-conf.el     | 4 +---
 oni-csharp/oni-csharp.el | 4 +---
 oni-css/oni-css.el       | 4 +---
 oni-elisp/oni-elisp.el   | 4 +---
 oni-haml/oni-haml.el     | 4 +---
 oni-html/oni-html.el     | 4 +---
 oni-nxml/oni-nxml.el     | 4 +---
 oni-org/oni-org.el       | 4 +---
 oni-php/oni-php.el       | 4 +---
 oni-python/oni-python.el | 4 +---
 oni-ruby/oni-ruby.el     | 4 +---
 oni-twig/oni-twig.el     | 4 +---
 13 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/oni-bats/oni-bats.el b/oni-bats/oni-bats.el
index 80564d7..2c2b9f7 100644
--- a/oni-bats/oni-bats.el
+++ b/oni-bats/oni-bats.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0715.223146
+;; Version: 2021.1201.134023
 ;; Package-Requires: (bats-mode oni-sh oni-yasnippet)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -50,7 +50,6 @@
   "Disable ‘shfmt-on-save-mode’."
   (shfmt-on-save-mode -1))
 
-;;;###autoload
 (defun oni-bats-snippets-initialize ()
   "Initialize the snippets for ‘oni-bats’."
   (when (boundp 'yas-snippet-dirs)
@@ -63,7 +62,6 @@
 (with-eval-after-load 'autoinsert
   (add-to-list 'auto-insert-alist '(bats-mode nil "#!/usr/bin/env bats\n\n")))
 
-;;;###autoload
 (with-eval-after-load 'bats-mode
   (with-eval-after-load 'yasnippet
     (oni-bats-snippets-initialize)))
diff --git a/oni-conf/oni-conf.el b/oni-conf/oni-conf.el
index 13eff73..b3787cb 100644
--- a/oni-conf/oni-conf.el
+++ b/oni-conf/oni-conf.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0919.232140
+;; Version: 2021.1201.134001
 ;; Package-Requires: (oni-yasnippet)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,6 @@
   (expand-file-name "snippets" oni-conf-root)
   "The directory where ‘oni-conf’ stores its snippets.")
 
-;;;###autoload
 (defun oni-conf-snippets-initialize ()
   "Initialize the snippets for ‘oni-conf’."
   (when (boundp 'yas-snippet-dirs)
@@ -55,7 +54,6 @@
 ;;;###autoload
 (add-to-list 'auto-mode-alist `(,(rx ".service" string-end) . conf-mode))
 
-;;;###autoload
 (with-eval-after-load 'conf-mode
   (with-eval-after-load 'yasnippet
     (oni-conf-snippets-initialize)))
diff --git a/oni-csharp/oni-csharp.el b/oni-csharp/oni-csharp.el
index a38a25f..a2a2502 100644
--- a/oni-csharp/oni-csharp.el
+++ b/oni-csharp/oni-csharp.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1116.204856
+;; Version: 2021.1201.133936
 ;; Package-Requires: (csharp-mode oni-company oni-flycheck oni-yasnippet oni-hydra oni-lsp oni-smartparens)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -131,7 +131,6 @@ _cs_: Solution
   (setq-local comment-auto-fill-only-comments t)
   (auto-fill-mode))
 
-;;;###autoload
 (defun oni-csharp-snippets-initialize ()
   "Initialize the snippets for ‘oni-csharp’."
   (when (boundp 'yas-snippet-dirs)
@@ -181,7 +180,6 @@ _cs_: Solution
     (setq lsp-csharp-omnisharp-roslyn-server-dir
           (expand-file-name "~/scoop/apps/omnisharp/current"))))
 
-;;;###autoload
 (with-eval-after-load 'csharp-mode
   (with-eval-after-load 'yasnippet
     (oni-csharp-snippets-initialize)))
diff --git a/oni-css/oni-css.el b/oni-css/oni-css.el
index 8eb6855..2af1a9f 100644
--- a/oni-css/oni-css.el
+++ b/oni-css/oni-css.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0920.202824
+;; Version: 2021.1201.134221
 ;; Package-Requires: (oni-company oni-hydra rainbow-mode oni-yasnippet)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -60,7 +60,6 @@
       (when (re-search-backward ";" (line-beginning-position) :noerror)
         (insert " !important")))))
 
-;;;###autoload
 (defun oni-css-snippets-initialize ()
   "Initialize the snippets for ‘oni-css’."
   (when (boundp 'yas-snippet-dirs)
@@ -165,7 +164,6 @@
 (with-eval-after-load 'grep
   (add-to-list 'grep-files-aliases '("css" . "*.css *.less *.sass *.scss")))
 
-;;;###autoload
 (with-eval-after-load 'css-mode
   (with-eval-after-load 'yasnippet
     (oni-css-snippets-initialize)))
diff --git a/oni-elisp/oni-elisp.el b/oni-elisp/oni-elisp.el
index 4e3dca9..d39b0c3 100644
--- a/oni-elisp/oni-elisp.el
+++ b/oni-elisp/oni-elisp.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1123.003353
+;; Version: 2021.1201.134052
 ;; Package-Requires: (oni-company oni-flycheck oni-paredit oni-yasnippet oni-hydra rainbow-delimiters nameless erefactor flycheck-relint handle elisp-format)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,6 @@
          symbol-end)
     1 font-lock-constant-face)))
 
-;;;###autoload
 (defun oni-elisp-snippets-initialize ()
   "Initialize the snippets for ‘oni-elisp’."
   (when (boundp 'yas-snippet-dirs)
@@ -121,7 +120,6 @@ _eb_: Buffer
                (slot . 0)
                (window-height . 0.33)))
 
-;;;###autoload
 (with-eval-after-load 'elisp-mode
   (with-eval-after-load 'yasnippet
     (oni-elisp-snippets-initialize)))
diff --git a/oni-haml/oni-haml.el b/oni-haml/oni-haml.el
index c184f1a..98b3322 100644
--- a/oni-haml/oni-haml.el
+++ b/oni-haml/oni-haml.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.1210.225414
+;; Version: 2021.1201.134032
 ;; Package-Requires: (oni-yasnippet)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,6 @@
   (expand-file-name "snippets" oni-haml-root)
   "The directory where ‘oni-haml’ stores its snippets.")
 
-;;;###autoload
 (defun oni-haml-snippets-initialize ()
   "Initialize the snippets for ‘oni-haml’."
   (when (boundp 'yas-snippet-dirs)
@@ -52,7 +51,6 @@
 
 (add-hook 'haml-mode-hook 'oni-haml--auto-fill-mode)
 
-;;;autoload
 (with-eval-after-load 'haml-mode
   (with-eval-after-load 'yasnippet
     (oni-haml-snippets-initialize)))
diff --git a/oni-html/oni-html.el b/oni-html/oni-html.el
index 77e1dd7..68318ae 100644
--- a/oni-html/oni-html.el
+++ b/oni-html/oni-html.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1123.003501
+;; Version: 2021.1201.134113
 ;; Package-Requires: (oni-yasnippet)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,6 @@
   (expand-file-name "snippets" oni-html-root)
   "The directory where ‘oni-html’ stores its snippets.")
 
-;;;###autoload
 (defun oni-html-snippets-initialize ()
   "Initialize the snippets for ‘oni-html’."
   (when (boundp 'yas-snippet-dirs)
@@ -53,7 +52,6 @@
 (add-hook 'html-mode-hook 'electric-pair-local-mode)
 (add-hook 'html-mode-hook 'oni-html--auto-fill-mode)
 
-;;;###autoload
 (with-eval-after-load 'sgml-mode
   (with-eval-after-load 'yasnippet
     (oni-html-snippets-initialize)))
diff --git a/oni-nxml/oni-nxml.el b/oni-nxml/oni-nxml.el
index 0ba3390..4ecce90 100644
--- a/oni-nxml/oni-nxml.el
+++ b/oni-nxml/oni-nxml.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0228.102451
+;; Version: 2021.1201.134152
 ;; Package-Requires: (oni-yasnippet reformatter)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,6 @@
   (expand-file-name "snippets" oni-nxml-root)
   "The directory where ‘oni-nxml’ stores its snippets.")
 
-;;;###autoload
 (defun oni-nxml-snippets-initialize ()
   "Initialize the snippets for ‘oni-nxml’."
   (when (boundp 'yas-snippet-dirs)
@@ -62,7 +61,6 @@
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.proj\\'" . nxml-mode))
 
-;;;###autoload
 (with-eval-after-load 'nxml-mode
   (with-eval-after-load 'yasnippet
     (oni-nxml-snippets-initialize)))
diff --git a/oni-org/oni-org.el b/oni-org/oni-org.el
index 3f8ab71..3e40f23 100644
--- a/oni-org/oni-org.el
+++ b/oni-org/oni-org.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1130.152454
+;; Version: 2021.1201.133943
 ;; Package-Requires: (oni-yasnippet oni-alert oni-hydra org org-contrib org-bullets org-edna diminish all-the-icons olivetti mixed-pitch)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -227,7 +227,6 @@ located at the start of the line."
                 ("#+title: " . "")))
   (prettify-symbols-mode))
 
-;;;###autoload
 (defun oni-org-snippets-initialize ()
   "Initialize the snippets for ‘oni-org’."
   (when (boundp 'yas-snippet-dirs)
@@ -500,7 +499,6 @@ also move point to the start of the heading."
 ;;;###autoload
 (global-set-key (kbd "C-<home>") #'oni-org-open-index)
 
-;;;###autoload
 (with-eval-after-load 'org
   (with-eval-after-load 'yasnippet
     (oni-org-snippets-initialize)))
diff --git a/oni-php/oni-php.el b/oni-php/oni-php.el
index 82b1051..7a4e554 100644
--- a/oni-php/oni-php.el
+++ b/oni-php/oni-php.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1123.003007
+;; Version: 2021.1201.134011
 ;; Package-Requires: (php-mode oni-yasnippet oni-flycheck oni-company oni-hydra ggtags fic-mode company-php)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -44,7 +44,6 @@
   (expand-file-name "snippets" oni-php-root)
   "The directory where ‘oni-php’ stores its snippets.")
 
-;;;###autoload
 (defun oni-php-snippets-initialize ()
   "Initialize the snippets for ‘oni-php’."
   (when (boundp 'yas-snippet-dirs)
@@ -118,7 +117,6 @@ nil for some reason."
                (modes . '(php-mode web-mode))
                (repeat . t)))
 
-;;;###autoload
 (with-eval-after-load 'php-mode
   (with-eval-after-load 'yasnippet
     (oni-php-snippets-initialize)))
diff --git a/oni-python/oni-python.el b/oni-python/oni-python.el
index 6e6f89b..bf46632 100644
--- a/oni-python/oni-python.el
+++ b/oni-python/oni-python.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1123.003606
+;; Version: 2021.1201.134230
 ;; Package-Requires: (oni-yasnippet oni-company oni-flycheck oni-hydra oni-lsp rainbow-delimiters reformatter traad)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -61,7 +61,6 @@ The values are taken from the PEP8 coding standard for Python."
   (setq-local fill-column 80)
   (setq-local comment-fill-column 72))
 
-;;;###autoload
 (defun oni-python-snippets-initialize ()
   "Initialize the snippets for ‘oni-python’."
   (when (boundp 'yas-snippet-dirs)
@@ -98,7 +97,6 @@ for indentation."
 (add-hook 'python-mode-hook 'python-black-on-save-mode)
 (add-hook 'python-mode-hook 'rainbow-delimiters-mode)
 
-;;;###autoload
 (with-eval-after-load 'python
   (with-eval-after-load 'yasnippet
     (oni-python-snippets-initialize)))
diff --git a/oni-ruby/oni-ruby.el b/oni-ruby/oni-ruby.el
index f174247..056a2a6 100644
--- a/oni-ruby/oni-ruby.el
+++ b/oni-ruby/oni-ruby.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.1123.003056
+;; Version: 2021.1201.134041
 ;; Package-Requires: (ruby-mode oni-yasnippet)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,6 @@
   (expand-file-name "snippets" oni-ruby-root)
   "The directory where ‘oni-ruby’ stores its snippets.")
 
-;;;###autoload
 (defun oni-ruby-snippets-initialize ()
   "Initialize the snippets for ‘oni-ruby’."
   (when (boundp 'yas-snippet-dirs)
@@ -55,7 +54,6 @@
 (add-hook 'ruby-mode-hook 'electric-pair-local-mode)
 (add-hook 'ruby-mode-hook 'oni-ruby--auto-fill-mode)
 
-;;;###autoload
 (with-eval-after-load 'ruby-mode
   (with-eval-after-load 'yasnippet
     (oni-ruby-snippets-initialize)))
diff --git a/oni-twig/oni-twig.el b/oni-twig/oni-twig.el
index 0dbdbdc..ed147bf 100644
--- a/oni-twig/oni-twig.el
+++ b/oni-twig/oni-twig.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.1210.230023
+;; Version: 2021.1201.134109
 ;; Package-Requires: (twig-mode oni-yasnippet)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,6 @@
   (expand-file-name "snippets" oni-twig-root)
   "The directory where ‘oni-twig’ stores its snippets.")
 
-;;;###autoload
 (defun oni-twig-snippets-initialize ()
   "Initialize the snippets for ‘oni-twig’."
   (when (boundp 'yas-snippet-dirs)
@@ -52,7 +51,6 @@
 
 (add-hook 'twig-mode-hook 'oni-twig--auto-fill-mode)
 
-;;;###autoload
 (with-eval-after-load 'twig-mode
   (with-eval-after-load 'yasnippet
     (oni-twig-snippets-initialize)))
-- 
cgit v1.2.3-54-g00ecf