ryuslash/emacs-config
1
0
Fork 0
Code Activity

Remove autoloads for snippet loading

Browse source 
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.
This commit is contained in:
Tom Willemse 2021-12-01 13:43:21 -08:00
parent e1aecd6f63
commit 8af6f8d160
13 changed files with 13 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oni-bats/oni-bats.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2021.0715.223146 ;; Version: 2021.1201.134023
;; Package-Requires: (bats-mode oni-sh oni-yasnippet) ;; Package-Requires: (bats-mode oni-sh oni-yasnippet)
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
@ -50,7 +50,6 @@
"Disable ‘shfmt-on-save-mode’." "Disable ‘shfmt-on-save-mode’."
(shfmt-on-save-mode -1)) (shfmt-on-save-mode -1))
;;;###autoload
(defun oni-bats-snippets-initialize () (defun oni-bats-snippets-initialize ()
"Initialize the snippets for ‘oni-bats’." "Initialize the snippets for ‘oni-bats’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -63,7 +62,6 @@
(with-eval-after-load 'autoinsert (with-eval-after-load 'autoinsert
(add-to-list 'auto-insert-alist '(bats-mode nil "#!/usr/bin/env bats\n\n"))) (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 'bats-mode
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-bats-snippets-initialize))) (oni-bats-snippets-initialize)))

4
oni-conf/oni-conf.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2021.0919.232140 ;; Version: 2021.1201.134001
;; Package-Requires: (oni-yasnippet) ;; Package-Requires: (oni-yasnippet)
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
@ -38,7 +38,6 @@
(expand-file-name "snippets" oni-conf-root) (expand-file-name "snippets" oni-conf-root)
"The directory where ‘oni-conf’ stores its snippets.") "The directory where ‘oni-conf’ stores its snippets.")
;;;###autoload
(defun oni-conf-snippets-initialize () (defun oni-conf-snippets-initialize ()
"Initialize the snippets for ‘oni-conf’." "Initialize the snippets for ‘oni-conf’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -55,7 +54,6 @@
;;;###autoload ;;;###autoload
(add-to-list 'auto-mode-alist `(,(rx ".service" string-end) . conf-mode)) (add-to-list 'auto-mode-alist `(,(rx ".service" string-end) . conf-mode))
;;;###autoload
(with-eval-after-load 'conf-mode (with-eval-after-load 'conf-mode
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-conf-snippets-initialize))) (oni-conf-snippets-initialize)))

4
oni-csharp/oni-csharp.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; 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) ;; 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 ;; 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) (setq-local comment-auto-fill-only-comments t)
(auto-fill-mode)) (auto-fill-mode))
;;;###autoload
(defun oni-csharp-snippets-initialize () (defun oni-csharp-snippets-initialize ()
"Initialize the snippets for ‘oni-csharp’." "Initialize the snippets for ‘oni-csharp’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -181,7 +180,6 @@ _cs_: Solution
(setq lsp-csharp-omnisharp-roslyn-server-dir (setq lsp-csharp-omnisharp-roslyn-server-dir
(expand-file-name "~/scoop/apps/omnisharp/current")))) (expand-file-name "~/scoop/apps/omnisharp/current"))))
;;;###autoload
(with-eval-after-load 'csharp-mode (with-eval-after-load 'csharp-mode
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-csharp-snippets-initialize))) (oni-csharp-snippets-initialize)))

4
oni-css/oni-css.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2021.0920.202824 ;; Version: 2021.1201.134221
;; Package-Requires: (oni-company oni-hydra rainbow-mode oni-yasnippet) ;; Package-Requires: (oni-company oni-hydra rainbow-mode oni-yasnippet)
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
@ -60,7 +60,6 @@
(when (re-search-backward ";" (line-beginning-position) :noerror) (when (re-search-backward ";" (line-beginning-position) :noerror)
(insert " !important"))))) (insert " !important")))))
;;;###autoload
(defun oni-css-snippets-initialize () (defun oni-css-snippets-initialize ()
"Initialize the snippets for ‘oni-css’." "Initialize the snippets for ‘oni-css’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -165,7 +164,6 @@
(with-eval-after-load 'grep (with-eval-after-load 'grep
(add-to-list 'grep-files-aliases '("css" . "*.css *.less *.sass *.scss"))) (add-to-list 'grep-files-aliases '("css" . "*.css *.less *.sass *.scss")))
;;;###autoload
(with-eval-after-load 'css-mode (with-eval-after-load 'css-mode
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-css-snippets-initialize))) (oni-css-snippets-initialize)))

4
oni-elisp/oni-elisp.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; 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) ;; 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 ;; This program is free software; you can redistribute it and/or modify
@ -58,7 +58,6 @@
symbol-end) symbol-end)
1 font-lock-constant-face))) 1 font-lock-constant-face)))
;;;###autoload
(defun oni-elisp-snippets-initialize () (defun oni-elisp-snippets-initialize ()
"Initialize the snippets for ‘oni-elisp’." "Initialize the snippets for ‘oni-elisp’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -121,7 +120,6 @@ _eb_: Buffer
(slot . 0) (slot . 0)
(window-height . 0.33))) (window-height . 0.33)))
;;;###autoload
(with-eval-after-load 'elisp-mode (with-eval-after-load 'elisp-mode
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-elisp-snippets-initialize))) (oni-elisp-snippets-initialize)))

4
oni-haml/oni-haml.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2019.1210.225414 ;; Version: 2021.1201.134032
;; Package-Requires: (oni-yasnippet) ;; Package-Requires: (oni-yasnippet)
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
@ -38,7 +38,6 @@
(expand-file-name "snippets" oni-haml-root) (expand-file-name "snippets" oni-haml-root)
"The directory where ‘oni-haml’ stores its snippets.") "The directory where ‘oni-haml’ stores its snippets.")
;;;###autoload
(defun oni-haml-snippets-initialize () (defun oni-haml-snippets-initialize ()
"Initialize the snippets for ‘oni-haml’." "Initialize the snippets for ‘oni-haml’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -52,7 +51,6 @@
(add-hook 'haml-mode-hook 'oni-haml--auto-fill-mode) (add-hook 'haml-mode-hook 'oni-haml--auto-fill-mode)
;;;autoload
(with-eval-after-load 'haml-mode (with-eval-after-load 'haml-mode
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-haml-snippets-initialize))) (oni-haml-snippets-initialize)))

4
oni-html/oni-html.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2021.1123.003501 ;; Version: 2021.1201.134113
;; Package-Requires: (oni-yasnippet) ;; Package-Requires: (oni-yasnippet)
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
@ -38,7 +38,6 @@
(expand-file-name "snippets" oni-html-root) (expand-file-name "snippets" oni-html-root)
"The directory where ‘oni-html’ stores its snippets.") "The directory where ‘oni-html’ stores its snippets.")
;;;###autoload
(defun oni-html-snippets-initialize () (defun oni-html-snippets-initialize ()
"Initialize the snippets for ‘oni-html’." "Initialize the snippets for ‘oni-html’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -53,7 +52,6 @@
(add-hook 'html-mode-hook 'electric-pair-local-mode) (add-hook 'html-mode-hook 'electric-pair-local-mode)
(add-hook 'html-mode-hook 'oni-html--auto-fill-mode) (add-hook 'html-mode-hook 'oni-html--auto-fill-mode)
;;;###autoload
(with-eval-after-load 'sgml-mode (with-eval-after-load 'sgml-mode
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-html-snippets-initialize))) (oni-html-snippets-initialize)))

4
oni-nxml/oni-nxml.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2020.0228.102451 ;; Version: 2021.1201.134152
;; Package-Requires: (oni-yasnippet reformatter) ;; Package-Requires: (oni-yasnippet reformatter)
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
@ -38,7 +38,6 @@
(expand-file-name "snippets" oni-nxml-root) (expand-file-name "snippets" oni-nxml-root)
"The directory where ‘oni-nxml’ stores its snippets.") "The directory where ‘oni-nxml’ stores its snippets.")
;;;###autoload
(defun oni-nxml-snippets-initialize () (defun oni-nxml-snippets-initialize ()
"Initialize the snippets for ‘oni-nxml’." "Initialize the snippets for ‘oni-nxml’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -62,7 +61,6 @@
;;;###autoload ;;;###autoload
(add-to-list 'auto-mode-alist '("\\.proj\\'" . nxml-mode)) (add-to-list 'auto-mode-alist '("\\.proj\\'" . nxml-mode))
;;;###autoload
(with-eval-after-load 'nxml-mode (with-eval-after-load 'nxml-mode
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-nxml-snippets-initialize))) (oni-nxml-snippets-initialize)))

4
oni-org/oni-org.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; 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) ;; 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 ;; This program is free software; you can redistribute it and/or modify
@ -227,7 +227,6 @@ located at the start of the line."
("#+title: " . ""))) ("#+title: " . "")))
(prettify-symbols-mode)) (prettify-symbols-mode))
;;;###autoload
(defun oni-org-snippets-initialize () (defun oni-org-snippets-initialize ()
"Initialize the snippets for ‘oni-org’." "Initialize the snippets for ‘oni-org’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -500,7 +499,6 @@ also move point to the start of the heading."
;;;###autoload ;;;###autoload
(global-set-key (kbd "C-<home>") #'oni-org-open-index) (global-set-key (kbd "C-<home>") #'oni-org-open-index)
;;;###autoload
(with-eval-after-load 'org (with-eval-after-load 'org
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-org-snippets-initialize))) (oni-org-snippets-initialize)))

4
oni-php/oni-php.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; 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) ;; 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 ;; This program is free software; you can redistribute it and/or modify
@ -44,7 +44,6 @@
(expand-file-name "snippets" oni-php-root) (expand-file-name "snippets" oni-php-root)
"The directory where ‘oni-php’ stores its snippets.") "The directory where ‘oni-php’ stores its snippets.")
;;;###autoload
(defun oni-php-snippets-initialize () (defun oni-php-snippets-initialize ()
"Initialize the snippets for ‘oni-php’." "Initialize the snippets for ‘oni-php’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -118,7 +117,6 @@ nil for some reason."
(modes . '(php-mode web-mode)) (modes . '(php-mode web-mode))
(repeat . t))) (repeat . t)))
;;;###autoload
(with-eval-after-load 'php-mode (with-eval-after-load 'php-mode
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-php-snippets-initialize))) (oni-php-snippets-initialize)))

4
oni-python/oni-python.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; 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) ;; 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 ;; 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 fill-column 80)
(setq-local comment-fill-column 72)) (setq-local comment-fill-column 72))
;;;###autoload
(defun oni-python-snippets-initialize () (defun oni-python-snippets-initialize ()
"Initialize the snippets for ‘oni-python’." "Initialize the snippets for ‘oni-python’."
(when (boundp 'yas-snippet-dirs) (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 'python-black-on-save-mode)
(add-hook 'python-mode-hook 'rainbow-delimiters-mode) (add-hook 'python-mode-hook 'rainbow-delimiters-mode)
;;;###autoload
(with-eval-after-load 'python (with-eval-after-load 'python
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-python-snippets-initialize))) (oni-python-snippets-initialize)))

4
oni-ruby/oni-ruby.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2021.1123.003056 ;; Version: 2021.1201.134041
;; Package-Requires: (ruby-mode oni-yasnippet) ;; Package-Requires: (ruby-mode oni-yasnippet)
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
@ -38,7 +38,6 @@
(expand-file-name "snippets" oni-ruby-root) (expand-file-name "snippets" oni-ruby-root)
"The directory where ‘oni-ruby’ stores its snippets.") "The directory where ‘oni-ruby’ stores its snippets.")
;;;###autoload
(defun oni-ruby-snippets-initialize () (defun oni-ruby-snippets-initialize ()
"Initialize the snippets for ‘oni-ruby’." "Initialize the snippets for ‘oni-ruby’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -55,7 +54,6 @@
(add-hook 'ruby-mode-hook 'electric-pair-local-mode) (add-hook 'ruby-mode-hook 'electric-pair-local-mode)
(add-hook 'ruby-mode-hook 'oni-ruby--auto-fill-mode) (add-hook 'ruby-mode-hook 'oni-ruby--auto-fill-mode)
;;;###autoload
(with-eval-after-load 'ruby-mode (with-eval-after-load 'ruby-mode
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-ruby-snippets-initialize))) (oni-ruby-snippets-initialize)))

4
oni-twig/oni-twig.el
View file

@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org> ;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local ;; Keywords: local
;; Version: 2019.1210.230023 ;; Version: 2021.1201.134109
;; Package-Requires: (twig-mode oni-yasnippet) ;; Package-Requires: (twig-mode oni-yasnippet)
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
@ -38,7 +38,6 @@
(expand-file-name "snippets" oni-twig-root) (expand-file-name "snippets" oni-twig-root)
"The directory where ‘oni-twig’ stores its snippets.") "The directory where ‘oni-twig’ stores its snippets.")
;;;###autoload
(defun oni-twig-snippets-initialize () (defun oni-twig-snippets-initialize ()
"Initialize the snippets for ‘oni-twig’." "Initialize the snippets for ‘oni-twig’."
(when (boundp 'yas-snippet-dirs) (when (boundp 'yas-snippet-dirs)
@ -52,7 +51,6 @@
(add-hook 'twig-mode-hook 'oni-twig--auto-fill-mode) (add-hook 'twig-mode-hook 'oni-twig--auto-fill-mode)
;;;###autoload
(with-eval-after-load 'twig-mode (with-eval-after-load 'twig-mode
(with-eval-after-load 'yasnippet (with-eval-after-load 'yasnippet
(oni-twig-snippets-initialize))) (oni-twig-snippets-initialize)))