Clean up some variable problems

early-init.el

@@ -1,4 +1,4 @@
-;;; +early-init.el --- summary
+;;; +early-init.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk

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
                  "\\`\\[.*?]\\*\\|\\[.*?]\\*\\'" ""

lisp/icejam-flycheck.el

@@ -4,16 +4,21 @@
 
 ;; Use flycheck checks with flymake.
 (use-package flymake-flycheck :ensure t :defer t :config
-(setq-default
+  (setq-default
    flycheck-disabled-checkers
    (append (default-value 'flycheck-disabled-checkers)
-             '(emacs-lisp emacs-lisp-checkdoc
-                          emacs-lisp-package sh-shellcheck))))
+           '(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

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))
 

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

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)

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))

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