Compare commits

...

2 Commits

Author SHA1 Message Date
David Morgan dc0e9d8872
Update elpaca installer code 2024-03-16 16:20:01 +00:00
David Morgan a06de4b3f5
Ensure cider-jack-in-and-run-main is bound 2024-03-16 16:18:28 +00:00
2 changed files with 9 additions and 5 deletions

View File

@ -55,7 +55,9 @@
(setq-local uniquify-min-dir-content 3))
(funcall orig base dirname depth original-dirname))
(advice-add 'uniquify-get-proposed-name :around 'clj-uniquify-get-proposed-name)
:bind
;; Duplicated from cider config (below) to ensure this isn't overriden
(:map clojure-mode-map ("C-c M-j" . cider-jack-in-and-run-main))
:hook
(clojure-mode . clojure-mode-hook-fn))

View File

@ -3,12 +3,12 @@
;;; Code:
;; Elpaca installer block
(defvar elpaca-installer-version 0.6)
(defvar elpaca-installer-version 0.7)
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
:ref nil
:ref nil :depth 1
:files (:defaults "elpaca-test.el" (:exclude "extensions"))
:build (:not elpaca--activate-package)))
(let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory))
@ -21,8 +21,10 @@
(when (< emacs-major-version 28) (require 'subr-x))
(condition-case-unless-debug err
(if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
((zerop (call-process "git" nil buffer t "clone"
(plist-get order :repo) repo)))
((zerop (apply #'call-process `("git" nil ,buffer t "clone"
,@(when-let ((depth (plist-get order :depth)))
(list (format "--depth=%d" depth) "--no-single-branch"))
,(plist-get order :repo) ,repo))))
((zerop (call-process "git" nil buffer t "checkout"
(or (plist-get order :ref) "--"))))
(emacs (concat invocation-directory invocation-name))