From nobody Fri Jan 10 13:21:25 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YV2Nj74Xgz5kK8d; Fri, 10 Jan 2025 13:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YV2Nj4CyTz4jCY; Fri, 10 Jan 2025 13:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736515285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j5fX+olg3UtUbhDWgf2zRipiTtFxgvbIZ9uoHHEhs1Y=; b=TAhM6u2+VZoGiX2J9lE2JIshJqmTVpyXHS5T3xNsNcOL9RLUWvkgybxXeJSNKqdTYFS5Iq yCpSn4LiDUAyAoXWLBtTgkug7eLDCvHnXTR5eHnyX+TMFyqQq09tTsz+NwzsbRF+7fJzGW DButzpuAx8KRJL8k8kQ3vaTu1yJgpQ+Oci+vKt6YRPU7G5was45SrK3JyKOXZPpIqHTHSk lfqSWMTPr7hppjwAjjH7XsKkVXBoQK15MVlRBMBc7QGi3xNrc3zlA0QLhlTPdEAokLEHBW Cw0kfPA8rbiVuHTV7Zc3ZVEn0dBkcduT7Stc+4cGPVFFrNPXZXAkVzg+hwlb/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736515285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j5fX+olg3UtUbhDWgf2zRipiTtFxgvbIZ9uoHHEhs1Y=; b=PNfGwiZZ7SyryXpT9e0AHuCO0u3GeuLcYlBcuyjEM2HpFXXCvCMgZjO+q7I9bowhd4LsKr zvI92MBZdZThVhRRBdJ34n3zU9ECG199S3dK7ExPddWQ8Xn/NRgchnxAfvI5FnV46q77YS CxnpuExsNH31+d0KfqC6iA7gc2ml3Be1d4QSLxFpGzt68aRqfaTc8W2g88SD1Wlzx/8Umt 9NQhk0pQA1AXyXlz6pU1CNVFK2S0fg2UBRKEotWs16GBTk7L0p6k/m1M/WDJLDhGkPkeYN QNTx8NpsRF9/N8Aac1rqaWszVTcDMbQE51/qBn8qTQktGVQJVutOPle82PkbdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736515285; a=rsa-sha256; cv=none; b=ckkVYSQZK0cai52+F5GzfKmNFgBuDmkQpo3blrNt2w2u2Os5+iv8iu2UbqtUAgTXLz1rGC FDW4UHo+r4N50qCn1DD11nGwCHf3XaRqYS/+j+NZOWCccnzJ0GtU3XkF4vMvNVqlVKkn3Q cSOPVmCisniMyZLmFbm/3sw47nYW2NaX4SI6fbtIVvEKQ07WVew5K5Iv02oVlQRvRwPH02 IX7lV1DNJ+2sBI7Ik1H3Xe6z3KZi7+1Mot0p5oGqdhpt4wBsdKnMKFq82eAI5tRVQkWAqR W7GyOJMi4WFp37nFeZX4ffwv0vI9ptptrU3S4FPlmdIu9UCxvLG+GUEyIS7+Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YV2Nj3pxCz1CGY; Fri, 10 Jan 2025 13:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50ADLPjU063640; Fri, 10 Jan 2025 13:21:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50ADLP7i063637; Fri, 10 Jan 2025 13:21:25 GMT (envelope-from git) Date: Fri, 10 Jan 2025 13:21:25 GMT Message-Id: <202501101321.50ADLP7i063637@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Certner Subject: git: 97083d47fd43 - main - editors/sly: Update to latest commit (dated 2024/08/09) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97083d47fd436e218c868dc36fa17d4fa88ac199 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/ports/commit/?id=97083d47fd436e218c868dc36fa17d4fa88ac199 commit 97083d47fd436e218c868dc36fa17d4fa88ac199 Author: Olivier Certner AuthorDate: 2025-01-09 18:15:02 +0000 Commit: Olivier Certner CommitDate: 2025-01-10 13:20:24 +0000 editors/sly: Update to latest commit (dated 2024/08/09) Updates: - Prevent ‘C-h m’ from breaking in Sly debugger buffers. - Unbreak odd non-SLY uses of slynk/indentation system. - mrepl: Fix a bug on SBCL. - Emit :company-kind in Sly's flex CAPF (allows completion frameworks to show type icons). - Make sly-simple-completions behave more like vanilla. - Add option to control if we replace SLIME on load. The SLY contribs in the ports tree have not been bumped as this new version does not change the interface to them, so they don't need recompilation. This is a maintainer update (olce.freebsd.ports@certner.fr). Sponsored by: The FreeBSD Foundation --- editors/sly/Makefile | 5 ++--- editors/sly/distinfo | 6 +++--- editors/sly/files/patch-sly.el | 27 +++++++++++++++++---------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/editors/sly/Makefile b/editors/sly/Makefile index 01b7ac36fd54..1ff0803048b8 100644 --- a/editors/sly/Makefile +++ b/editors/sly/Makefile @@ -1,6 +1,5 @@ PORTNAME= sly -DISTVERSION= 1.0.43-20230624 -PORTREVISION= 4 +DISTVERSION= 1.0.43-20240809 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} @@ -13,7 +12,7 @@ LICENSE= PD USES= emacs gmake USE_GITHUB= yes GH_ACCOUNT= joaotavora -GH_TAGNAME= df62abae73bd511885c9c7ec0ea7ea1469a00923 +GH_TAGNAME= 742355f7554ab6c46e5c1c9bdb89068f55359eaa NO_ARCH= yes diff --git a/editors/sly/distinfo b/editors/sly/distinfo index 04049fb2af66..b1da6a4f0fc2 100644 --- a/editors/sly/distinfo +++ b/editors/sly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692890116 -SHA256 (joaotavora-sly-1.0.43-20230624-df62abae73bd511885c9c7ec0ea7ea1469a00923_GH0.tar.gz) = 9e961e06cd80bfa9a993446e30da8b378ba92b3d69e52d56c3ac2e18115a0889 -SIZE (joaotavora-sly-1.0.43-20230624-df62abae73bd511885c9c7ec0ea7ea1469a00923_GH0.tar.gz) = 1840949 +TIMESTAMP = 1736445917 +SHA256 (joaotavora-sly-1.0.43-20240809-742355f7554ab6c46e5c1c9bdb89068f55359eaa_GH0.tar.gz) = ffa627a3f4740372e88990113a2af8178f7bce0771f36b35896f8018b34b6e5f +SIZE (joaotavora-sly-1.0.43-20240809-742355f7554ab6c46e5c1c9bdb89068f55359eaa_GH0.tar.gz) = 1841274 diff --git a/editors/sly/files/patch-sly.el b/editors/sly/files/patch-sly.el index 22aa9c81ed7c..cd96a7e4bb54 100644 --- a/editors/sly/files/patch-sly.el +++ b/editors/sly/files/patch-sly.el @@ -1,28 +1,35 @@ ---- sly.el.orig 2023-05-23 12:54:52 UTC +--- sly.el.orig 2024-08-09 21:19:04 UTC +++ sly.el -@@ -7475,22 +7475,30 @@ can be found." - ;;;###autoload - (add-hook 'lisp-mode-hook 'sly-editing-mode) +@@ -7487,24 +7487,35 @@ other non-nil value to unconditionally replace SLIME." + (const :tag "Do not replace SLIME" nil) + (const :tag "Do replace SLIME" t))) -(cond - ((or (not (memq 'slime-lisp-mode-hook lisp-mode-hook)) - noninteractive - (prog1 -- (y-or-n-p "[sly] SLIME detected in `lisp-mode-hook', causes keybinding conflicts. Remove it for this Emacs session?") +- (if (eq sly-replace-slime 'ask) +- (y-or-n-p "[sly] SLIME detected in `lisp-mode-hook', causes keybinding conflicts. Remove it for this Emacs session?") +- sly-replace-slime) - (warn "To restore SLIME in this session, customize `lisp-mode-hook' -and replace `sly-editing-mode' with `slime-lisp-mode-hook'."))) - (remove-hook 'lisp-mode-hook 'slime-lisp-mode-hook) +(let ((proceed-p + (if noninteractive -+ (lambda () t) ++ (lambda () ++ (if (eq sly-replace-slime 'ask) ++ t ++ sly-replace-slime)) + (let (asked resp) + (lambda () + (unless asked + (setq resp -+ (y-or-n-p -+ (eval-when-compile -+ (concat "[sly] SLIME detected. Try to disable it " -+ "for this Emacs session?"))) ++ (if (eq sly-replace-slime 'ask) ++ (y-or-n-p ++ (eval-when-compile ++ (concat "[sly] SLIME detected. Try to disable it " ++ "for this Emacs session?"))) ++ sly-replace-slime) + asked t)) + resp))))) + (when (and (memq 'slime-lisp-mode-hook lisp-mode-hook)