From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eLwqDyDOkmGGfAEAgWs5BA (envelope-from ) for ; Mon, 15 Nov 2021 22:16:16 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 0MyyCiDOkmGfIQAAbx9fmQ (envelope-from ) for ; Mon, 15 Nov 2021 21:16:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C19FB346F1 for ; Mon, 15 Nov 2021 22:16:15 +0100 (CET) Received: from localhost ([::1]:50120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmjKo-00074h-SR for larch@yhetil.org; Mon, 15 Nov 2021 16:16:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmjKc-00071x-68 for bug-guix@gnu.org; Mon, 15 Nov 2021 16:16:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmjKb-00016f-TZ for bug-guix@gnu.org; Mon, 15 Nov 2021 16:16:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mmjKb-0001UY-Pt for bug-guix@gnu.org; Mon, 15 Nov 2021 16:16:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#51869: [PATCH] Add emacs-vala-mode Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 15 Nov 2021 21:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51869 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 51869@debbugs.gnu.org Received: via spool by 51869-submit@debbugs.gnu.org id=B51869.16370109135649 (code B ref 51869); Mon, 15 Nov 2021 21:16:01 +0000 Received: (at 51869) by debbugs.gnu.org; 15 Nov 2021 21:15:13 +0000 Received: from localhost ([127.0.0.1]:56347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmjJp-0001T2-75 for submit@debbugs.gnu.org; Mon, 15 Nov 2021 16:15:13 -0500 Received: from planete-kraus.eu ([89.234.140.182]:36488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmjJm-0001Sm-Kj for 51869@debbugs.gnu.org; Mon, 15 Nov 2021 16:15:11 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id ea1fea6f; Mon, 15 Nov 2021 21:15:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= references:from:to:cc:subject:date:in-reply-to:message-id :mime-version:content-type; s=dkim; bh=s4lsL9Rr/CuMhRBn/FdgI4Hpd XA=; b=vOAl9ncOdmJgg28rUPUsfD1lGfTrmgjSGlCsT+6WCLKJ4qx1eblqe9nRU 4w3+0uFIOWSWXd7nuFQleWQYiJWyf2y2U7HXzGD8+C61b+MNZD13exSBJNgSB1tl JW9MZbVqUQQCzk+kfQxcyXm1HDvxnUfgX5OvD8rNqNoOLDZSy8= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 6f3f111d (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Mon, 15 Nov 2021 21:15:05 +0000 (UTC) References: <87pmr14ipx.fsf@planete-kraus.eu> <93b000a9d4d893e23e7b55d306aa385eeca19c78.camel@gmail.com> User-agent: mu4e 1.6.9; emacs 27.2 Date: Mon, 15 Nov 2021 20:48:21 +0000 In-reply-to: <93b000a9d4d893e23e7b55d306aa385eeca19c78.camel@gmail.com> Message-ID: <878rxp3yuk.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" Reply-to: Vivien Kraus From: Vivien Kraus via Bug reports for GNU Guix X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637010975; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=669ON8zm4F4QRYgsseu5s5WBy+eFxHfOlpztpzLCKx4=; b=RlSL3SzXATG1EQI/ZFqhuUjoQdpvkogSfOOE9fbaWyzQwHCyT8L1+oSPwQccykHA37flsl vthO5DHtMrNn9jxtRYqLpymruxhNIuFtiVrDt2f3ehyJcBStqhXUet5Jkf+/pzhkE4gxdc vGD177rdIWRTVjPFby8gERnGtUv78qee2kcHN0VZMUIwdyjBWt8aGI2X2WqsTcwEqaCvS/ GI8F39lktL6BCSsZReUti4XfUmHVYbdMf0HM22nNcW/ok+paY65WtQ8TmIGulHec7JuQ2z 0pZSPXTwYLDPeDfgJtWFHWxx2ltBEB8f4DkcuYBl1+wg0iEnH9B0+4N3iT89QA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637010975; a=rsa-sha256; cv=none; b=P14zTMxAweik3FP7u6we/4zVzrtVIQW33xOTGQl59vZXDwY1W2XKgODIiIyKCQ1reG6nJZ qFN3gQ6pXuxvpg1JwvIlt9s/04ynMxI1rzgbIfOziFIusXsODb9kQqvNEwc1d7NGbLo5F5 dOW+16wBsM4jna6LS984PZ43s8BmEUPJQzLqwKjYtEA8x3ARScn1r8oo4FJCwOCQ4VIr4S jiwh9oBLP7s4B38t7tkk7CDIcCLlHwKzllm9OCSAqRk1o/XM8QMJKW5bOIOQGoWaBf/8TJ nqgAL25S9FSMfcFR1ZZbxvJi0U3CX1Jmbuz364rR6bw4sOSUV5gtk++AsRbtKQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=vOAl9ncO; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.94 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=vOAl9ncO; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C19FB346F1 X-Spam-Score: -3.94 X-Migadu-Scanner: scn0.migadu.com X-TUID: FMY8j4JtQfQq --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi! Liliana Marie Prikler writes: >> Since I don=E2=80=99t have a solution to fix this issue, I went away and >> reverted the multiline support. It builds and is useful enough for >> LSP to kick in, so I consider it fixed. >>=20 >> What do you think? Do you have a better fix? > Given my superior knowledge of Emacs Lisp (just kidding), I'd guess the > order of declarations is wrong. Pull the defcustom before the other > thing and it ought to work. Unfortunately, it does not. I tried it, but it gives the same error message. I=E2=80=99m a bit surprised, but reading the help entry for c-lang-defconst, I see there is a lot of information about when things are evaluated, so maybe someone smart can parse it and understand why we can=E2=80=99t use the custom variable value. >> + (version "20201218.2109") >> + (source >> + (origin >> + (method git-fetch) >> + (uri (git-reference >> + (url "https://github.com/rrthomas/vala-mode.git") >> + (commit "d696a8177e94c81ea557ad364a3b3dcc3abbc50f"))) > Use the (let ((revision ...) (commit ...)) (package ...)) convention, > adding a note that upstream has no tagged release. Base version > appears to be "0.1" I didn=E2=80=99t know that convention, so here is the updated patch, still waiting for a convincing fix for the multiline strings issue. Vivien --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-emacs-vala-mode.patch Content-Transfer-Encoding: quoted-printable Content-Description: Emacs vala mode, with packaging convention From=202912a84d86372cac6944f7661a028b108484c556 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 15 Nov 2021 13:57:18 +0000 Subject: [PATCH] gnu: Add emacs-vala-mode. * gnu/packages/emacs-xyz (emacs-vala-mode): New variable. * gnu/packages/patches/vala-mode-fix.patch: Add a vala-mode patch to disable multiline string support. * gnu/local.mk (dist_patch_DATA): Register the patch to disable multiline string support. =2D-- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 29 +++++++++++ .../patches/emacs-vala-mode-fix.patch | 48 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 gnu/packages/patches/emacs-vala-mode-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5b21a6ee1b..4a73e7cee1 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1033,6 +1033,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-telega-path-placeholder.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ + %D%/packages/patches/emacs-vala-mode-fix.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ec0376442b..ff42b4d4d6 100644 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29989,3 +29989,32 @@ (define-public emacs-global-tags wraps GNU Global calls and integration to editor using this API with project.el and xref.el.") (license license:gpl3+)))) + +(define-public emacs-vala-mode + ;; Upstream has no tagged release. + (let ((commit "d696a8177e94c81ea557ad364a3b3dcc3abbc50f") + (revision "0")) + (package + (name "emacs-vala-mode") + (version (git-version "0.1" revision commit)) + (home-page "https://github.com/rrthomas/vala-mode") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (sha256 + (base32 "0g5pdq757z9d8rk489n5ilhqipdc4i4sfkjwwrxyvgjlapjc04c0")) + (patches + (search-patches "emacs-vala-mode-fix.patch")))) + (build-system emacs-build-system) + (synopsis "Vala mode for Emacs") + (description + "This package provides a major mode for editing .vala and .vapi fil= es +in Emacs. See @url{http://live.gnome.org/Vala} for details about Vala +language. + +This mode was based on Dylan Moonfire's @samp{csharp-mode}. +") + (license license:gpl2+)))) diff --git a/gnu/packages/patches/emacs-vala-mode-fix.patch b/gnu/packages/= patches/emacs-vala-mode-fix.patch new file mode 100644 index 0000000000..0a50b0e362 =2D-- /dev/null +++ b/gnu/packages/patches/emacs-vala-mode-fix.patch @@ -0,0 +1,48 @@ +From 68db3ae7410a7d89e606e1916240193b96ab335e Mon Sep 17 00:00:00 2001 +From: Vivien +Date: Mon, 15 Nov 2021 13:55:58 +0000 +Subject: [PATCH] Revert "vala-mode: support multiline strings" + +This reverts commit 671c287ba9cb81dcf6e9485e6ccc60bc2b7aba14. +--- + vala-mode.el | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git a/vala-mode.el b/vala-mode.el +index 8c4da4c..22c6e49 100644 +--- a/vala-mode.el ++++ b/vala-mode.el +@@ -259,14 +259,6 @@ casts and declarations are fontified. Used on level = 2 and higher." + (c-lang-defconst c-opt-cpp-prefix + vala "\\s *#\\s *") +=20 +-;; Support multiline strings +-;; +-;; FIXME: This allows any string to be multiline. Currently, c-mode only +-;; supports a single-character prefix to denote a multiline string, so the +-;; real fix will be harder. +-(c-lang-defconst c-multiline-string-start-char +- vala vala-multiline-strings) +- + ;; Vala uses the following assignment operators + (c-lang-defconst c-assignment-operators + vala '("=3D" "*=3D" "/=3D" "%=3D" "+=3D" "-=3D" ">>=3D" "<<=3D" +@@ -428,15 +420,6 @@ casts and declarations are fontified. Used on level = 2 and higher." + :type 'hook + :group 'c) +=20 +-(defcustom vala-multiline-strings nil +- "Whether to enable support for multiline strings. +- +-It can conflict with some other Emacs functionality, such as the +-automatic insertion of closing quotes `electric-pair-mode'." +- :type 'bool +- :group 'vala) +- +- + ;;; The entry point into the mode + ;;;###autoload + (defun vala-mode () +--=20 +2.33.1 + =2D-=20 2.33.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGSzdMACgkQO7C8EjLY uCznoAwAx+cQL25KM6ILyRbvdNDsveEVlhziBz3T7XXejIWKMxPBOKwwUZuOCfp1 DBFC64lSi4vRR6HvmLiB8nfFAwHlgg2Ez2Mw61sWSKMtaselZIFHDuTy5fANEWOh ryLF+8mMoxGm+GcQ2g5UaeI7FYddvN6A2967RALc31AiTrmwMFB93DQ14vsV6akL 45pERrp7BbbJcDsEAj6yjWnkTbEpxS5AzgdaCYVN2HjoZk1Z+MNI9H1oHLV4h5Bm RvvlLNF+9vYVLMcPsKTfO0npHV9U2tTRu1pzYXy3FqCECRXevoV9O5JNGoOUtVDk 6/X6BdpyNuBQct+/tpTqwqN4ulorIwS2vMn7YSFLRhEk2+VAKF/MXhPvJ07Ljs0w SXsPbpSIC+heUlWLPl89DTCKrDtZ8ubv5ocKL+8xP+9vtI8wkkOtmtftlodFtWUj 4+9Wvh8isEofB656DX2facwtwjT/1oWy+APXKnbrO9afHScb+RmV7muG5udoaRBD Mz5hR1d0 =Mh2T -----END PGP SIGNATURE----- --==-=-=--