From 58483d3943e28976bcdf0e302834c1d347ea940f Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Wed, 1 Apr 2026 14:11:52 +0300 Subject: [PATCH] Clean up some variable problems --- early-init.el | 2 +- lisp/icejam-completing-read.el | 5 ++++- lisp/icejam-flycheck.el | 32 ++++++++++++++++++++------------ lisp/icejam-transient.el | 16 ++++++++++++++-- lisp/icejam-tree-sitter.el | 2 +- lisp/langs/icejam-lang-dhall.el | 3 +++ lisp/langs/icejam-lang-gleam.el | 7 ++++--- lisp/langs/icejam-lang-php.el | 23 +++++++++++++---------- 8 files changed, 60 insertions(+), 30 deletions(-) diff --git a/early-init.el b/early-init.el index df7042d..4696078 100644 --- a/early-init.el +++ b/early-init.el @@ -1,4 +1,4 @@ -;;; +early-init.el --- summary +;;; +early-init.el --- summary -*- lexical-binding: t; -*- ;; Author: Maciej Szlosarczyk ;; Maintainer: Maciej Szlosarczyk diff --git a/lisp/icejam-completing-read.el b/lisp/icejam-completing-read.el index 113a734..8e802b2 100644 --- a/lisp/icejam-completing-read.el +++ b/lisp/icejam-completing-read.el @@ -6,7 +6,9 @@ ;;; helpful. ;;; ;;; Code: -(eval-when-compile (defvar icejam-keys-mode-map)) +(eval-when-compile + (defvar icejam-keys-mode-map) + (defvar crm-separator)) ;; Preparations for using Vertico/Orderless (setopt @@ -21,6 +23,7 @@ '(read-only t cursor-intangible t face minibuffer-prompt)) (defun crm-indicator (args) + "Work with ARGS in `completing-read-multiple`." (cons (format "[CRM%s] %s" (replace-regexp-in-string "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" "" diff --git a/lisp/icejam-flycheck.el b/lisp/icejam-flycheck.el index b43f3fd..7dd1a82 100644 --- a/lisp/icejam-flycheck.el +++ b/lisp/icejam-flycheck.el @@ -4,16 +4,21 @@ ;; Use flycheck checks with flymake. (use-package flymake-flycheck :ensure t :defer t :config -(setq-default - flycheck-disabled-checkers - (append (default-value 'flycheck-disabled-checkers) - '(emacs-lisp emacs-lisp-checkdoc - emacs-lisp-package sh-shellcheck)))) + (setq-default + flycheck-disabled-checkers + (append (default-value 'flycheck-disabled-checkers) + '(emacs-lisp emacs-lisp-checkdoc emacs-lisp-package sh-shellcheck)))) -(declare-function flymake--project-diagnostics-buffer 'flymake) -(declare-function flymake--diagnostics-buffer-name 'flymake) -(declare-function flymake-project-diagnostics-mode 'flymake) -(declare-function flymake-diagnostics-buffer-mode 'flymake) +(eval-when-compile + (declare-function flymake--project-diagnostics-buffer 'flymake) + (declare-function flymake--diagnostics-buffer-name 'flymake) + (declare-function flymake-project-diagnostics-mode 'flymake) + (declare-function flymake-diagnostics-buffer-mode 'flymake) + (declare-function cape-capf-super 'cape) + (declare-function cape-dabbrev 'cape) + (declare-function cape-file 'cape) + (declare-function cape-keyword 'cape) + (declare-function yasnippet-capf 'yasnippet-capf)) (use-package el-patch :ensure t :defer t :config @@ -51,10 +56,13 @@ (display-buffer (current-buffer)) (revert-buffer))))) - (el-patch-feature 'magit-commit) - (with-eval-after-load 'magit-commit + (el-patch-feature 'git-commit) + (with-eval-after-load 'git-commit + ;; Reverts the contents of this commit: + ;; https://github.com/magit/magit/commit/2366db4b3b792fbd191c1d653014bfc6343b270c (el-patch-defun git-commit-setup-capf () - "Set completion-at-point-functions to be actually useful." + "Set completion-at-point-functions to use cape completions in +`magit-commit' screens." (setq-local completion-at-point-functions (list (cape-capf-super #'cape-dabbrev #'yasnippet-capf) #'cape-file diff --git a/lisp/icejam-transient.el b/lisp/icejam-transient.el index f223ab6..a787d34 100644 --- a/lisp/icejam-transient.el +++ b/lisp/icejam-transient.el @@ -1,8 +1,20 @@ -;;; pkg/transient -- summary -*- lexical-binding: t; -*- +;;; icejam-transient -- summary -*- lexical-binding: t; -*- ;;; Commentary: ;;; Global Transient definitions. ;;; Code: -(eval-when-compile (defvar icejam-keys-mode-map)) +(eval-when-compile + (defvar icejam-keys-mode-map) + (defvar icejam-project-menu) + (defvar icejam-code-menu) + (defvar icejam-buffer-menu) + (defvar icejam-elpaca-menu) + (defvar icejam-language-menu) + (defvar icejam-command-palette) + (declare-function transient-define-prefix 'transient) + (declare-function icejam-project-menu 'icejam-transient) + (declare-function icejam-code-menu 'icejam-transient) + (declare-function icejam-buffer-menu 'icejam-transient) + (declare-function icejam-command-palette 'icejam-transient)) (use-package transient :ensure (:wait t)) diff --git a/lisp/icejam-tree-sitter.el b/lisp/icejam-tree-sitter.el index 30e855b..8072cb5 100644 --- a/lisp/icejam-tree-sitter.el +++ b/lisp/icejam-tree-sitter.el @@ -1,4 +1,4 @@ -;;; icejam-treesitter.el --- summary +;;; icejam-treesitter.el --- summary -*- lexical-binding: t; -*- ;; Author: Maciej Szlosarczyk ;; Maintainer: Maciej Szlosarczyk diff --git a/lisp/langs/icejam-lang-dhall.el b/lisp/langs/icejam-lang-dhall.el index f92d9f9..54eb6f6 100644 --- a/lisp/langs/icejam-lang-dhall.el +++ b/lisp/langs/icejam-lang-dhall.el @@ -4,6 +4,9 @@ (use-package dhall-mode :ensure t :defer t) +(eval-when-compile + (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)) + (defun icejam-lang-activate-dhall-mode () "Reconfigure dhall mode for your own purposes." (eglot-ensure) diff --git a/lisp/langs/icejam-lang-gleam.el b/lisp/langs/icejam-lang-gleam.el index 8ae481a..8cc1833 100644 --- a/lisp/langs/icejam-lang-gleam.el +++ b/lisp/langs/icejam-lang-gleam.el @@ -9,9 +9,10 @@ ;; Gleam language support ;;; Code: -(declare-function column-enforce-n 'column-enforce-mode (number)) -(declare-function icejam-set-indent 'icejam-prog-mode) -(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point) +(eval-when-compile + (declare-function column-enforce-n 'column-enforce-mode (number)) + (declare-function icejam-set-indent 'icejam-prog-mode) + (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)) (use-package gleam-ts-mode :defer t :ensure t :mode (rx ".gleam" eos)) diff --git a/lisp/langs/icejam-lang-php.el b/lisp/langs/icejam-lang-php.el index 5a48c4a..1684d11 100644 --- a/lisp/langs/icejam-lang-php.el +++ b/lisp/langs/icejam-lang-php.el @@ -1,4 +1,4 @@ -;;; php.el --- summary -*- lexical-binding: t; -*- +;;; icejam-lang-php.el --- summary -*- lexical-binding: t; -*- ;; Author: Maciej Szlosarczyk ;; Maintainer: Maciej Szlosarczyk @@ -9,14 +9,17 @@ ;; php related settings ;;; Code: -(declare-function column-enforce-n 'column-enforce-mode (number)) -(declare-function icejam-set-indent 'icejam-prog-mode) -(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point) -(eval-when-compile (defvar icejam-language-transient-alist)) +(eval-when-compile + (defvar icejam-language-transient-alist) + (defvar icejam-php-lang-menu) + (declare-function column-enforce-n 'column-enforce-mode (number)) + (declare-function icejam-set-indent 'icejam-prog-mode) + (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point) + (declare-function transient-define-prefix 'transient)) (use-package php-mode :ensure t :defer t) -(transient-define-prefix icejam-lang-php-context-menu () +(transient-define-prefix icejam-php-lang-menu () "PHP Buffer Commands." ["" ["LSP" @@ -29,18 +32,18 @@ ["" ("q" "Quit" keyboard-quit)]) +(add-to-list + 'icejam-language-transient-alist '(php-mode . icejam-php-lang-menu)) -(defun icejam-lang-activate-php-mode () +(defun icejam-activate-php-mode () "All things php." (icejam-set-indent 4) (column-enforce-n 80) - (keymap-set php-mode-map "C-c l" #'icejam-lang-php-context-menu) - ;; Capf override (icejam-set-eglot-capfs)) -(add-hook 'php-mode-hook 'icejam-lang-activate-php-mode) +(add-hook 'php-mode-hook 'icejam-activate-php-mode) (provide 'icejam-lang-php) ;;; icejam-lang-php.el ends here