Prefer newer files

lisp/icejam-base.el

@@ -14,6 +14,9 @@
 ;; Update emacs less often
 (setopt idle-update-delay 1.0)
 
+;; Prefer newer byte-compiled code
+(setopt load-prefer-newer t)
+
 ;; Disable bidirectional text rendering for a modest performance boost. I've set
 ;; this to `nil' in the past, but the `bidi-display-reordering's docs say that
 ;; is an undefined state and suggest this to be just as good:

lisp/icejam-custom-init.el

@@ -128,7 +128,6 @@
 (use-package icejam-lang-haskell :ensure nil)
 (use-package icejam-lang-javascript :ensure nil)
 (use-package icejam-lang-kotlin :ensure nil)
-;; (use-package icejam-lang-lean :ensure nil)
 (use-package icejam-lang-lua :ensure nil)
 (use-package icejam-lang-markdown :ensure nil)
 (use-package icejam-lang-ocaml :ensure nil)

lisp/langs/icejam-lang-clojure.el

@@ -2,8 +2,12 @@
 ;;; Commentary:
 ;;; Code:
 
-(declare-function column-enforce-n "column-enforce-mode" (number))
+(eval-when-compile
-(declare-function icejam-set-indent 'icejam-prog-mode)
+  (defvar icejam-language-transient-alist)
+  (defvar icejam-clojure-lang-menu)
+  (declare-function column-enforce-n "column-enforce-mode" (number))
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function transient-define-prefix 'transient))
 
 (use-package clojure-mode :defer t :ensure t)
 
@@ -20,7 +24,7 @@
 	:ensure t)
 
 ;; Transient
-(transient-define-prefix icejam-lang-cider-context-menu ()
+(transient-define-prefix icejam-clojure-lang-menu ()
   "Clojure Buffer Commands."
   [""
    ["Cider"
@@ -34,14 +38,15 @@
   [""
    ("q"  "Quit"        keyboard-quit)])
 
+(add-to-list
+ 'icejam-language-transient-alist '(clojure-mode . icejam-clojure-lang-menu))
+
 (defun icejam-lang-activate-clojure-mode ()
   "Goodies for clojure files."
   (icejam-set-indent 2) ;; Default indentation of 2 characters
   (column-enforce-n 80)
   (cider-mode 1)
 
-  (define-key clojure-mode-map (kbd "C-c l") 'icejam-lang-cider-context-menu)
-
   ;; Do not enable paredit for clojure
   ;; (paredit-mode 1)
 	;; Do not show separate error window when in REPL

lisp/langs/icejam-lang-fsharp.el

@@ -9,9 +9,10 @@
 ;; Fsharp configuration
 
 ;;; Code:
-(declare-function icejam-set-indent 'icejam-prog-mode)
+(eval-when-compile
-(declare-function column-enforce-n 'column-enforce-mode)
+  (declare-function icejam-set-indent 'icejam-prog-mode)
-(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
+  (declare-function column-enforce-n 'column-enforce-mode)
+  (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point))
 
 (use-package fsharp-mode :ensure t :defer t)
 

lisp/langs/icejam-lang-golang.el

@@ -9,9 +9,10 @@
 ;; golang mode stuff
 
 ;;; Code:
-(declare-function column-enforce-n 'column-enforce-mode (number))
+(eval-when-compile
-(declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function column-enforce-n 'column-enforce-mode (number))
-(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point))
 
 (use-package go-mode :defer t :ensure t)
 

lisp/langs/icejam-lang-haskell.el

@@ -10,9 +10,10 @@
 
 ;;; Code:
 
-(declare-function column-enforce-n 'column-enforce-mode (number))
+(eval-when-compile
-(declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function column-enforce-n 'column-enforce-mode (number))
-(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point))
 
 (use-package haskell-mode :ensure t :defer t)
 

lisp/langs/icejam-lang-javascript.el

@@ -2,9 +2,10 @@
 ;;; Commentary:
 ;;; Code:
 
-(declare-function column-enforce-n 'column-enforce-mode (number))
+(eval-when-compile
-(declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function column-enforce-n 'column-enforce-mode (number))
-(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point))
 
 (use-package js2-mode :ensure t :defer t :after(web-mode))
 

lisp/langs/icejam-lang-kotlin.el

@@ -9,9 +9,10 @@
 ;; kotlin does a thing.
 
 ;;; Code:
-(declare-function column-enforce-n 'column-enforce-mode (number))
+(eval-when-compile
-(declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function column-enforce-n 'column-enforce-mode (number))
-(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point))
 
 (use-package kotlin-ts-mode :ensure t :defer t)
 

lisp/langs/icejam-lang-lean.el

@@ -1,27 +0,0 @@
-;;; lean -- summary -*- lexical-binding: t; -*-
-;;; Commentary:
-;;; Code:
-(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
-
-(use-package lean4-mode
-  :ensure (lean4-mode
-           :type git
-           :host github
-           :repo "leanprover/lean4-mode"
-           :files ("*.el" "data"))
-  :defer t)
-
-(defun icejam-activate-lean-mode ()
-  "All things for Lean mode."
-  (interactive)
-
-  ;; Run LSP
-  (eglot-ensure)
-
-  ;; Capf override
-  (icejam-set-eglot-capfs))
-
-(add-hook 'lean4-mode-hook #'icejam-activate-lean-mode)
-
-(provide 'icejam-lang-lean)
-;;; icejam-lang-lean.el ends here

lisp/langs/icejam-lang-ocaml.el

@@ -1,9 +1,12 @@
 ;;; ocaml -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Code:
-(declare-function icejam-set-indent 'icejam-prog-mode)
+(eval-when-compile
-(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
+  (defvar icejam-ocaml-lang-menu 'icejam-lang-ocaml)
-(eval-when-compile (defvar icejam-language-transient-alist))
+  (defvar icejam-language-transient-alist)
+  (declare-function transient-define-prefix 'transient)
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point))
 
 (use-package merlin :defer t :ensure t)
 (use-package opam-switch-mode :defer t :ensure t :commands (opam-switch-mode))

lisp/langs/icejam-lang-purescript.el

@@ -10,14 +10,14 @@
 
 ;;; Code:
 
-(declare-function column-enforce-n 'column-enforce-mode (number))
+(eval-when-compile
-(declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function column-enforce-n 'column-enforce-mode (number))
-(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function purescript-indentation-mode 'purescript-mode)
+  (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point))
 
 (use-package purescript-mode :ensure t :defer t)
 
-(declare-function purescript-indentation-mode "purescript-mode")
-
 (defun icejam-activate-purescript-mode ()
   "All things Purescript."
   (icejam-set-indent 2)

lisp/langs/icejam-lang-python.el

@@ -1,11 +1,10 @@
 ;;; python -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Code:
-(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
-(declare-function column-enforce-n "column-enforce-mode" (number))
-(declare-function transient-define-prefix 'transient)
-
 (eval-when-compile
+  (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
+  (declare-function column-enforce-n "column-enforce-mode" (number))
+  (declare-function transient-define-prefix 'transient)
   (defvar icejam-language-transient-alist)
   (defvar icejam-python-lang-menu))
 

lisp/langs/icejam-lang-ruby.el

@@ -2,9 +2,10 @@
 ;;; Commentary:
 ;;; Code:
 
-(declare-function icejam-set-indent 'icejam-prog-mode)
+(eval-when-compile
-(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
+  (defvar icejam-language-transient-alist)
-(eval-when-compile (defvar icejam-language-transient-alist))
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point))
 
 (use-package rspec-mode :ensure t :defer t :commands (rspec-install-snippets))
 (use-package ruby-end :ensure t :defer t)

lisp/langs/icejam-lang-rust.el

@@ -21,7 +21,7 @@
 (use-package flycheck-rust
   :ensure t
   :defer t
-  :after (rust-mode lsp))
+  :after (rust-mode))
 
 (defun icejam-activate-rust-mode ()
   "All things for Rust mode."

lisp/langs/icejam-lang-ziglang.el

@@ -1,4 +1,4 @@
-;;; ziglang.el --- summary
+;;; ziglang.el --- summary -*- lexical-binding: t; -*-
 
 ;; Author: Maciej Szlosarczyk
 ;; Maintainer: Maciej Szlosarczyk
@@ -9,9 +9,10 @@
 ;; ziglang does a thing.
 
 ;;; Code:
-(declare-function column-enforce-n 'column-enforce-mode (number))
+(eval-when-compile
-(declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function column-enforce-n 'column-enforce-mode (number))
-(declare-function icejam-set-eglot-capfs 'icejam-complete-at-point)
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function icejam-set-eglot-capfs 'icejam-complete-at-point))
 
 (use-package zig-mode :ensure t :defer t)