From 2bf5ba230c71960f81daff285758033736e6ca40 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 28 Jun 2026 18:15:58 -0700
Subject: GNUmakefile: Update package recipes

These packages don't have snippets anymore and therefore aren't multi-file
packages anymore.
---
 oni-php/Eldev      |  2 +-
 oni-php/oni-php.el | 20 +++-----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'oni-php')

diff --git a/oni-php/Eldev b/oni-php/Eldev
index 1ba3134..72e2000 100644
--- a/oni-php/Eldev
+++ b/oni-php/Eldev
@@ -10,4 +10,4 @@
 
 (setf eldev-files-to-package
       `(:or ,eldev-files-to-package
-            '("*.el" "./snippets/**/*")))
+            '("*.el" "scripts/*")))
diff --git a/oni-php/oni-php.el b/oni-php/oni-php.el
index 01c9388..9c96a8c 100644
--- a/oni-php/oni-php.el
+++ b/oni-php/oni-php.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2026.0521.094427
-;; Package-Requires: (oni-yasnippet oni-flycheck oni-hydra oni-corfu fic-mode rainbow-delimiters rainbow-identifiers)
+;; Version: 2026.0628.181545
+;; Package-Requires: (oni-flycheck oni-hydra fic-mode rainbow-delimiters rainbow-identifiers)
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 (require 'map)
 (require 'project)
 (require 'whitespace)
-(require 'yasnippet)
+(require 'php-mode)
 
 (defconst oni-php-root
   (file-name-directory
@@ -40,20 +40,10 @@
        (buffer-file-name)))
   "The directory where ‘oni-php’ was loaded from.")
 
-(defconst oni-php-snippets-dir
-  (expand-file-name "snippets" oni-php-root)
-  "The directory where ‘oni-php’ stores its snippets.")
-
 (defconst oni-php-scripts-dir
   (expand-file-name "scripts" oni-php-root)
   "The directory where ‘oni-php’ stores its scripts.")
 
-(defun oni-php-snippets-initialize ()
-  "Initialize the snippets for ‘oni-php’."
-  (when (boundp 'yas-snippet-dirs)
-    (add-to-list 'yas-snippet-dirs oni-php-snippets-dir))
-  (yas-load-directory oni-php-snippets-dir))
-
 (defun oni-php--set-require-final-newline ()
   "Set `require-final-newline' to t.
 This is necessary because the PHP mode configuration sets this to
@@ -284,10 +274,6 @@ Otherwise call FUNC with ARGS. This is meant as advice around
                (modes . '(php-mode web-mode php-ts-mode))
                (repeat . t)))
 
-(with-eval-after-load 'php-mode
-  (with-eval-after-load 'yasnippet
-    (oni-php-snippets-initialize)))
-
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.inc\\'" . php-mode))
 
-- 
cgit v1.3-2-g0d8e