From bdd3701987e80f1b1044d2ee0a725b5cb5828705 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 24 Mar 2025 18:21:33 -0400 Subject: [PATCH] fix(common-lisp): inferior-lisp-program: accept list To quote the docstring for `inferior-lisp-program`: Program name for starting a Lisp subprocess to Emacs. Can be a string naming a program, a whitespace-separated string of \"EXECUTABLE ARG1 ARG2\" or a list (EXECUTABLE ARGS...) where EXECUTABLE and ARGS are strings. Fix: #8324 --- modules/lang/common-lisp/config.el | 4 +++- modules/lang/common-lisp/doctor.el | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/lang/common-lisp/config.el b/modules/lang/common-lisp/config.el index 0044697f7..8a79a6dc8 100644 --- a/modules/lang/common-lisp/config.el +++ b/modules/lang/common-lisp/config.el @@ -80,7 +80,9 @@ "Attempt to auto-start sly when opening a lisp buffer." (cond ((or (doom-temp-buffer-p (current-buffer)) (sly-connected-p))) - ((executable-find (car (split-string inferior-lisp-program))) + ((executable-find (car (if (listp inferior-lisp-program) + inferior-lisp-program + (split-string inferior-lisp-program)))) (let ((sly-auto-start 'always)) (sly-auto-start) (add-hook 'kill-buffer-hook #'+common-lisp--cleanup-sly-maybe-h nil t))) diff --git a/modules/lang/common-lisp/doctor.el b/modules/lang/common-lisp/doctor.el index 3c1842726..6901bf6f2 100644 --- a/modules/lang/common-lisp/doctor.el +++ b/modules/lang/common-lisp/doctor.el @@ -1,7 +1,9 @@ ;;; lang/common-lisp/doctor.el -*- lexical-binding: t; -*- (when (require 'sly nil t) - (let ((prog-name (car (split-string inferior-lisp-program)))) - (unless (executable-find prog-name) - (warn! "Couldn't find your `inferior-lisp-program' (%s). Is it installed?" - inferior-lisp-program)))) + (unless (executable-find + (car (if (listp inferior-lisp-program) + inferior-lisp-program + (split-string inferior-lisp-program)))) + (warn! "Couldn't find your `inferior-lisp-program' (%s). Is it installed?" + inferior-lisp-program)))