From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gKwFCp9pkmHOXwAAgWs5BA (envelope-from ) for ; Mon, 15 Nov 2021 15:07:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id WGCSBZ9pkmGkAwAAbx9fmQ (envelope-from ) for ; Mon, 15 Nov 2021 14:07:27 +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 A9D382BE7F for ; Mon, 15 Nov 2021 15:07:25 +0100 (CET) Received: from localhost ([::1]:50480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmcdo-0005d7-76 for larch@yhetil.org; Mon, 15 Nov 2021 09:07:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmcdS-0005aQ-Fh for bug-guix@gnu.org; Mon, 15 Nov 2021 09:07:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmcdS-0000Zo-7c for bug-guix@gnu.org; Mon, 15 Nov 2021 09:07:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mmcdS-0000iy-2o for bug-guix@gnu.org; Mon, 15 Nov 2021 09:07:02 -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 14:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51869 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 51869@debbugs.gnu.org X-Debbugs-Original-To: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16369851792711 (code B ref -1); Mon, 15 Nov 2021 14:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Nov 2021 14:06:19 +0000 Received: from localhost ([127.0.0.1]:53054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmcck-0000hf-PU for submit@debbugs.gnu.org; Mon, 15 Nov 2021 09:06:19 -0500 Received: from lists.gnu.org ([209.51.188.17]:50846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmcci-0000hX-S0 for submit@debbugs.gnu.org; Mon, 15 Nov 2021 09:06:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmcci-0004fo-KR for bug-guix@gnu.org; Mon, 15 Nov 2021 09:06:16 -0500 Received: from [2a00:5881:4008:2810::309] (port=49758 helo=planete-kraus.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mmcce-0000O7-SM for bug-guix@gnu.org; Mon, 15 Nov 2021 09:06:15 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 02897f10 for ; Mon, 15 Nov 2021 14:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :to:subject:date:message-id:mime-version:content-type; s=dkim; bh=sz7ZxutvDBNQhZsfCGt1BNLKqnk=; b=FL9XDgT8w6ygGtp+DsBNFdf46k6I wXnjPldsihSUEzdZJ5WCe0iuDJr+O/tXfVfLuf71qNeInNx6V9GD7j0RwpKj25x/ ia8SU5KhdidxKFPNHaZo8s+NqCAtcjOUZM2JoMaz3JUg0gLEsOiAkct9eraS63uh Km6U51dJyqTCd88= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ebe11a72 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Mon, 15 Nov 2021 14:05:57 +0000 (UTC) Date: Mon, 15 Nov 2021 14:05:46 +0000 Message-ID: <87pmr14ipx.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:5881:4008:2810::309 (failed) Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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=1636985245; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=hFpOpnCoZfCuXkG7q9yCVAf7oo7tKD5hdIztx5orhU4=; b=hNEHQOjxqxpuPPvSFl3cVsq+bYqNqJZogCpVG93o5M7ei1Hg7qTfQSAgMTpecV5khI31kT d8C330ox5O892up3Bvzkdh55zQOXqkswuNynXLVOGircDMhN+JcvU5WGXwtjZ2sFSyaLpu MUh884a8m23KKpuBAaZ6HbBT7zvf0XOMTu+PmH6y9jW1nfpOa30PoKc4sE1X8vw+HcJU9Z YyWkjgqQCEK/uwGvMAoovEAxGhOVFHwIwmTHNNvqaG1xk0Fy5dVMwTCRRBmALLsQkLZGKK rVVVERGcjvcV9xFcYokLoSu6z5SldMlohnvv1llf134gIHHpDitZIcacrV6LnA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1636985245; a=rsa-sha256; cv=none; b=cUXZVQssrhCcmrLvAqMDLB+m0d0WwzzZiCD0t2YHfFUrfeuSH9qlUnRNDwvkUmnazZ6wV3 cEUYx3slXBwB5BvWTr/rhvSm/Ele698Vv2KS1InVwKvcz406Uxud5gCxYbwgxLMc8SLPsc o2w69WjuBY5cjQRUotr4DKFxDQCfvzbWYtfRpR2SXoQ6xl2uZmyMg6x0PAT2UR946W3Z4g /PBEAOufA9UPdZl8O8+ocL5fyg07mXPhFN4GBR0U5MIdNLUZ6Msm5GfHDmTXdkoton+x5B WwWXTnP9y8vpx6T4RL+AZYNkxcv/Ub3l26JSsIC35n/3OSg4V/XA874cgZ8mHg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=FL9XDgT8; 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: -4.14 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=FL9XDgT8; 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: A9D382BE7F X-Spam-Score: -4.14 X-Migadu-Scanner: scn0.migadu.com X-TUID: ia918zvDbiP0 --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Dear guix, There=E2=80=99s a vala mode for emacs. It is not very useful, but it regist= ers a major mode that is then used as a placeholder for the Emacs Language Server Protocol client. In fact, it=E2=80=99s not possible to activate Vala support for LSP on emacs without a vala mode, and this is the only implementation I know. This is the result of importing from MELPA. The project is not very well maintained, so it fails to build on a recent emacs (see https://github.com/rrthomas/vala-mode/issues/14). Since I don=E2=80=99t hav= e 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. What do you think? Do you have a better fix? Best regards, Vivien --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-emacs-vala-mode.patch Content-Transfer-Encoding: quoted-printable Content-Description: Add emacs-vala-mode From=207c382e721c74c319abadb65eb9f0942a7cfe24e1 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 | 25 ++++++++++++ gnu/packages/patches/vala-mode-fix.patch | 48 ++++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 gnu/packages/patches/vala-mode-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5b21a6ee1b..139325c10b 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1886,6 +1886,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/ustr-fix-build-with-gcc-5.patch \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/upower-builddir.patch \ + %D%/packages/patches/vala-mode-fix.patch \ %D%/packages/patches/valgrind-enable-arm.patch \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ec0376442b..ac15d412c5 100644 =2D-- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29989,3 +29989,28 @@ (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 + (package + (name "emacs-vala-mode") + (version "20201218.2109") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rrthomas/vala-mode.git") + (commit "d696a8177e94c81ea557ad364a3b3dcc3abbc50f"))) + (sha256 + (base32 "0g5pdq757z9d8rk489n5ilhqipdc4i4sfkjwwrxyvgjlapjc04c0")) + (patches + (search-patches "vala-mode-fix.patch")))) + (build-system emacs-build-system) + (home-page "https://github.com/rrthomas/vala-mode") + (synopsis "Vala mode for Emacs") + (description + "This package provides a major mode for editing .vala and .vapi files = in +Emacs. See @url{http://live.gnome.org/Vala} for details about Vala languag= e. + +This mode was based on Dylan Moonfire's @samp{csharp-mode}. +") + (license license:gpl2+))) diff --git a/gnu/packages/patches/vala-mode-fix.patch b/gnu/packages/patche= s/vala-mode-fix.patch new file mode 100644 index 0000000000..0a50b0e362 =2D-- /dev/null +++ b/gnu/packages/patches/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----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGSaToACgkQO7C8EjLY uCz1AAwAndlr8i6KRkCD+9CK4Vb5FFVhdnyj9t8kQN0NYtX+Ov8PPab7imAj1pRV NzBZ8Cfl6Az6n1bzpXb8cpaHL86JdRxXyejoBS7j9mGDMC6QAIbb8d5wb1o6AfnM kwPs8BHsgtq5i4XnTvlmkAaXiLKmXhGaAHM9FOr5roukDuyvQ2sXUBdcAISGabRR SLPVWjNMKqfgFcT1GhDNOQVyciHrxVzLVzKeGOJLrd8FmoaUfJm50SU496LMhPvC lUMrltGst9byt/RW7n4U0OXjs2wkM3CV+oW0zEywWWAlt9bS6ODxXWbgsy25q/xf XKy8HfaokU2DyPx/ox9dOURenYmwL9jdYpyupXCzP8QrCN1+J4Lks/+ZJTjgZSvA jZyZ+hyfIgZ4fr28K0l3bQJbG76sD770HHZQQK51xK/2mvai6ux/nhT5kpzGoIJh 1KxXJmS0fn6iFP7r0EtC5lpv+nx5RO3lmBnV6GGbsRGkYeDSlTgYd9Ka7B/FwiAM ntYTnMsg =Zxjf -----END PGP SIGNATURE----- --==-=-=--