From 3147312c40bb9355491256198c13b439a4c422de Mon Sep 17 00:00:00 2001
From: Zelong Kuang <zelongkuang0608@gmail.com>
Date: Fri, 27 Feb 2026 22:07:54 +1100
Subject: [PATCH] Update

---
 init.el                                       |  1 +
 lisp/init-bindings.el                         |  1 -
 lisp/init-edit.el                             | 25 -----------------
 lisp/init-snippet.el                          | 28 +++++++++++++++++++
 snippets/emacs-lisp-mode/get-buffer           |  5 ----
 snippets/emacs-lisp-mode/get-buffer-create    |  5 ----
 snippets/emacs-lisp-mode/message              |  5 ----
 snippets/emacs-lisp-mode/paren-insert         |  5 ----
 snippets/emacs-lisp-mode/point-max            |  5 ----
 snippets/emacs-lisp-mode/pp                   |  5 ----
 snippets/emacs-lisp-mode/provide              |  6 ----
 snippets/eshell-mode/for                      |  4 ---
 .../inferior-emacs-lisp-mode/.yas-parents     |  1 -
 snippets/lisp-interaction-mode/.yas-parents   |  1 -
 snippets/matlab-mode/switch                   | 11 --------
 15 files changed, 29 insertions(+), 79 deletions(-)
 create mode 100644 lisp/init-snippet.el
 delete mode 100644 snippets/emacs-lisp-mode/get-buffer
 delete mode 100644 snippets/emacs-lisp-mode/get-buffer-create
 delete mode 100644 snippets/emacs-lisp-mode/message
 delete mode 100644 snippets/emacs-lisp-mode/paren-insert
 delete mode 100644 snippets/emacs-lisp-mode/point-max
 delete mode 100644 snippets/emacs-lisp-mode/pp
 delete mode 100644 snippets/emacs-lisp-mode/provide
 delete mode 100644 snippets/eshell-mode/for
 delete mode 100644 snippets/inferior-emacs-lisp-mode/.yas-parents
 delete mode 100644 snippets/lisp-interaction-mode/.yas-parents
 delete mode 100644 snippets/matlab-mode/switch

diff --git a/init.el b/init.el
index eb6edef..4fe4dda 100644
--- a/init.el
+++ b/init.el
@@ -24,6 +24,7 @@
 
 (require 'init-llm)
 
+(require 'init-snippet)
 (require 'init-coding)
 (require 'init-check)
 (require 'init-eglot)
diff --git a/lisp/init-bindings.el b/lisp/init-bindings.el
index 1155532..d5ce8e7 100644
--- a/lisp/init-bindings.el
+++ b/lisp/init-bindings.el
@@ -12,7 +12,6 @@
 (global-set-key (kbd "M-p") #'duplicate-dwim)
 (global-set-key (kbd "C-c y") #'copy-from-above-command)
 (global-set-key (kbd "s-k") #'kill-current-buffer)
-(global-set-key (kbd "C-c q r") #'restart-emacs)
 
 (global-set-key (kbd "C-c C-c") #'compile)
 
diff --git a/lisp/init-edit.el b/lisp/init-edit.el
index 6b1da6d..db59f9a 100644
--- a/lisp/init-edit.el
+++ b/lisp/init-edit.el
@@ -44,31 +44,6 @@
               hungry-delete-except-modes
               '(help-mode minibuffer-mode minibuffer-inactive-mode calc-mode)))
     
-;; Yasnippet settings
-(use-package yasnippet
-  :diminish
-  :ensure t
-  :hook (elpaca-after-init . yas-global-mode)
-  :hook ((LaTeX-mode . yas-minor-mode)
-         (post-self-insert . my/yas-try-expanding-auto-snippets))
-  :config
-  (use-package warnings
-    :ensure nil
-    :config
-    (cl-pushnew '(yasnippet backquote-change)
-                warning-suppress-types
-                :test 'equal))
-
-  (setq yas-triggers-in-field t)
-  (setq yas-key-syntaxes '("w" "w_" "w_." "^ " yas-try-key-from-whitespace))
-  
-  ;; Function that tries to autoexpand YaSnippets
-  ;; The double quoting is NOT a typo!
-  (defun my/yas-try-expanding-auto-snippets ()
-    (when (and (boundp 'yas-minor-mode) yas-minor-mode)
-      (let ((yas-buffer-local-condition ''(require-snippet-condition . auto)))
-        (yas-expand)))))
-
 (use-package abbrev
   :diminish
   :ensure nil
diff --git a/lisp/init-snippet.el b/lisp/init-snippet.el
new file mode 100644
index 0000000..4d63898
--- /dev/null
+++ b/lisp/init-snippet.el
@@ -0,0 +1,28 @@
+;; -*- lexical-binding: t; -*-
+
+;; Yasnippet settings
+(use-package yasnippet
+  :diminish
+  :ensure t
+  :hook (elpaca-after-init . yas-global-mode)
+  :hook ((LaTeX-mode . yas-minor-mode)
+         (post-self-insert . my/yas-try-expanding-auto-snippets))
+  :config
+  (use-package warnings
+    :ensure nil
+    :config
+    (cl-pushnew '(yasnippet backquote-change)
+                warning-suppress-types
+                :test 'equal))
+
+  (setq yas-triggers-in-field t)
+  (setq yas-key-syntaxes (list #'yas-longest-key-from-whitespace "w_.()" "w_." "w_" "w"))
+  
+  ;; Function that tries to autoexpand YaSnippets
+  ;; The double quoting is NOT a typo!
+  (defun my/yas-try-expanding-auto-snippets ()
+    (when (and (boundp 'yas-minor-mode) yas-minor-mode)
+      (let ((yas-buffer-local-condition ''(require-snippet-condition . auto)))
+        (yas-expand)))))
+
+(provide 'init-snippet)
diff --git a/snippets/emacs-lisp-mode/get-buffer b/snippets/emacs-lisp-mode/get-buffer
deleted file mode 100644
index 203573f..0000000
--- a/snippets/emacs-lisp-mode/get-buffer
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: get-buffer
-# key: gb
-# --
-(get-buffer "${1:`(read-buffer "Buffer:")`}")$0
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/get-buffer-create b/snippets/emacs-lisp-mode/get-buffer-create
deleted file mode 100644
index 46f1d67..0000000
--- a/snippets/emacs-lisp-mode/get-buffer-create
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: get-buffer-create
-# key: gbc
-# --
-(get-buffer-create $0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/message b/snippets/emacs-lisp-mode/message
deleted file mode 100644
index 005a30c..0000000
--- a/snippets/emacs-lisp-mode/message
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: message
-# key: msg
-# --
-(message ${1:(format "$2")})$0
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/paren-insert b/snippets/emacs-lisp-mode/paren-insert
deleted file mode 100644
index f3a12a6..0000000
--- a/snippets/emacs-lisp-mode/paren-insert
+++ /dev/null
@@ -1,5 +0,0 @@
-# key: mk
-# name: paren-insert
-# condition: 'auto
-# --
-($0)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/point-max b/snippets/emacs-lisp-mode/point-max
deleted file mode 100644
index 109b262..0000000
--- a/snippets/emacs-lisp-mode/point-max
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: point-max
-# key: pM
-# --
-(point-max)
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/pp b/snippets/emacs-lisp-mode/pp
deleted file mode 100644
index 6cd299a..0000000
--- a/snippets/emacs-lisp-mode/pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: pp
-# key: pp
-# --
-(pp $3 $1)$0
\ No newline at end of file
diff --git a/snippets/emacs-lisp-mode/provide b/snippets/emacs-lisp-mode/provide
deleted file mode 100644
index da9648e..0000000
--- a/snippets/emacs-lisp-mode/provide
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: provide
-# key: provide
-# --
-
-(provide '${1:`(file-name-base (or (buffer-file-name) ""))`})$0
\ No newline at end of file
diff --git a/snippets/eshell-mode/for b/snippets/eshell-mode/for
deleted file mode 100644
index bfa3b35..0000000
--- a/snippets/eshell-mode/for
+++ /dev/null
@@ -1,4 +0,0 @@
-#name : Eshell for loop
-#key : for
-# --
-for f in ${1:*} { ${2:echo} "$f"; $3} $0
\ No newline at end of file
diff --git a/snippets/inferior-emacs-lisp-mode/.yas-parents b/snippets/inferior-emacs-lisp-mode/.yas-parents
deleted file mode 100644
index a7ee2e7..0000000
--- a/snippets/inferior-emacs-lisp-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-emacs-lisp-mode
\ No newline at end of file
diff --git a/snippets/lisp-interaction-mode/.yas-parents b/snippets/lisp-interaction-mode/.yas-parents
deleted file mode 100644
index a7ee2e7..0000000
--- a/snippets/lisp-interaction-mode/.yas-parents
+++ /dev/null
@@ -1 +0,0 @@
-emacs-lisp-mode
\ No newline at end of file
diff --git a/snippets/matlab-mode/switch b/snippets/matlab-mode/switch
deleted file mode 100644
index ca5a353..0000000
--- a/snippets/matlab-mode/switch
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Karthik Chikmagalur
-# name: switch
-# key: switch
-# --
-switch ${1:variable}
-    case ${2:value}
-    $3
-    otherwise
-end
-    
\ No newline at end of file