Skip to content

Commit

Permalink
Makefile: Remove EMACS_PACKAGES option
Browse files Browse the repository at this point in the history
Also fix a couple byte compiler warnings, which IIUC resulted from
cl-extra no longer being loaded as a side effect of
package-initialize. Fix by switching from cl- to seq- flavors.
  • Loading branch information
greghendershott committed Jun 26, 2024
1 parent f82a29c commit ec5115f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ help:
# default on PATH. e.g. `EMACS=/path/to/emacs make`.
EMACS ?= emacs
RACKET ?= racket
# Allow another locations for Emacs packages.
EMACS_PACKAGES ?= ~/.emacs.d/elpa

show-versions:
@echo `which $(RACKET)`
Expand All @@ -18,7 +16,7 @@ show-versions:

batch-emacs := \
$(EMACS) --batch -Q -L . \
--eval '(setq package-user-dir "$(EMACS_PACKAGES)")' \
--eval '(require (quote package))' \
--eval '(package-initialize)'

byte-compile := \
Expand Down Expand Up @@ -52,7 +50,6 @@ melpa-url := https://melpa.org/packages/
deps:
$(batch-emacs) \
--eval '(add-to-list (quote package-archives) (cons "melpa" "$(melpa-url)"))' \
--eval '(package-initialize)' \
--eval '(package-refresh-contents)' \
--eval '(package-install (quote faceup))' \
--eval '(package-install (quote paredit))'
Expand Down
9 changes: 5 additions & 4 deletions racket-custom.el
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
(require 'rx)
(require 'sh-script) ;for sh-heredoc face
(require 'comint) ;for comint-simple-send in racket-shell-or-terminal
(require 'seq)

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; racket group
Expand Down Expand Up @@ -481,10 +482,10 @@ level quieter. That way you can set the \"*\" topic to a level
like \"debug\" and not get overhwelmed by these noisy topics."
:type '(alist :key-type symbol :value-type symbol)
:safe (lambda (xs)
(cl-every (lambda (x)
(and (symbolp (car x))
(symbolp (cdr x))))
xs))
(seq-every-p (lambda (x)
(and (symbolp (car x))
(symbolp (cdr x))))
xs))
:load "racket-cmd"
:set (lambda (var val)
(set-default var val)
Expand Down
6 changes: 3 additions & 3 deletions racket-smart-open.el
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,9 @@ See `racket-smart-open-bracket-mode'."
(or (racket--ppss-string-p state)
(racket--ppss-comment-p state)))))
?\[)
(cl-some (lambda (xs)
(apply #'racket--smart-open-bracket-helper xs))
racket--smart-open-bracket-data)
(seq-some (lambda (xs)
(apply #'racket--smart-open-bracket-helper xs))
racket--smart-open-bracket-data)
(racket--open-paren #'backward-sexp)
?\()))
(if (fboundp 'racket--paredit-aware-open)
Expand Down

0 comments on commit ec5115f

Please sign in to comment.