From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 06:16:35 2022 Received: (at submit) by debbugs.gnu.org; 9 Aug 2022 10:16:35 +0000 Received: from localhost ([127.0.0.1]:42589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLMHr-00061t-0G for submit@debbugs.gnu.org; Tue, 09 Aug 2022 06:16:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:48202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLMHp-00061m-Pz for submit@debbugs.gnu.org; Tue, 09 Aug 2022 06:16:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLMHp-0005Vu-KI for guix-patches@gnu.org; Tue, 09 Aug 2022 06:16:33 -0400 Received: from 8.mo560.mail-out.ovh.net ([188.165.52.147]:34189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLMHm-0007rN-Ns for guix-patches@gnu.org; Tue, 09 Aug 2022 06:16:33 -0400 Received: from player691.ha.ovh.net (unknown [10.108.20.52]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 888E822737 for ; Tue, 9 Aug 2022 10:16:26 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player691.ha.ovh.net (Postfix) with ESMTPSA id B6ABD2D791813; Tue, 9 Aug 2022 10:16:23 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R0020417138e-5e39-4eab-8bc6-43c9ec09933e, 008677762490F2DED62ACCDC7B9F4AB59FB4598F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: guix-patches@gnu.org Subject: Tempel snippets Date: Tue, 09 Aug 2022 12:16:21 +0200 Message-ID: <87a68dpvre.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 3745306042393158369 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegtddgvdeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvvefufffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepudethfeugeehffetudeltedthefhheegkefgtddtueetudelkeeliedttddvfeehnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkpheptddrtddrtddrtddpvddufedrgeegrdduiedurdegjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepphhlrgihvghrieeluddrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitd Received-SPF: pass client-ip=188.165.52.147; envelope-from=ngraves@ngraves.fr; helo=8.mo560.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Nicolas Graves , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) The first patch of this series introduces the equivalent of current yasnippet templates, with the alternative package tempel. I eventually chose to make a new folder in snippets dir, and to move yasnippet files, hope it's OK. It works quite well for me now, but can be improved: - I selected completing-read for completion because I'm still learning emacs and didn't tackle completion-at-point for now. Would that be better? - Nested snippets don't seem to work that well (e.g. expanding git-fetch... within the edition of an origin... expansion), I had quite a few bugs. Seems better to finish the current snippet before tackling a sub-snippet (for now at least). - I couldn't match a small part of current yasnippet configuration, currently only the part in uri when url-fetch is chosen. Sent a "help/feature report" here https://github.com/minad/tempel/issues/65. If this is possible, we could probably further factorize and integrate the snippets logic, maybe to reach something like that for origin expansion. (origin... (let* ((method-list '(url-fetch url-fetch/tarbomb url-fetch/zipbomb cvs-fetch git-fetch hg-fetch svn-fetch bzr-fetch)) (uri (cl-case method ('git-fetch '("(git-reference" n> "(url " p ")" n> "(commit " p "))")) ('svn-fetch '("(svn-reference" n> "(url " p ")" n> "(revision " p "))")) ('hg-fetch '("(hg-reference" n> "(url " p ")" n> "(changeset " p "))")) ('cvs-fetch '("(cvs-reference" n> "(root-directory " p ")" n> "(module " p ")" n> "(revision " p "))")) ('bzr-fetch '("(bzr-reference" n> "(url " p ")" n> "(revision " p "))")) (t '("(string-append https://" p ".tar.gz)")))) (fname (cl-case method ('git-fetch '("(file-name (git-file-name name version))" n>)) ('svn-fetch '("(file-name (string-append name \"-\" version \"-checkout\"))" n>)) ('hg-fetch '("(file-name (hg-file-name name version))" n>)) ('cvs-fetch '("(file-name (string-append name \"-\" version \"-checkout\"))" n>)) ('bzr-fetch '("(file-name (string-append name \"-\" version \"-checkout\"))" n>)) (t '(""))))) "(origin" n> "(method \"" (p (completing-read "method:" method-list nil t)) "\")" n> "(uri " uri ")" n> fname "(sha256" n> "(base32 \"" p "\")))" n>)) The next patches are just new patches proposals, including :phases and licenses. Also note that there were 3 or 4 missing build-systems in the yasnippet template (might add them in a patch here). -- Best regards, Nicolas Graves From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 06:25:02 2022 Received: (at 57069) by debbugs.gnu.org; 9 Aug 2022 10:25:02 +0000 Received: from localhost ([127.0.0.1]:42594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLMQ1-0006FW-2j for submit@debbugs.gnu.org; Tue, 09 Aug 2022 06:25:01 -0400 Received: from 16.mo583.mail-out.ovh.net ([87.98.174.144]:54797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLMPy-0006FL-0H for 57069@debbugs.gnu.org; Tue, 09 Aug 2022 06:24:59 -0400 Received: from player739.ha.ovh.net (unknown [10.111.208.229]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 15E7B2414B for <57069@debbugs.gnu.org>; Tue, 9 Aug 2022 10:24:55 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player739.ha.ovh.net (Postfix) with ESMTPSA id 1B342295E6C66; Tue, 9 Aug 2022 10:24:52 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G006b9c6aacd-408c-4028-abda-0020e8b641c9, 008677762490F2DED62ACCDC7B9F4AB59FB4598F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: 57069@debbugs.gnu.org Subject: [PATCH 1/4] etc: Add tempel snippets. Date: Tue, 9 Aug 2022 12:24:37 +0200 Message-Id: <20220809102440.10570-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3888295331095175906 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 49 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegtddgvdekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgoufhushhpvggtthffohhmrghinhculdegledmnecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffudevjeeljeehheeiudetuddvueegveeiteejkefgueetffethfeiffehleelleenucffohhmrghinhepghhithhhuhgsrdhiohdpghhithhhuhgsrdgtohhmpdhmrghgihhtrdhvtgenucfkpheptddrtddrtddrtddpvddufedrgeegrdduiedurdegjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepphhlrgihvghrjeefledrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeehjedtieelseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeef X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * doc/contributing.texi: - adding configuration description for tempel snippets. - adapting yasnippet configuration to directory move. * etc/snippets/tempel/*.eld: adding alternative to current yasnippets. * etc/snippets*-mode: moved to /etc/snippets/yas/*-mode not to conflit with tempel snippets. --- doc/contributing.texi | 17 ++- etc/snippets/tempel/scheme-mode.eld | 112 ++++++++++++++++++ etc/snippets/tempel/text-mode.eld | 101 ++++++++++++++++ .../{ => yas}/scheme-mode/guix-bzr-reference | 0 .../{ => yas}/scheme-mode/guix-cvs-reference | 0 .../{ => yas}/scheme-mode/guix-git-reference | 0 .../{ => yas}/scheme-mode/guix-hg-reference | 0 .../{ => yas}/scheme-mode/guix-origin | 0 .../{ => yas}/scheme-mode/guix-package | 0 .../{ => yas}/scheme-mode/guix-svn-reference | 0 .../guix-commit-message-add-cl-package | 0 .../text-mode/guix-commit-message-add-package | 0 .../guix-commit-message-remove-package | 0 .../guix-commit-message-rename-package | 0 .../guix-commit-message-update-package | 0 .../guix-commit-message-use-https-home-page | 0 16 files changed, 225 insertions(+), 5 deletions(-) create mode 100644 etc/snippets/tempel/scheme-mode.eld create mode 100644 etc/snippets/tempel/text-mode.eld rename etc/snippets/{ => yas}/scheme-mode/guix-bzr-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-cvs-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-git-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-hg-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-origin (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-package (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-svn-reference (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-add-cl-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-add-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-remove-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-rename-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-update-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-use-https-home-page (100%) diff --git a/doc/contributing.texi b/doc/contributing.texi index 02c7c5ae59..808d71e40a 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -320,15 +320,22 @@ s-expression, etc. @cindex reducing boilerplate We also provide templates for common git commit messages and package definitions in the @file{etc/snippets} directory. These templates can -be used with @url{https://joaotavora.github.io/yasnippet/, YASnippet} to -expand short trigger strings to interactive text snippets. You may want -to add the snippets directory to the @var{yas-snippet-dirs} variable in -Emacs. +be used to expand short trigger strings to interactive text snippets, +with either @url{https://joaotavora.github.io/yasnippet/, YASnippet} or +@url{https://github.com/minad/tempel/, Tempel}. You may want to add the +@file{etc/snippets/yas} (respectively @file{etc/snippets/tempel/*.eld} +or selected files) snippets directory to the @var{yas-snippet-dirs} +(@var{tempel-path} resp.) variable in Emacs. @lisp ;; @r{Assuming the Guix checkout is in ~/src/guix.} +;; @r{Yasnippet} (with-eval-after-load 'yasnippet - (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets")) + (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets/yas")) +;;@r{Tempel} +(with-eval-after-load 'tempel + (add-to-list 'tempel-path + "~/src/guix/etc/snippets/tempel/*.eld")) @end lisp The commit message snippets depend on @url{https://magit.vc/, Magit} to diff --git a/etc/snippets/tempel/scheme-mode.eld b/etc/snippets/tempel/scheme-mode.eld new file mode 100644 index 0000000000..ac48a1038b --- /dev/null +++ b/etc/snippets/tempel/scheme-mode.eld @@ -0,0 +1,112 @@ +-*- mode: lisp-data -*- + +scheme-mode + +(package... + "(define-public " (s name) n> + "(package" n> + "(name \"" (s name) "\")" n> + "(version \"" p "\")" n> + "(source origin..." p ")" n> + "(build-system \"" + (p (completing-read "build-system:" + '("android-ndk-build-system" + "ant-build-system" + "asdf-build-system" + "cargo-build-system" + "chicken-build-system" + "clojure-build-system" + "cmake-build-system" + "copy-build-system" + "dub-build-system" + "dune-build-system" + "emacs-build-system" + "font-build-system" + "glib-or-gtk-build-system" + "gnu-build-system" + "go-build-system" + "guile-build-system" + "haskell-build-system" + "julia-build-system" + "linux-module-build-system" + "maven-build-system" + "meson-build-system" + "minetest-build-system" + "minify-build-system" + "node-build-system" + "ocaml-build-system" + "perl-build-system" + "python-build-system" + "qt-build-system" + "r-build-system" + "rakudo-build-system" + "rebar-build-system" + "renpy-build-system" + "ruby-build-system" + "scons-build-system" + "texlive-build-system" + "trivial-build-system" + "waf-build-system") + nil t)) "\")" n> + "(home-page \"" p "\")" n> + "(synopsis \"" p "\")" n> + "(description \"" p "\")" n> + "(license " p ")))" n) + +(origin... + "(origin" n> + "(method \"" + (p (completing-read "method:" + '("url-fetch" + "url-fetch/tarbomb" + "url-fetch/zipbomb" + "cvs-fetch" + "git-fetch" + "hg-fetch" + "svn-fetch" + "bzr-fetch") + nil t) method) "\")" n> + "(uri " (cl-case (intern method) + ('git-fetch "git-reference...") + ('svn-fetch "svn-reference...") + ('hg-fetch "hg-reference...") + ('cvs-fetch "cvs-reference...") + ('bzr-fetch "bzr-reference...") + (t "(string-append \"https://")) + p + (if (equal (substring method 0 9) "url-fetch") "\")") + ")" n> + (cl-case (intern method) + ('git-fetch "(file-name (git-file-name name version))\n") + ('hg-fetch "(file-name (hg-file-name name version))\n") + ('svn-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + ('cvs-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + ('bzr-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + (t "")) > + "(sha256" n> "(base32 \"" p "\")))") + +(git-reference... + "(git-reference" n> + "(url \"" p "\")" n> + "(commit \"" p "\"))") + +(svn-reference... + "(svn-reference" n> + "(url \"" p "\")" n> + "(revision \"" p "\"))") + +(cvs-reference... + "(cvs-reference" n> + "(root-directory \"" p "\")" n> + "(module \"" p "\")" n> + "(revision \"" p "\"))") + +(hg-reference... + "(hg-reference" n> + "(url \"" p "\")" n> + "(changeset \"" p "\"))") + +(bzr-reference... + "(bzr-reference" n> + "(url \"" p "\")" n> + "(revision \"" p "\"))") diff --git a/etc/snippets/tempel/text-mode.eld b/etc/snippets/tempel/text-mode.eld new file mode 100644 index 0000000000..a51a6719d7 --- /dev/null +++ b/etc/snippets/tempel/text-mode.eld @@ -0,0 +1,101 @@ +-*- mode: lisp-data -*- + +text-mode :when (git-commit-mode) + +(add + "gnu: Add " + (p + (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "\\+(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var ) "." n n + "* " (car (magit-staged-files)) " (" (s var ) "): New variable.") + +(remove + "gnu: Remove " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "\\-(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) "." n n + "* " (car (magit-staged-files)) " (" (s var) "): Delete variable.") + +(rename + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "-(define-public " nil 'noerror) + (thing-at-point 'sexp 'no-properties))) + prev-var) + ": Rename package to " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "+(define-public " nil 'noerror) + (thing-at-point 'sexp 'no-properties))) + new-var) "." n n + "* " (car (magit-staged-files)) " (" (s prev-var) "): Define in terms of" n + "'deprecated-package'." n + "(" (s new-var) "): New variable, formerly known as \"" (s prev-var) "\".") + +(update + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "^[ ]*(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) + ": Update to " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (search-forward "name" nil 'noerror) + (search-forward "+" nil 'noerror) ; first change + (when (and (search-forward "version " nil 'noerror) + (looking-at-p "\"")) + (let ((end (save-excursion (search-forward "\")" nil 'noerror)))) + (when end + (forward-char) + (buffer-substring-no-properties (point) (- end 2)))))) + version) "." n n + "* " (car (magit-staged-files)) " (" (s var) "): Update to " (s version) "." + (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files))) n) + +(addcl + "gnu: Add cl-" + (p (replace-regexp-in-string + "^cl-" "" (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "+(define-public " nil 'noerror) + (replace-regexp-in-string + "^sbcl-" "" + (thing-at-point 'sexp 'no-properties))))) + var) "." n n + "* " (car (magit-staged-files)) + " (cl-" (s var) ", ecl-" (s var) ", sbcl-" (s var) "): New variables.") + +(https + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "^[ ]*(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) + ": Use HTTPS home page." n n + "* " (car (magit-staged-files)) " (" (s var) ")[home-page]: Use HTTPS." n + (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files))) n) diff --git a/etc/snippets/scheme-mode/guix-bzr-reference b/etc/snippets/yas/scheme-mode/guix-bzr-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-bzr-reference rename to etc/snippets/yas/scheme-mode/guix-bzr-reference diff --git a/etc/snippets/scheme-mode/guix-cvs-reference b/etc/snippets/yas/scheme-mode/guix-cvs-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-cvs-reference rename to etc/snippets/yas/scheme-mode/guix-cvs-reference diff --git a/etc/snippets/scheme-mode/guix-git-reference b/etc/snippets/yas/scheme-mode/guix-git-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-git-reference rename to etc/snippets/yas/scheme-mode/guix-git-reference diff --git a/etc/snippets/scheme-mode/guix-hg-reference b/etc/snippets/yas/scheme-mode/guix-hg-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-hg-reference rename to etc/snippets/yas/scheme-mode/guix-hg-reference diff --git a/etc/snippets/scheme-mode/guix-origin b/etc/snippets/yas/scheme-mode/guix-origin similarity index 100% rename from etc/snippets/scheme-mode/guix-origin rename to etc/snippets/yas/scheme-mode/guix-origin diff --git a/etc/snippets/scheme-mode/guix-package b/etc/snippets/yas/scheme-mode/guix-package similarity index 100% rename from etc/snippets/scheme-mode/guix-package rename to etc/snippets/yas/scheme-mode/guix-package diff --git a/etc/snippets/scheme-mode/guix-svn-reference b/etc/snippets/yas/scheme-mode/guix-svn-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-svn-reference rename to etc/snippets/yas/scheme-mode/guix-svn-reference diff --git a/etc/snippets/text-mode/guix-commit-message-add-cl-package b/etc/snippets/yas/text-mode/guix-commit-message-add-cl-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-add-cl-package rename to etc/snippets/yas/text-mode/guix-commit-message-add-cl-package diff --git a/etc/snippets/text-mode/guix-commit-message-add-package b/etc/snippets/yas/text-mode/guix-commit-message-add-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-add-package rename to etc/snippets/yas/text-mode/guix-commit-message-add-package diff --git a/etc/snippets/text-mode/guix-commit-message-remove-package b/etc/snippets/yas/text-mode/guix-commit-message-remove-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-remove-package rename to etc/snippets/yas/text-mode/guix-commit-message-remove-package diff --git a/etc/snippets/text-mode/guix-commit-message-rename-package b/etc/snippets/yas/text-mode/guix-commit-message-rename-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-rename-package rename to etc/snippets/yas/text-mode/guix-commit-message-rename-package diff --git a/etc/snippets/text-mode/guix-commit-message-update-package b/etc/snippets/yas/text-mode/guix-commit-message-update-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-update-package rename to etc/snippets/yas/text-mode/guix-commit-message-update-package diff --git a/etc/snippets/text-mode/guix-commit-message-use-https-home-page b/etc/snippets/yas/text-mode/guix-commit-message-use-https-home-page similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-use-https-home-page rename to etc/snippets/yas/text-mode/guix-commit-message-use-https-home-page -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 06:25:04 2022 Received: (at 57069) by debbugs.gnu.org; 9 Aug 2022 10:25:04 +0000 Received: from localhost ([127.0.0.1]:42598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLMQ4-0006H3-21 for submit@debbugs.gnu.org; Tue, 09 Aug 2022 06:25:04 -0400 Received: from 7.mo575.mail-out.ovh.net ([46.105.63.230]:51971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLMQ2-0006FV-2C for 57069@debbugs.gnu.org; Tue, 09 Aug 2022 06:25:03 -0400 Received: from player168.ha.ovh.net (unknown [10.111.208.246]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 1BBD224512 for <57069@debbugs.gnu.org>; Tue, 9 Aug 2022 10:24:59 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player168.ha.ovh.net (Postfix) with ESMTPSA id 317B02D615FC7; Tue, 9 Aug 2022 10:24:57 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-104R0054638dd11-c867-4b72-b9f5-34b586cf7b5f, 008677762490F2DED62ACCDC7B9F4AB59FB4598F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: 57069@debbugs.gnu.org Subject: [PATCH 2/4] etc: Add tempel snippet for :phases. Date: Tue, 9 Aug 2022 12:24:38 +0200 Message-Id: <20220809102440.10570-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220809102440.10570-1-ngraves@ngraves.fr> References: <20220809102440.10570-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3889702707093431010 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegtddgvdekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhduieekrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheejtdeileesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhe X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- etc/snippets/tempel/scheme-mode.eld | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/etc/snippets/tempel/scheme-mode.eld b/etc/snippets/tempel/scheme-mode.eld index ac48a1038b..eb209d599a 100644 --- a/etc/snippets/tempel/scheme-mode.eld +++ b/etc/snippets/tempel/scheme-mode.eld @@ -110,3 +110,13 @@ scheme-mode "(bzr-reference" n> "(url \"" p "\")" n> "(revision \"" p "\"))") + +(:phases + ":phases (modify-phases %standard-phases" n> + "(" (p (completing-read "modify:" + '("add-before" + "replace" + "add-after" + "delete ") + nil t)) + " '" q "))" ) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 06:25:08 2022 Received: (at 57069) by debbugs.gnu.org; 9 Aug 2022 10:25:09 +0000 Received: from localhost ([127.0.0.1]:42601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLMQ8-0006Ie-G4 for submit@debbugs.gnu.org; Tue, 09 Aug 2022 06:25:08 -0400 Received: from 1.mo581.mail-out.ovh.net ([178.33.45.51]:43765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLMQ5-0006H4-Mg for 57069@debbugs.gnu.org; Tue, 09 Aug 2022 06:25:06 -0400 Received: from player157.ha.ovh.net (unknown [10.111.172.70]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 80A3A23B79 for <57069@debbugs.gnu.org>; Tue, 9 Aug 2022 10:25:03 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player157.ha.ovh.net (Postfix) with ESMTPSA id 7F9D42D6B541A; Tue, 9 Aug 2022 10:25:01 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G0062c98302e-546a-4b17-8404-d55807ed8469, 008677762490F2DED62ACCDC7B9F4AB59FB4598F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: 57069@debbugs.gnu.org Subject: [PATCH 3/4] etc: Add tempel snippet for license:. Date: Tue, 9 Aug 2022 12:24:39 +0200 Message-Id: <20220809102440.10570-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220809102440.10570-1-ngraves@ngraves.fr> References: <20220809102440.10570-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3890828606152041186 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegtddgvdekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhduheejrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheejtdeileesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekud X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- etc/snippets/tempel/scheme-mode.eld | 117 ++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/etc/snippets/tempel/scheme-mode.eld b/etc/snippets/tempel/scheme-mode.eld index eb209d599a..d9904ea7da 100644 --- a/etc/snippets/tempel/scheme-mode.eld +++ b/etc/snippets/tempel/scheme-mode.eld @@ -120,3 +120,120 @@ scheme-mode "delete ") nil t)) " '" q "))" ) + +(license: + "license:" + (p (completing-read "license:" + '("agpl1" + "agpl3" + "agpl3+" + "apsl2" + "asl1.1" + "asl2.0" + "boost1.0" + "bsd-0" + "bsd-1" + "bsd-2" + "bsd-3" + "bsd-4" + "non-copyleft" + "cc0" + "cc-by-sa4.0" + "cc-by-sa3.0" + "cc-by-sa2.0" + "cc-by4.0" + "cc-by3.0" + "cc-by2.0" + "cddl1.0" + "cddl1.1" + "cecill" + "cecill-b" + "cecill-c" + "artistic2.0" + "clarified-artistic" + "copyleft-next" + "cpl1.0" + "cua-opl1.0" + "edl1.0" + "epl1.0" + "epl2.0" + "eupl1.2" + "expat" + "expat-0" + "freetype" + "giftware" + "gpl1" + "gpl1+" + "gpl2" + "gpl2+" + "gpl3" + "gpl3+" + "gfl1.0" + "fdl1.1+" + "fdl1.2+" + "fdl1.3+" + "freebsd-doc" + "opl1.0+" + "osl2.1" + "isc" + "ijg" + "ibmpl1.0" + "imlib2" + "ipa" + "knuth" + "lal1.3" + "lgpl2.0" + "lgpl2.0+" + "lgpl2.1" + "lgpl2.1+" + "lgpl3" + "lgpl3+" + "llgpl" + "lppl" + "lppl1.0+" + "lppl1.1+" + "lppl1.2" + "lppl1.2+" + "lppl1.3" + "lppl1.3+" + "lppl1.3a" + "lppl1.3a+" + "lppl1.3b" + "lppl1.3b+" + "lppl1.3c" + "lppl1.3c+" + "miros" + "mpl1.0" + "mpl1.1" + "mpl2.0" + "ms-pl" + "ncsa" + "nmap" + "ogl-psi1.0" + "openssl" + "openldap2.8" + "perl-license" + "psfl" + "public-domain" + "qpl" + "qwt1.0" + "repoze" + "ruby" + "sgifreeb2.0" + "silofl1.1" + "sleepycat" + "tcl/tk" + "vim" + "unicode" + "unlicense" + "w3c" + "wtfpl2" + "wxwindows3.1+" + "x11" + "x11-style" + "zpl2.1" + "zlib" + "hpnd" + "fsf-free" + "fsdg-compatible") + nil t))) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 06:25:16 2022 Received: (at 57069) by debbugs.gnu.org; 9 Aug 2022 10:25:17 +0000 Received: from localhost ([127.0.0.1]:42606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLMQG-0006P9-Km for submit@debbugs.gnu.org; Tue, 09 Aug 2022 06:25:16 -0400 Received: from 11.mo550.mail-out.ovh.net ([188.165.48.29]:59173) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLMQ8-0006HL-Lo for 57069@debbugs.gnu.org; Tue, 09 Aug 2022 06:25:14 -0400 Received: from player773.ha.ovh.net (unknown [10.111.208.97]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id EAB7A22752 for <57069@debbugs.gnu.org>; Tue, 9 Aug 2022 10:25:06 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player773.ha.ovh.net (Postfix) with ESMTPSA id 2B6202D789538; Tue, 9 Aug 2022 10:25:05 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-107S00156ce0f89-ddd6-48ca-9f7b-15622ca07679, 008677762490F2DED62ACCDC7B9F4AB59FB4598F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: 57069@debbugs.gnu.org Subject: [PATCH 4/4] etc: Update guix-package yasnippet build-system list. Date: Tue, 9 Aug 2022 12:24:40 +0200 Message-Id: <20220809102440.10570-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220809102440.10570-1-ngraves@ngraves.fr> References: <20220809102440.10570-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3891673031789568738 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegtddgvdekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejjeefrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheejtdeileesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtd X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- etc/snippets/yas/scheme-mode/guix-package | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/snippets/yas/scheme-mode/guix-package b/etc/snippets/yas/scheme-mode/guix-package index 9ff6f997d1..724a392f81 100644 --- a/etc/snippets/yas/scheme-mode/guix-package +++ b/etc/snippets/yas/scheme-mode/guix-package @@ -11,6 +11,7 @@ "ant-build-system" "asdf-build-system" "cargo-build-system" + "chicken-build-system" "clojure-build-system" "cmake-build-system" "copy-build-system" @@ -27,6 +28,7 @@ "linux-module-build-system" "maven-build-system" "meson-build-system" + "minetest-build-system" "minify-build-system" "node-build-system" "ocaml-build-system" @@ -35,6 +37,8 @@ "qt-build-system" "r-build-system" "rakudo-build-system" + "rebar-build-system" + "renpy-build-system" "ruby-build-system" "scons-build-system" "texlive-build-system" -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 09 12:52:55 2022 Received: (at 57069) by debbugs.gnu.org; 9 Aug 2022 16:52:55 +0000 Received: from localhost ([127.0.0.1]:44653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLSTL-0002CW-5D for submit@debbugs.gnu.org; Tue, 09 Aug 2022 12:52:55 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:34657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLST4-0002C0-Py for 57069@debbugs.gnu.org; Tue, 09 Aug 2022 12:52:49 -0400 Received: by mail-ej1-f65.google.com with SMTP id tl27so23284550ejc.1 for <57069@debbugs.gnu.org>; Tue, 09 Aug 2022 09:52:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=4hTKBMQFI+AlIG677boDEoJ+1Bmx3ziif0ByCyFNqp0=; b=PAhx0YVIxWGPifx4WNpcBMqH+h1OMm137IGPEhHSfU4pRMn6/2ucKAh/RQfBVL1yx6 9fCOinx8n9TsbjINBYBuBp5Wa4zuHsjSBIiRxMM8VF8nIzteXHY3wt1GPtheQb0q5IwQ mU/OqvpwjsZ3SA5nKLU6/lxHHvVJjeCedCPLm6FQIjiSmaxd6inCJFxJ20ia8BPWMHP2 87WDZgllSOCML9LxNDctGN47zvTKRq1hoAqqGnoMoJVFhFo0+3K9R7hdFRAGeIgcYMlx p+n3e8jwm8vBsO2mjwFJdbsYXOmdclH6PHWwlMsgehgs9tswPa+ad9z/zY0eLFNctJ2e BO9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=4hTKBMQFI+AlIG677boDEoJ+1Bmx3ziif0ByCyFNqp0=; b=uZw6OmKB+JipxCvmt0AWfIRDV9kfb9xlyZLDVa4BHFUx5oeJfIbZF2Tf8A4BzcauiX hAPSfOm7mfDV9cg7mav6wkD/nL42OjSHdJt1i7awTDpO7ec6BWpq95IzbiLGdD0bi/fk SY9APN7CGAFJDydS2JtHQ3Uj0p3gPNdnxJIgh2xsCthSqzZCYpLX5cuUf7YRLZ8JFssa f95Ec80pvJtqBpUcXDQglKEuMXAK98qFpu1qggea5a93YmZUuqiE+YdzcMgxTdnC7Xf1 /9VsabJkNP80BdaAQNsVXqO8XX6UYTB3z/z2/I8DpEIbEAwKruBAZfd66v5/UX1lKOVd dH0g== X-Gm-Message-State: ACgBeo2IWSU9O0ag/tS8j4P5lutuDuHfPMsDnjf3StctWESckT/P6a1e L8MMkB+zHsKbZ6/afwW/lFM= X-Google-Smtp-Source: AA6agR46tthabYzLBWZJnjzNHWuIitDFvpfGHsHhFjZltOF5km2VAKGE7c6G8j824hp3bTa5nZ0AaA== X-Received: by 2002:a17:906:d7a9:b0:731:2189:4f58 with SMTP id pk9-20020a170906d7a900b0073121894f58mr11729784ejb.471.1660063948765; Tue, 09 Aug 2022 09:52:28 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id eq20-20020a056402299400b0043cc2c9f5adsm6186801edb.40.2022.08.09.09.52.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 09:52:28 -0700 (PDT) Message-ID: <3582f9ef0c1fcc30719dd1479812354169d14277.camel@gmail.com> Subject: Re: Tempel snippets From: Liliana Marie Prikler To: Nicolas Graves , 57069@debbugs.gnu.org Date: Tue, 09 Aug 2022 18:52:27 +0200 In-Reply-To: <87a68dpvre.fsf@ngraves.fr> References: <87a68dpvre.fsf@ngraves.fr> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 09.08.2022 um 12:16 +0200 schrieb Nicolas Graves: > > The first patch of this series introduces the equivalent of current > yasnippet templates, with the alternative package tempel. > > I eventually chose to make a new folder in snippets dir, and to move > yasnippet files, hope it's OK. > > It works quite well for me now, but can be improved: > > - I selected completing-read for completion because I'm still > learning >   emacs and didn't tackle completion-at-point for now. Would that be >   better? Don't. Use the (s ) field of tempel. If you have corfu with capf, you should be able to expand them. For build-system you might want to add "-build-system" at the end, so that the user only has to type "gnu", "maven", etc. Less fancy than the yas one, but probably just as good. > - Nested snippets don't seem to work that well (e.g. expanding >   git-fetch... within the edition of an origin... expansion), I had >   quite a few bugs. Seems better to finish the current snippet before >   tackling a sub-snippet (for now at least). Probably a tempel limitation. I think it works to M-RET and then expand at point (using corfu or a tempel binding). Just printing out the unexpanded string should be enough for that. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 11 02:08:19 2022 Received: (at 57069) by debbugs.gnu.org; 11 Aug 2022 06:08:19 +0000 Received: from localhost ([127.0.0.1]:51188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM1Mg-0004ZK-Qr for submit@debbugs.gnu.org; Thu, 11 Aug 2022 02:08:19 -0400 Received: from 5.mo575.mail-out.ovh.net ([46.105.62.179]:44519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM1Md-0004Z9-Tk for 57069@debbugs.gnu.org; Thu, 11 Aug 2022 02:08:17 -0400 Received: from player759.ha.ovh.net (unknown [10.108.16.216]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id D2334234B9 for <57069@debbugs.gnu.org>; Thu, 11 Aug 2022 06:08:13 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player759.ha.ovh.net (Postfix) with ESMTPSA id F08C72D79E2AB; Thu, 11 Aug 2022 06:08:10 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-102R004fbd6c660-c34d-40cd-82f2-48647e5acc49, C23DEB4C4233A3DF9626E2F59CB7FD1D65C1FBBF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: 57069@debbugs.gnu.org Subject: [PATCH v2] etc: Add tempel snippets. Date: Thu, 11 Aug 2022 08:07:45 +0200 Message-Id: <20220811060745.6892-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 11298405568794190562 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 49 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegfedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecuogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepffduveejleejheehieduteduvdeugeevieetjeekgfeutefftefhieffheelleelnecuffhomhgrihhnpehgihhthhhusgdrihhopdhgihhthhhusgdrtghomhdpmhgrghhithdrvhgtnecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejheelrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheejtdeileesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhe X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 57069 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * doc/contributing.texi: - adding configuration description for tempel snippets. - adapting yasnippet configuration to directory move. * etc/snippets/tempel/*.eld: adding alternative to current yasnippets. * etc/snippets*-mode: moved to /etc/snippets/yas/*-mode not to conflit with tempel snippets. --- doc/contributing.texi | 17 ++- etc/snippets/tempel/scheme-mode.eld | 113 ++++++++++++++++++ etc/snippets/tempel/text-mode.eld | 101 ++++++++++++++++ .../{ => yas}/scheme-mode/guix-bzr-reference | 0 .../{ => yas}/scheme-mode/guix-cvs-reference | 0 .../{ => yas}/scheme-mode/guix-git-reference | 0 .../{ => yas}/scheme-mode/guix-hg-reference | 0 .../{ => yas}/scheme-mode/guix-origin | 0 .../{ => yas}/scheme-mode/guix-package | 0 .../{ => yas}/scheme-mode/guix-svn-reference | 0 .../guix-commit-message-add-cl-package | 0 .../text-mode/guix-commit-message-add-package | 0 .../guix-commit-message-remove-package | 0 .../guix-commit-message-rename-package | 0 .../guix-commit-message-update-package | 0 .../guix-commit-message-use-https-home-page | 0 16 files changed, 226 insertions(+), 5 deletions(-) create mode 100644 etc/snippets/tempel/scheme-mode.eld create mode 100644 etc/snippets/tempel/text-mode.eld rename etc/snippets/{ => yas}/scheme-mode/guix-bzr-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-cvs-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-git-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-hg-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-origin (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-package (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-svn-reference (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-add-cl-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-add-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-remove-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-rename-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-update-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-use-https-home-page (100%) diff --git a/doc/contributing.texi b/doc/contributing.texi index 02c7c5ae59..808d71e40a 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -320,15 +320,22 @@ s-expression, etc. @cindex reducing boilerplate We also provide templates for common git commit messages and package definitions in the @file{etc/snippets} directory. These templates can -be used with @url{https://joaotavora.github.io/yasnippet/, YASnippet} to -expand short trigger strings to interactive text snippets. You may want -to add the snippets directory to the @var{yas-snippet-dirs} variable in -Emacs. +be used to expand short trigger strings to interactive text snippets, +with either @url{https://joaotavora.github.io/yasnippet/, YASnippet} or +@url{https://github.com/minad/tempel/, Tempel}. You may want to add the +@file{etc/snippets/yas} (respectively @file{etc/snippets/tempel/*.eld} +or selected files) snippets directory to the @var{yas-snippet-dirs} +(@var{tempel-path} resp.) variable in Emacs. @lisp ;; @r{Assuming the Guix checkout is in ~/src/guix.} +;; @r{Yasnippet} (with-eval-after-load 'yasnippet - (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets")) + (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets/yas")) +;;@r{Tempel} +(with-eval-after-load 'tempel + (add-to-list 'tempel-path + "~/src/guix/etc/snippets/tempel/*.eld")) @end lisp The commit message snippets depend on @url{https://magit.vc/, Magit} to diff --git a/etc/snippets/tempel/scheme-mode.eld b/etc/snippets/tempel/scheme-mode.eld new file mode 100644 index 0000000000..5fcd7030b8 --- /dev/null +++ b/etc/snippets/tempel/scheme-mode.eld @@ -0,0 +1,113 @@ +-*- mode: lisp-data -*- + +scheme-mode + +(package... + "(define-public " (s name) n> + "(package" n> + "(name \"" (s name) "\")" n> + "(version \"" p "\")" n> + "(source origin..." p ")" n> + "(build-system \"" + (p (completing-read "build-system:" + '("android-ndk" + "ant" + "asdf" + "cargo" + "chicken" + "clojure" + "cmake" + "copy" + "dub" + "dune" + "emacs" + "font" + "glib-or-gtk" + "gnu" + "go" + "guile" + "haskell" + "julia" + "linux-module" + "maven" + "meson" + "minetest" + "minify" + "node" + "ocaml" + "perl" + "python" + "qt" + "r" + "rakudo" + "rebar" + "renpy" + "ruby" + "scons" + "texlive" + "trivial" + "waf") + nil t) "-build-system") + "\")" n> + "(home-page \"" p "\")" n> + "(synopsis \"" p "\")" n> + "(description \"" p "\")" n> + "(license " p ")))" n) + +(origin... + "(origin" n> + "(method \"" + (p (completing-read "method:" + '("url-fetch" + "url-fetch/tarbomb" + "url-fetch/zipbomb" + "cvs-fetch" + "git-fetch" + "hg-fetch" + "svn-fetch" + "bzr-fetch") + nil t) method) "\")" n> + "(uri " (cl-case (intern method) + ('git-fetch "git-reference...") + ('svn-fetch "svn-reference...") + ('hg-fetch "hg-reference...") + ('cvs-fetch "cvs-reference...") + ('bzr-fetch "bzr-reference...") + (t "(string-append \"https://")) + p + (if (equal (substring method 0 9) "url-fetch") "\")") + ")" n> + (cl-case (intern method) + ('git-fetch "(file-name (git-file-name name version))\n") + ('hg-fetch "(file-name (hg-file-name name version))\n") + ('svn-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + ('cvs-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + ('bzr-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + (t "")) > + "(sha256" n> "(base32 \"" p "\")))") + +(git-reference... + "(git-reference" n> + "(url \"" p "\")" n> + "(commit \"" p "\"))") + +(svn-reference... + "(svn-reference" n> + "(url \"" p "\")" n> + "(revision \"" p "\"))") + +(cvs-reference... + "(cvs-reference" n> + "(root-directory \"" p "\")" n> + "(module \"" p "\")" n> + "(revision \"" p "\"))") + +(hg-reference... + "(hg-reference" n> + "(url \"" p "\")" n> + "(changeset \"" p "\"))") + +(bzr-reference... + "(bzr-reference" n> + "(url \"" p "\")" n> + "(revision \"" p "\"))") diff --git a/etc/snippets/tempel/text-mode.eld b/etc/snippets/tempel/text-mode.eld new file mode 100644 index 0000000000..a51a6719d7 --- /dev/null +++ b/etc/snippets/tempel/text-mode.eld @@ -0,0 +1,101 @@ +-*- mode: lisp-data -*- + +text-mode :when (git-commit-mode) + +(add + "gnu: Add " + (p + (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "\\+(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var ) "." n n + "* " (car (magit-staged-files)) " (" (s var ) "): New variable.") + +(remove + "gnu: Remove " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "\\-(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) "." n n + "* " (car (magit-staged-files)) " (" (s var) "): Delete variable.") + +(rename + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "-(define-public " nil 'noerror) + (thing-at-point 'sexp 'no-properties))) + prev-var) + ": Rename package to " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "+(define-public " nil 'noerror) + (thing-at-point 'sexp 'no-properties))) + new-var) "." n n + "* " (car (magit-staged-files)) " (" (s prev-var) "): Define in terms of" n + "'deprecated-package'." n + "(" (s new-var) "): New variable, formerly known as \"" (s prev-var) "\".") + +(update + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "^[ ]*(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) + ": Update to " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (search-forward "name" nil 'noerror) + (search-forward "+" nil 'noerror) ; first change + (when (and (search-forward "version " nil 'noerror) + (looking-at-p "\"")) + (let ((end (save-excursion (search-forward "\")" nil 'noerror)))) + (when end + (forward-char) + (buffer-substring-no-properties (point) (- end 2)))))) + version) "." n n + "* " (car (magit-staged-files)) " (" (s var) "): Update to " (s version) "." + (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files))) n) + +(addcl + "gnu: Add cl-" + (p (replace-regexp-in-string + "^cl-" "" (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "+(define-public " nil 'noerror) + (replace-regexp-in-string + "^sbcl-" "" + (thing-at-point 'sexp 'no-properties))))) + var) "." n n + "* " (car (magit-staged-files)) + " (cl-" (s var) ", ecl-" (s var) ", sbcl-" (s var) "): New variables.") + +(https + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "^[ ]*(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) + ": Use HTTPS home page." n n + "* " (car (magit-staged-files)) " (" (s var) ")[home-page]: Use HTTPS." n + (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files))) n) diff --git a/etc/snippets/scheme-mode/guix-bzr-reference b/etc/snippets/yas/scheme-mode/guix-bzr-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-bzr-reference rename to etc/snippets/yas/scheme-mode/guix-bzr-reference diff --git a/etc/snippets/scheme-mode/guix-cvs-reference b/etc/snippets/yas/scheme-mode/guix-cvs-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-cvs-reference rename to etc/snippets/yas/scheme-mode/guix-cvs-reference diff --git a/etc/snippets/scheme-mode/guix-git-reference b/etc/snippets/yas/scheme-mode/guix-git-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-git-reference rename to etc/snippets/yas/scheme-mode/guix-git-reference diff --git a/etc/snippets/scheme-mode/guix-hg-reference b/etc/snippets/yas/scheme-mode/guix-hg-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-hg-reference rename to etc/snippets/yas/scheme-mode/guix-hg-reference diff --git a/etc/snippets/scheme-mode/guix-origin b/etc/snippets/yas/scheme-mode/guix-origin similarity index 100% rename from etc/snippets/scheme-mode/guix-origin rename to etc/snippets/yas/scheme-mode/guix-origin diff --git a/etc/snippets/scheme-mode/guix-package b/etc/snippets/yas/scheme-mode/guix-package similarity index 100% rename from etc/snippets/scheme-mode/guix-package rename to etc/snippets/yas/scheme-mode/guix-package diff --git a/etc/snippets/scheme-mode/guix-svn-reference b/etc/snippets/yas/scheme-mode/guix-svn-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-svn-reference rename to etc/snippets/yas/scheme-mode/guix-svn-reference diff --git a/etc/snippets/text-mode/guix-commit-message-add-cl-package b/etc/snippets/yas/text-mode/guix-commit-message-add-cl-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-add-cl-package rename to etc/snippets/yas/text-mode/guix-commit-message-add-cl-package diff --git a/etc/snippets/text-mode/guix-commit-message-add-package b/etc/snippets/yas/text-mode/guix-commit-message-add-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-add-package rename to etc/snippets/yas/text-mode/guix-commit-message-add-package diff --git a/etc/snippets/text-mode/guix-commit-message-remove-package b/etc/snippets/yas/text-mode/guix-commit-message-remove-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-remove-package rename to etc/snippets/yas/text-mode/guix-commit-message-remove-package diff --git a/etc/snippets/text-mode/guix-commit-message-rename-package b/etc/snippets/yas/text-mode/guix-commit-message-rename-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-rename-package rename to etc/snippets/yas/text-mode/guix-commit-message-rename-package diff --git a/etc/snippets/text-mode/guix-commit-message-update-package b/etc/snippets/yas/text-mode/guix-commit-message-update-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-update-package rename to etc/snippets/yas/text-mode/guix-commit-message-update-package diff --git a/etc/snippets/text-mode/guix-commit-message-use-https-home-page b/etc/snippets/yas/text-mode/guix-commit-message-use-https-home-page similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-use-https-home-page rename to etc/snippets/yas/text-mode/guix-commit-message-use-https-home-page -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 11 02:17:35 2022 Received: (at 57069) by debbugs.gnu.org; 11 Aug 2022 06:17:35 +0000 Received: from localhost ([127.0.0.1]:51212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM1Vf-0004o5-HX for submit@debbugs.gnu.org; Thu, 11 Aug 2022 02:17:35 -0400 Received: from 9.mo550.mail-out.ovh.net ([178.32.108.172]:53113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM1Vd-0004nm-0V for 57069@debbugs.gnu.org; Thu, 11 Aug 2022 02:17:34 -0400 Received: from player711.ha.ovh.net (unknown [10.111.208.229]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 68C0E2396F for <57069@debbugs.gnu.org>; Thu, 11 Aug 2022 06:17:30 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player711.ha.ovh.net (Postfix) with ESMTPSA id 0B4D02D44D43A; Thu, 11 Aug 2022 06:17:26 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S0038f16858b-80b3-4289-8691-10ac9263e116, C23DEB4C4233A3DF9626E2F59CB7FD1D65C1FBBF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: Liliana Marie Prikler , 57069@debbugs.gnu.org Subject: Re: Tempel snippets In-Reply-To: <3582f9ef0c1fcc30719dd1479812354169d14277.camel@gmail.com> References: <87a68dpvre.fsf@ngraves.fr> <3582f9ef0c1fcc30719dd1479812354169d14277.camel@gmail.com> Date: Thu, 11 Aug 2022 08:17:25 +0200 Message-ID: <87tu6j5moa.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 11455187128464040539 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegfedguddtkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpefhgedtjeevtedvgeelieeugfetvedtleeigeeuhfdvjeetjeejffeuvdeiffdtffenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejuddurdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheejtdeileesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtd X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 Cc: Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > - I couldn't match a small part of current yasnippet configuration, > currently only the part in uri when url-fetch is chosen. Sent > a "help/feature report" here https://github.com/minad/tempel/issues/65. > > If this is possible, we could probably further factorize and integrate the > snippets logic, maybe to reach something like that for origin > expansion. Daniel Mendler confirmed that recursive templates were not supported, hence I cannot further improve snippets. I've sent an updated patch with "-build-system" added only once at the end. Waiting for them to be adopted ;) PS : it would be great to add a "snippets" output to the guix package, so that one can use (file-append guix:snippets "/tempel/") to include them in a guix home configuration. -- Best regards, Nicolas Graves From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 11 11:53:46 2022 Received: (at 57069) by debbugs.gnu.org; 11 Aug 2022 15:53:46 +0000 Received: from localhost ([127.0.0.1]:54837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMAVG-00024H-99 for submit@debbugs.gnu.org; Thu, 11 Aug 2022 11:53:46 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:38560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMAVE-000240-VZ for 57069@debbugs.gnu.org; Thu, 11 Aug 2022 11:53:45 -0400 Received: by mail-ej1-f67.google.com with SMTP id k26so34267524ejx.5 for <57069@debbugs.gnu.org>; Thu, 11 Aug 2022 08:53:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc; bh=YIlSluE14gNOkLbNgwrbNGY1JJ4t5PHbexTBoFCorCQ=; b=DP3uNgAMXXykjVjIdN4EqwrYbjyv8ARB1sQY+mKWeoQshIeI5/cOjBJ7WDQ8bINoOo KFUXGIOjwzBDWTb88eZUxWTjTovuiXZXdatQvKJcNVNDAHWGhfIG6ARL/lZrUHirJZ8/ 9otReEFNQTuWEVtlwB2vG/pNe7SWP+HX/1kvLIbIzqOnpMF5pwHpM/+qULeRMg6NmiuZ ONO7x9Ijr0oKEJipbe5gDZ9lLbpx67iLd3zWm67I/c9uZkeqLdluZ2PxPTM5Ug8ekqSc I1WmUxPa6DtoxXFECPH1zFGoJlLRzOpDli4gKruFfVtIcht7L47nPbq13o2LJpEse58e y+nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc; bh=YIlSluE14gNOkLbNgwrbNGY1JJ4t5PHbexTBoFCorCQ=; b=U34dHScDzWgb9oPvKcjT37AMAoR2aVGym5eOdr1wtnQNcRbiSMiJPfIrG1vqRrkG3d 5eSeZtW2hJEVpwIG02pTs6roSrxCjXyvvjKfXbowi9w+ZEfxYbq5yhtIzv7aSJpRNVqb 4RU/JC6xfcmQGiPg3EgeNTTPK0CtK1Zk3lQQ4oUk39VktU4rlr9DVEJmcvqMJzDy1K5C qav3IApzCMIsklrfivNh1+EJBceeDP7ENBrwiPLaWw8MB6EY9ZdKg4G7HBRIy8srn+wL PEeX48KBRu8ltf0X1mFEWBrmfBB8EFUMw8jTWHQPbop1RDMJnkfX2v8b7pJz2L9TjC9G CStg== X-Gm-Message-State: ACgBeo1jRRUIkWCeGb6uPPb1pEYqYDxImF4rNJbQiuWMxkQWPAhAYl73 mHarVH8a7Jr5dZablr0T8A4= X-Google-Smtp-Source: AA6agR6Sq7nV5GuOAvxJ6vqiuCyDABDMIJ2HciVkcm8lkTToow57WapItvt45ntGeboKlWSH30UJ5w== X-Received: by 2002:a17:906:9b0a:b0:730:d37b:4712 with SMTP id eo10-20020a1709069b0a00b00730d37b4712mr22845011ejc.537.1660233219067; Thu, 11 Aug 2022 08:53:39 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id k4-20020a17090632c400b0072ed72072aesm3595787ejk.192.2022.08.11.08.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 08:53:38 -0700 (PDT) Message-ID: <39edb2a4b03ca1a052120fcebd5919350d65a779.camel@gmail.com> Subject: Re: Tempel snippets From: Liliana Marie Prikler To: Nicolas Graves , 57069@debbugs.gnu.org Date: Thu, 11 Aug 2022 17:53:37 +0200 In-Reply-To: <87tu6j5moa.fsf@ngraves.fr> References: <87a68dpvre.fsf@ngraves.fr> <3582f9ef0c1fcc30719dd1479812354169d14277.camel@gmail.com> <87tu6j5moa.fsf@ngraves.fr> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 Cc: Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 11.08.2022 um 08:17 +0200 schrieb Nicolas Graves: > > > - I couldn't match a small part of current yasnippet configuration, > >   currently only the part in uri when url-fetch is chosen. Sent > >   a "help/feature report" here > > https://github.com/minad/tempel/issues/65. > > > > If this is possible, we could probably further factorize and > > integrate the > > snippets logic, maybe to reach something like that for origin > > expansion. > > Daniel Mendler confirmed that recursive templates were not supported, > hence I cannot further improve snippets. I've sent an updated patch > with "-build-system" added only once at the end. > > Waiting for them to be adopted ;) I'll reply to the actual patches with the review. > PS : it would be great to add a "snippets" output to the guix > package, so that one can use (file-append guix:snippets "/tempel/") > to include them in a guix home configuration. Note that you can (file-append (package-source guix) "etc/snippets") Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 11 12:21:24 2022 Received: (at 57069) by debbugs.gnu.org; 11 Aug 2022 16:21:24 +0000 Received: from localhost ([127.0.0.1]:54893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMAvz-0002qz-Ho for submit@debbugs.gnu.org; Thu, 11 Aug 2022 12:21:24 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:34799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMAvq-0002qe-FP for 57069@debbugs.gnu.org; Thu, 11 Aug 2022 12:21:22 -0400 Received: by mail-ed1-f68.google.com with SMTP id z2so23624178edc.1 for <57069@debbugs.gnu.org>; Thu, 11 Aug 2022 09:21:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:from:to:cc; bh=AiOdFedl/0hYL4EEMh4Jgkwx9mAE0/X49DX2IWUQBrw=; b=AcFb/bLK1CTxwWej+KYtQDllOYuk9itQbnwHDiisGK8WCO1TzQZCQCdbOWmMbybOMn /bj1d8g+bg9pUzlOpORg8KYj6YGEww3mUv0tETRKYsPL+QkP6R+dLVSdkJ3Ab8ktGFmj 4vFOQSf5kl954YfPM/pH405Q68Zhx55j5uQPnZN1ZADcG+6issn42G5aOX4p7AFLnHca J3jOQ16JM6JmKWtmtakXUYZ3VhLzfxk1oBe79ZbE2DomI9H5Lsq+V7axqaCh7/ZbCKX3 /LpF1Wg6IHshc5d6zsr+9YSPbWxfbgW4sbTJfqRV/wjGlJzLEsfe6/ppu+ZusWD1tGLb tJDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc; bh=AiOdFedl/0hYL4EEMh4Jgkwx9mAE0/X49DX2IWUQBrw=; b=g7XFQ1gffUh18R3SQz0NSRznyqlHkr7dDDznl1R0gQ++yVmDP4S4IZp+0UlP3xrLXu 9reArBIobmHl1ygjko8ErCyoz2zoCq1L4S2v1nT8GAmVwImcujhZmZlYwwgZ4y3rnxbO K+f0CjArIyd2FUZxVlBLEPPg0kRJJKY1kmtWxB2iA2PG8Pi6UnxnvK9mGixAEok8xt/o I+zHeTcVznhMjZ0mRvflkJd0J6XAGF20+U0MW7hroC9R8wDez8zYjuLJfELJDUlJZdb4 mUf8RDxwiLyOg3G3+LurAw3BUcXWdf34RkFpb2t4pQ8O1CX+pp4AvTCktG4fIBHFI5S+ kp6Q== X-Gm-Message-State: ACgBeo3jZw14lXXdL8WIlr5JU1Qiyozlup6YHnBQ14QH37HjIg4kntIs +PsrNCN1uR8KieHa/F0yw4s= X-Google-Smtp-Source: AA6agR7/8icJwf1h+EaZy5faHxqm2uxm99lS7Dn8UAgi3h5bWTZu1owL8+WOtnJvgUuT9eLPETFk+A== X-Received: by 2002:a50:d0da:0:b0:43d:5f5f:32c3 with SMTP id g26-20020a50d0da000000b0043d5f5f32c3mr31615436edf.192.1660234868517; Thu, 11 Aug 2022 09:21:08 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id ee41-20020a056402292900b0043cf1c6bb10sm9379048edb.25.2022.08.11.09.21.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 09:21:08 -0700 (PDT) Message-ID: Subject: Re: [PATCH v2] etc: Add tempel snippets. From: Liliana Marie Prikler To: Nicolas Graves , 57069@debbugs.gnu.org Date: Thu, 11 Aug 2022 18:21:07 +0200 In-Reply-To: <20220811060745.6892-1-ngraves@ngraves.fr> References: <20220811060745.6892-1-ngraves@ngraves.fr> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 11.08.2022 um 08:07 +0200 schrieb Nicolas Graves: > * doc/contributing.texi: >   - adding configuration description for tempel snippets. >   - adapting yasnippet configuration to directory move. Write full sentences, don't use pseudo-lists. > * etc/snippets/tempel/*.eld: adding alternative to current > yasnippets. * etc/snippets/tempel/scheme-mode.eld: New file. * etc/snippets/tempel/text-mode.eld: New file. I'm not too sure about the suffix here. I'd personally prefer a suffix-less file with a mode-line. > * etc/snippets*-mode: moved to /etc/snippets/yas/*-mode not to Again, spell out both directories, as in: * etc/snippets/scheme-mode: Moved from here... * etc/snippets/yas/scheme-mode: ... to here. > conflit with Should be conflict, but I don't think this needs to be stated when using the ChangeLog style as above. > tempel snippets. > --- >  doc/contributing.texi                         |  17 ++- >  etc/snippets/tempel/scheme-mode.eld           | 113 > ++++++++++++++++++ >  etc/snippets/tempel/text-mode.eld             | 101 ++++++++++++++++ >  .../{ => yas}/scheme-mode/guix-bzr-reference  |   0 >  .../{ => yas}/scheme-mode/guix-cvs-reference  |   0 >  .../{ => yas}/scheme-mode/guix-git-reference  |   0 >  .../{ => yas}/scheme-mode/guix-hg-reference   |   0 >  .../{ => yas}/scheme-mode/guix-origin         |   0 >  .../{ => yas}/scheme-mode/guix-package        |   0 >  .../{ => yas}/scheme-mode/guix-svn-reference  |   0 >  .../guix-commit-message-add-cl-package        |   0 >  .../text-mode/guix-commit-message-add-package |   0 >  .../guix-commit-message-remove-package        |   0 >  .../guix-commit-message-rename-package        |   0 >  .../guix-commit-message-update-package        |   0 >  .../guix-commit-message-use-https-home-page   |   0 >  16 files changed, 226 insertions(+), 5 deletions(-) >  create mode 100644 etc/snippets/tempel/scheme-mode.eld >  create mode 100644 etc/snippets/tempel/text-mode.eld >  rename etc/snippets/{ => yas}/scheme-mode/guix-bzr-reference (100%) >  rename etc/snippets/{ => yas}/scheme-mode/guix-cvs-reference (100%) >  rename etc/snippets/{ => yas}/scheme-mode/guix-git-reference (100%) >  rename etc/snippets/{ => yas}/scheme-mode/guix-hg-reference (100%) >  rename etc/snippets/{ => yas}/scheme-mode/guix-origin (100%) >  rename etc/snippets/{ => yas}/scheme-mode/guix-package (100%) >  rename etc/snippets/{ => yas}/scheme-mode/guix-svn-reference (100%) >  rename etc/snippets/{ => yas}/text-mode/guix-commit-message-add-cl- > package (100%) >  rename etc/snippets/{ => yas}/text-mode/guix-commit-message-add- > package (100%) >  rename etc/snippets/{ => yas}/text-mode/guix-commit-message-remove- > package (100%) >  rename etc/snippets/{ => yas}/text-mode/guix-commit-message-rename- > package (100%) >  rename etc/snippets/{ => yas}/text-mode/guix-commit-message-update- > package (100%) >  rename etc/snippets/{ => yas}/text-mode/guix-commit-message-use- > https-home-page (100%) > > diff --git a/doc/contributing.texi b/doc/contributing.texi > index 02c7c5ae59..808d71e40a 100644 > --- a/doc/contributing.texi > +++ b/doc/contributing.texi > @@ -320,15 +320,22 @@ s-expression, etc. >  @cindex reducing boilerplate >  We also provide templates for common git commit messages and package >  definitions in the @file{etc/snippets} directory.  These templates > can > -be used with @url{https://joaotavora.github.io/yasnippet/, > YASnippet} to > -expand short trigger strings to interactive text snippets.  You may > want > -to add the snippets directory to the @var{yas-snippet-dirs} variable > in > -Emacs. > +be used to expand short trigger strings to interactive text > snippets, > +with either @url{https://joaotavora.github.io/yasnippet/, YASnippet} > or > +@url{https://github.com/minad/tempel/, Tempel}.  You may want to add > the > +@file{etc/snippets/yas} (respectively > @file{etc/snippets/tempel/*.eld} > +or selected files) snippets directory to the @var{yas-snippet-dirs} > +(@var{tempel-path} resp.) variable in Emacs. You probably want to reorganize this a little. "We also provide templates for common git commit messages and package definitions in the @file{etc/snippets} directory. If you use YASnippet, you may want to . If you use Tempel, you may want to ." >   >  @lisp >  ;; @r{Assuming the Guix checkout is in ~/src/guix.} > +;; @r{Yasnippet} >  (with-eval-after-load 'yasnippet > -  (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets")) > +  (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets/yas")) > +;;@r{Tempel} > +(with-eval-after-load 'tempel > +         (add-to-list 'tempel-path > +         "~/src/guix/etc/snippets/tempel/*.eld")) >  @end lisp >   >  The commit message snippets depend on @url{https://magit.vc/, Magit} > to > diff --git a/etc/snippets/tempel/scheme-mode.eld > b/etc/snippets/tempel/scheme-mode.eld > new file mode 100644 > index 0000000000..5fcd7030b8 > --- /dev/null > +++ b/etc/snippets/tempel/scheme-mode.eld > @@ -0,0 +1,113 @@ > +-*- mode: lisp-data -*- > + > +scheme-mode > + > +(package... > + "(define-public " (s name) n> > + "(package" n> Style-wise, I think n> "(package" is better than the other way round. You can also n > and n > on subsequent lines for clarity. > + "(name \"" (s name) "\")" n> > + "(version \"" p "\")" n> > + "(source origin..." p ")" n> I don't think you want that p here. > + "(build-system \"" > + (p (completing-read "build-system:" > +                     '("android-ndk" > +                       "ant" > +                       "asdf" > +                       "cargo" > +                       "chicken" > +                       "clojure" > +                       "cmake" > +                       "copy" > +                       "dub" > +                       "dune" > +                       "emacs" > +                       "font" > +                       "glib-or-gtk" > +                       "gnu" > +                       "go" > +                       "guile" > +                       "haskell" > +                       "julia" > +                       "linux-module" > +                       "maven" > +                       "meson" > +                       "minetest" > +                       "minify" > +                       "node" > +                       "ocaml" > +                       "perl" > +                       "python" > +                       "qt" > +                       "r" > +                       "rakudo" > +                       "rebar" > +                       "renpy" > +                       "ruby" > +                       "scons" > +                       "texlive" > +                       "trivial" > +                       "waf") > +                     nil t) "-build-system") I'd suggest skipping the completing-read and just (p "gnu"). Most build systems should be easy enough to type without autocompletion. > + "\")" n> > + "(home-page \"" p "\")" n> > + "(synopsis \"" p "\")" n> > + "(description \"" p "\")" n> > + "(license " p ")))" n) > + > +(origin... > + "(origin" n> > + "(method \"" > + (p (completing-read "method:" > +                     '("url-fetch" > +                       "url-fetch/tarbomb" > +                       "url-fetch/zipbomb" > +                       "cvs-fetch" > +                       "git-fetch" > +                       "hg-fetch" > +                       "svn-fetch" > +                       "bzr-fetch") > +                     nil t) method) "\")" n> Here, I think (p "url-fetch"), but (s "method") might also work. > + "(uri " (cl-case (intern method) > +           ('git-fetch "git-reference...") > +           ('svn-fetch "svn-reference...") > +           ('hg-fetch  "hg-reference...") > +           ('cvs-fetch "cvs-reference...") > +           ('bzr-fetch "bzr-reference...") > +           (t          "(string-append \"https://")) Will this cl-case be dynamically recomputed? I wonder if we can get the result of the previous p/s here... > + p > + (if (equal (substring method 0 9)  "url-fetch") "\")") > + ")" n> > + (cl-case (intern method) > +   ('git-fetch "(file-name (git-file-name name version))\n") > +   ('hg-fetch "(file-name (hg-file-name name version))\n") > +   ('svn-fetch "(file-name (string-append name \"-\" version \"- > checkout\"))\n") > +   ('cvs-fetch "(file-name (string-append name \"-\" version \"- > checkout\"))\n") > +   ('bzr-fetch "(file-name (string-append name \"-\" version \"- > checkout\"))\n") > +   (t          "")) > Rather than that I think adding a template (git-file-name...) which expands to (file-name (git-file-name (p "name") (p "version")) and variants for the others is a better idea. > + "(sha256" n> "(base32 \"" p "\")))") > + > +(git-reference... > + "(git-reference" n> > + "(url \"" p "\")" n> > + "(commit \"" p "\"))") > + > +(svn-reference... > + "(svn-reference" n> > + "(url \"" p "\")" n> > + "(revision \"" p "\"))") > + > +(cvs-reference... > + "(cvs-reference" n> > + "(root-directory \"" p "\")" n> > + "(module \"" p "\")" n> > + "(revision \"" p "\"))") > + > +(hg-reference... > + "(hg-reference" n> > + "(url \"" p "\")" n> > + "(changeset \"" p "\"))") > + > +(bzr-reference... > + "(bzr-reference" n> > + "(url \"" p "\")" n> > + "(revision \"" p "\"))") > diff --git a/etc/snippets/tempel/text-mode.eld > b/etc/snippets/tempel/text-mode.eld > new file mode 100644 > index 0000000000..a51a6719d7 > --- /dev/null > +++ b/etc/snippets/tempel/text-mode.eld > @@ -0,0 +1,101 @@ > +-*- mode: lisp-data -*- > + > +text-mode :when (git-commit-mode) > + > +(add > + "gnu: Add " > + (p > +  (with-temp-buffer > +    (magit-git-wash #'magit-diff-wash-diffs > +      "diff" "--staged") > +    (goto-char (point-min)) > +    (when (re-search-forward "\\+(define-public \\(\\S-+\\)" nil > 'noerror) > +      (match-string-no-properties 1))) > +  var ) "." n n > + "* " (car (magit-staged-files)) " (" (s var ) "): New variable.") Pro tip: add a space after add (i.e. add\ ) or use add... as the name. This way, you guard against premature expansion in corfu and other packages likely to be used in combination with tempel. > +(remove > + "gnu: Remove " > + (p (with-temp-buffer > +      (magit-git-wash #'magit-diff-wash-diffs > +        "diff" "--staged") > +      (goto-char (point-min)) > +      (when (re-search-forward "\\-(define-public \\(\\S-+\\)" nil > 'noerror) > +        (match-string-no-properties 1))) > +    var) "." n n > + "* " (car (magit-staged-files)) " (" (s var) "): Delete variable.") > + > +(rename > + "gnu: " > + (p (with-temp-buffer > +      (magit-git-wash #'magit-diff-wash-diffs > +        "diff" "--staged") > +      (beginning-of-buffer) > +      (when (search-forward "-(define-public " nil 'noerror) > +        (thing-at-point 'sexp 'no-properties))) > +    prev-var) > + ": Rename package to " > + (p (with-temp-buffer > +      (magit-git-wash #'magit-diff-wash-diffs > +        "diff" "--staged") > +      (beginning-of-buffer) > +      (when (search-forward "+(define-public " nil 'noerror) > +        (thing-at-point 'sexp 'no-properties))) > +    new-var) "." n n > + "* " (car (magit-staged-files)) " (" (s prev-var) "): Define in > terms of" n > + "'deprecated-package'." n > + "(" (s new-var) "): New variable, formerly known as \"" (s prev- > var) "\".") > + > +(update > + "gnu: " > + (p (with-temp-buffer > +      (magit-git-wash #'magit-diff-wash-diffs > +        "diff" "--staged") > +      (goto-char (point-min)) > +      (when (re-search-forward "^[ ]*(define-public \\(\\S-+\\)" nil > 'noerror) > +        (match-string-no-properties 1))) > +    var) > + ": Update to " > + (p (with-temp-buffer > +      (magit-git-wash #'magit-diff-wash-diffs > +        "diff" "--staged") > +      (goto-char (point-min)) > +      (search-forward "name" nil 'noerror) > +      (search-forward "+" nil 'noerror)   ; first change > +      (when (and (search-forward "version " nil 'noerror) > +                 (looking-at-p "\"")) > +        (let ((end (save-excursion (search-forward "\")" nil > 'noerror)))) > +          (when end > +            (forward-char) > +            (buffer-substring-no-properties (point) (- end 2)))))) > +    version) "." n n > + "* " (car (magit-staged-files)) " (" (s var) "): Update to " (s > version) "." > + (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged- > files))) n) > + > +(addcl > + "gnu: Add cl-" > + (p (replace-regexp-in-string > +     "^cl-" "" (with-temp-buffer > +                 (magit-git-wash #'magit-diff-wash-diffs > +                   "diff" "--staged") > +                 (beginning-of-buffer) > +                 (when (search-forward "+(define-public " nil > 'noerror) > +                   (replace-regexp-in-string > +                    "^sbcl-" "" > +                    (thing-at-point 'sexp 'no-properties))))) > +    var) "." n n > + "* " (car (magit-staged-files)) > + " (cl-" (s var)  ", ecl-" (s var) ", sbcl-" (s var) "): New > variables.") > + > +(https > + "gnu: " > + (p (with-temp-buffer > +      (magit-git-wash #'magit-diff-wash-diffs > +        "diff" "--staged") > +      (goto-char (point-min)) > +      (when (re-search-forward "^[ ]*(define-public \\(\\S-+\\)" nil > 'noerror) > +        (match-string-no-properties 1))) > +    var) > + ": Use HTTPS home page." n n > + "* " (car (magit-staged-files)) " (" (s var) ")[home-page]: Use > HTTPS." n > + (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged- > files))) n) Cheers From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 12 02:21:02 2022 Received: (at 57069) by debbugs.gnu.org; 12 Aug 2022 06:21:02 +0000 Received: from localhost ([127.0.0.1]:55455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMO2Y-0007vw-4X for submit@debbugs.gnu.org; Fri, 12 Aug 2022 02:21:02 -0400 Received: from 5.mo550.mail-out.ovh.net ([178.33.45.107]:58527) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMO2V-0007vJ-24 for 57069@debbugs.gnu.org; Fri, 12 Aug 2022 02:21:00 -0400 Received: from player157.ha.ovh.net (unknown [10.110.115.5]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 07B3822A80 for <57069@debbugs.gnu.org>; Fri, 12 Aug 2022 06:20:56 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player157.ha.ovh.net (Postfix) with ESMTPSA id 3A5FC2D7FDC57; Fri, 12 Aug 2022 06:20:54 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003b12fde5e-7c91-4f76-bc74-297208fc17a1, 62590A30D50FD365DB0EC0A9D3D5D7E51EBD5635) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: Liliana Marie Prikler , 57069@debbugs.gnu.org Subject: Re: [PATCH v2] etc: Add tempel snippets. In-Reply-To: References: <20220811060745.6892-1-ngraves@ngraves.fr> Date: Fri, 12 Aug 2022 08:20:53 +0200 Message-ID: <87czd69e4a.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 17385864887639728707 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdeghedguddtkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffujghffffkgggtsehttdertddttddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepieetfeevudehjefhveeukeefheffgfejheeikefgveekteeiheejgfeliefghfeunecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkpheptddrtddrtddrtddpvddufedrgeegrdduiedurdegjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepphhlrgihvghrudehjedrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeehjedtieelseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedt X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2022-08-11 18:21, Liliana Marie Prikler wrote: > I'm not too sure about the suffix here. I'd personally prefer a > suffix-less file with a mode-line. OK, I thought it was necessary because of a previous failed attempt, but it seems to work. The tempel path cannot be a directory though, it is necessary to put a wildcard (at least using this version of TempEL). >> +text-mode :when (git-commit-mode) Here I have a bug when magit has never been opened before opening a text-mode file, saying that git-commit-mode is not defined. Not sure what the best way to resolve this is. Will investigate that. > I'd suggest skipping the completing-read and just (p "gnu"). Most > build systems should be easy enough to type without autocompletion. But then you have to know the name and loose the listing if you're a beginner and not sure. I'm fine with both options. I will follow your suggestion if you confirm that you took this type of user into account and still prefer just (p "gnu"). > Here, I think (p "url-fetch"), but (s "method") might also work. I'm not sure I understand what you meant here. Can you write the final method you would get this way? > Will this cl-case be dynamically recomputed? I wonder if we can get > the result of the previous p/s here... Yes it is recomputed. p/s stores the variable and for evaluations "Named fields are lexically bound." It works when tested, we can get the result of the previous p. As Daniel Mendler stressed here (https://github.com/minad/tempel/issues/65), there is no possibility to do a recursive template i.e. with a FORM evaluating to elements of a snippet. So the best thing we might do with conditionals is to return a string. > Rather than that I think adding a template (git-file-name...) which > expands to (file-name (git-file-name (p "name") (p "version")) and > variants for the others is a better idea. In most guix packages, it is left as simply name and version strings, since they are defined for the package itself. I took the same approah as the yasnippet template, since these field are almost always left untouched. I don't see the benefit of this other approach. Your other comments have been taken into account, I'm sending an updated series as soon as I'm done with the git-commit-mode issue. Feel free to send an idea for this issue if you have one! -- Best regards, Nicolas Graves From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 12 04:59:37 2022 Received: (at 57069) by debbugs.gnu.org; 12 Aug 2022 08:59:37 +0000 Received: from localhost ([127.0.0.1]:55635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMQW0-0003pM-6u for submit@debbugs.gnu.org; Fri, 12 Aug 2022 04:59:37 -0400 Received: from 8.mo584.mail-out.ovh.net ([188.165.33.112]:53953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMQVw-0003p9-Ta for 57069@debbugs.gnu.org; Fri, 12 Aug 2022 04:59:34 -0400 Received: from player157.ha.ovh.net (unknown [10.111.172.70]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 8E8122206A for <57069@debbugs.gnu.org>; Fri, 12 Aug 2022 08:59:30 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player157.ha.ovh.net (Postfix) with ESMTPSA id 7AEA92D8125CD; Fri, 12 Aug 2022 08:59:27 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-97G0029bbc0748-54ef-4ee8-bd1b-b6c27fcb775b, 62590A30D50FD365DB0EC0A9D3D5D7E51EBD5635) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: 57069@debbugs.gnu.org Subject: [PATCH v3 1/4] etc: Add tempel snippets. Date: Fri, 12 Aug 2022 10:58:48 +0200 Message-Id: <20220812085851.12104-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 1617073742812340962 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 49 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegiedgudduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgoufhushhpvggtthffohhmrghinhculdegledmnecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffudevjeeljeehheeiudetuddvueegveeiteejkefgueetffethfeiffehleelleenucffohhmrghinhepghhithhhuhgsrdhiohdpghhithhhuhgsrdgtohhmpdhmrghgihhtrdhvtgenucfkpheptddrtddrtddrtddpvddufedrgeegrdduiedurdegjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepphhlrgihvghrudehjedrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeehjedtieelseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeeg X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * doc/contributing.texi: Adding configuration description for TempEL snippets and adapting yasnippet configuration to the directory move. * etc/snippets/tempel/scheme-mode: New file. * etc/snippets/tempel/text-mode: New file. * etc/snippets/scheme-mode: Moved from here... * etc/snippets/yas/scheme-mode: ... to here. * etc/snippets/text-mode: Moved from here... * etc/snippets/yas/text-mode: ... to here. --- doc/contributing.texi | 16 ++- etc/snippets/tempel/scheme-mode | 114 ++++++++++++++++++ etc/snippets/tempel/text-mode | 101 ++++++++++++++++ .../{ => yas}/scheme-mode/guix-bzr-reference | 0 .../{ => yas}/scheme-mode/guix-cvs-reference | 0 .../{ => yas}/scheme-mode/guix-git-reference | 0 .../{ => yas}/scheme-mode/guix-hg-reference | 0 .../{ => yas}/scheme-mode/guix-origin | 0 .../{ => yas}/scheme-mode/guix-package | 0 .../{ => yas}/scheme-mode/guix-svn-reference | 0 .../guix-commit-message-add-cl-package | 0 .../text-mode/guix-commit-message-add-package | 0 .../guix-commit-message-remove-package | 0 .../guix-commit-message-rename-package | 0 .../guix-commit-message-update-package | 0 .../guix-commit-message-use-https-home-page | 0 16 files changed, 227 insertions(+), 4 deletions(-) create mode 100644 etc/snippets/tempel/scheme-mode create mode 100644 etc/snippets/tempel/text-mode rename etc/snippets/{ => yas}/scheme-mode/guix-bzr-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-cvs-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-git-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-hg-reference (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-origin (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-package (100%) rename etc/snippets/{ => yas}/scheme-mode/guix-svn-reference (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-add-cl-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-add-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-remove-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-rename-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-update-package (100%) rename etc/snippets/{ => yas}/text-mode/guix-commit-message-use-https-home-page (100%) diff --git a/doc/contributing.texi b/doc/contributing.texi index 02c7c5ae59..655ce182de 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -320,15 +320,23 @@ s-expression, etc. @cindex reducing boilerplate We also provide templates for common git commit messages and package definitions in the @file{etc/snippets} directory. These templates can -be used with @url{https://joaotavora.github.io/yasnippet/, YASnippet} to -expand short trigger strings to interactive text snippets. You may want -to add the snippets directory to the @var{yas-snippet-dirs} variable in +be used to expand short trigger strings to interactive text snippets. If +you use @url{https://joaotavora.github.io/yasnippet/, YASnippet}, you +may want to add the @file{etc/snippets/yas} snippets directory to the +@var{yas-snippet-dirs} variable. If you use +@url{https://github.com/minad/tempel/, Tempel}, you may want to add the +@file{etc/snippets/tempel/*} path to the @var{tempel-path} variable in Emacs. @lisp ;; @r{Assuming the Guix checkout is in ~/src/guix.} +;; @r{Yasnippet} (with-eval-after-load 'yasnippet - (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets")) + (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets/yas")) +;;@r{Tempel} +(with-eval-after-load 'tempel + (add-to-list 'tempel-path + "~/src/guix/etc/snippets/tempel/*")) @end lisp The commit message snippets depend on @url{https://magit.vc/, Magit} to diff --git a/etc/snippets/tempel/scheme-mode b/etc/snippets/tempel/scheme-mode new file mode 100644 index 0000000000..386c9e653f --- /dev/null +++ b/etc/snippets/tempel/scheme-mode @@ -0,0 +1,114 @@ +-*- mode: lisp-data -*- + +scheme-mode + +(package... + "(define-public " (s name) + n> "(package" + n> "(name \"" (s name) "\")" + n> "(version \"" p "\")" + n> "(source origin...)" + n> "(build-system \"" + (p (completing-read "build-system:" + '("android-ndk" + "ant" + "asdf" + "cargo" + "chicken" + "clojure" + "cmake" + "copy" + "dub" + "dune" + "emacs" + "font" + "glib-or-gtk" + "gnu" + "go" + "guile" + "haskell" + "julia" + "linux-module" + "maven" + "meson" + "minetest" + "minify" + "node" + "ocaml" + "perl" + "python" + "qt" + "r" + "rakudo" + "rebar" + "renpy" + "ruby" + "scons" + "texlive" + "trivial" + "waf") + nil t) "-build-system") + "\")" + n> "(home-page \"" p "\")" + n> "(synopsis \"" p "\")" + n> "(description \"" p "\")" + n> "(license " p ")))" n) + +(origin... + "(origin" + n> "(method \"" + (p (completing-read "method:" + '("url-fetch" + "url-fetch/tarbomb" + "url-fetch/zipbomb" + "cvs-fetch" + "git-fetch" + "hg-fetch" + "svn-fetch" + "bzr-fetch") + nil t) method) "\")" + n> "(uri " (cl-case (intern method) + ('git-fetch "git-reference...") + ('svn-fetch "svn-reference...") + ('hg-fetch "hg-reference...") + ('cvs-fetch "cvs-reference...") + ('bzr-fetch "bzr-reference...") + (t "(string-append \"https://")) + p + (if (equal (substring method 0 9) "url-fetch") "\")") + ")" + n> (cl-case (intern method) + ('git-fetch "(file-name (git-file-name name version))\n") + ('hg-fetch "(file-name (hg-file-name name version))\n") + ('svn-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + ('cvs-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + ('bzr-fetch "(file-name (string-append name \"-\" version \"-checkout\"))\n") + (t "")) + > "(sha256" + n> "(base32 \"" p "\")))") + +(git-reference... + "(git-reference" + n> "(url \"" p "\")" + n> "(commit \"" p "\"))") + +(svn-reference... + "(svn-reference" + n> "(url \"" p "\")" + n> "(revision \"" p "\"))") + +(cvs-reference... + "(cvs-reference" + n> "(root-directory \"" p "\")" + n> "(module \"" p "\")" + n> "(revision \"" p "\"))") + +(hg-reference... + "(hg-reference" + n> "(url \"" p "\")" + n> "(changeset \"" p "\"))") + +(bzr-reference... + "(bzr-reference" + n> "(url \"" p "\")" + n> "(revision \"" p "\"))") diff --git a/etc/snippets/tempel/text-mode b/etc/snippets/tempel/text-mode new file mode 100644 index 0000000000..a1400aac69 --- /dev/null +++ b/etc/snippets/tempel/text-mode @@ -0,0 +1,101 @@ +-*- mode: lisp-data -*- + +text-mode :when (and (fboundp 'git-commit-mode) (git-commit-mode)) + +(add\ + "gnu: Add " + (p + (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "\\+(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var ) "." n n + "* " (car (magit-staged-files)) " (" (s var ) "): New variable.") + +(remove\ + "gnu: Remove " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "\\-(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) "." n n + "* " (car (magit-staged-files)) " (" (s var) "): Delete variable.") + +(rename\ + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "-(define-public " nil 'noerror) + (thing-at-point 'sexp 'no-properties))) + prev-var) + ": Rename package to " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "+(define-public " nil 'noerror) + (thing-at-point 'sexp 'no-properties))) + new-var) "." n n + "* " (car (magit-staged-files)) " (" (s prev-var) "): Define in terms of" n + "'deprecated-package'." n + "(" (s new-var) "): New variable, formerly known as \"" (s prev-var) "\".") + +(update\ + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "^[ ]*(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) + ": Update to " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (search-forward "name" nil 'noerror) + (search-forward "+" nil 'noerror) ; first change + (when (and (search-forward "version " nil 'noerror) + (looking-at-p "\"")) + (let ((end (save-excursion (search-forward "\")" nil 'noerror)))) + (when end + (forward-char) + (buffer-substring-no-properties (point) (- end 2)))))) + version) "." n n + "* " (car (magit-staged-files)) " (" (s var) "): Update to " (s version) "." + (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files))) n) + +(addcl\ + "gnu: Add cl-" + (p (replace-regexp-in-string + "^cl-" "" (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (beginning-of-buffer) + (when (search-forward "+(define-public " nil 'noerror) + (replace-regexp-in-string + "^sbcl-" "" + (thing-at-point 'sexp 'no-properties))))) + var) "." n n + "* " (car (magit-staged-files)) + " (cl-" (s var) ", ecl-" (s var) ", sbcl-" (s var) "): New variables.") + +(https\ + "gnu: " + (p (with-temp-buffer + (magit-git-wash #'magit-diff-wash-diffs + "diff" "--staged") + (goto-char (point-min)) + (when (re-search-forward "^[ ]*(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1))) + var) + ": Use HTTPS home page." n n + "* " (car (magit-staged-files)) " (" (s var) ")[home-page]: Use HTTPS." n + (mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files))) n) diff --git a/etc/snippets/scheme-mode/guix-bzr-reference b/etc/snippets/yas/scheme-mode/guix-bzr-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-bzr-reference rename to etc/snippets/yas/scheme-mode/guix-bzr-reference diff --git a/etc/snippets/scheme-mode/guix-cvs-reference b/etc/snippets/yas/scheme-mode/guix-cvs-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-cvs-reference rename to etc/snippets/yas/scheme-mode/guix-cvs-reference diff --git a/etc/snippets/scheme-mode/guix-git-reference b/etc/snippets/yas/scheme-mode/guix-git-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-git-reference rename to etc/snippets/yas/scheme-mode/guix-git-reference diff --git a/etc/snippets/scheme-mode/guix-hg-reference b/etc/snippets/yas/scheme-mode/guix-hg-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-hg-reference rename to etc/snippets/yas/scheme-mode/guix-hg-reference diff --git a/etc/snippets/scheme-mode/guix-origin b/etc/snippets/yas/scheme-mode/guix-origin similarity index 100% rename from etc/snippets/scheme-mode/guix-origin rename to etc/snippets/yas/scheme-mode/guix-origin diff --git a/etc/snippets/scheme-mode/guix-package b/etc/snippets/yas/scheme-mode/guix-package similarity index 100% rename from etc/snippets/scheme-mode/guix-package rename to etc/snippets/yas/scheme-mode/guix-package diff --git a/etc/snippets/scheme-mode/guix-svn-reference b/etc/snippets/yas/scheme-mode/guix-svn-reference similarity index 100% rename from etc/snippets/scheme-mode/guix-svn-reference rename to etc/snippets/yas/scheme-mode/guix-svn-reference diff --git a/etc/snippets/text-mode/guix-commit-message-add-cl-package b/etc/snippets/yas/text-mode/guix-commit-message-add-cl-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-add-cl-package rename to etc/snippets/yas/text-mode/guix-commit-message-add-cl-package diff --git a/etc/snippets/text-mode/guix-commit-message-add-package b/etc/snippets/yas/text-mode/guix-commit-message-add-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-add-package rename to etc/snippets/yas/text-mode/guix-commit-message-add-package diff --git a/etc/snippets/text-mode/guix-commit-message-remove-package b/etc/snippets/yas/text-mode/guix-commit-message-remove-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-remove-package rename to etc/snippets/yas/text-mode/guix-commit-message-remove-package diff --git a/etc/snippets/text-mode/guix-commit-message-rename-package b/etc/snippets/yas/text-mode/guix-commit-message-rename-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-rename-package rename to etc/snippets/yas/text-mode/guix-commit-message-rename-package diff --git a/etc/snippets/text-mode/guix-commit-message-update-package b/etc/snippets/yas/text-mode/guix-commit-message-update-package similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-update-package rename to etc/snippets/yas/text-mode/guix-commit-message-update-package diff --git a/etc/snippets/text-mode/guix-commit-message-use-https-home-page b/etc/snippets/yas/text-mode/guix-commit-message-use-https-home-page similarity index 100% rename from etc/snippets/text-mode/guix-commit-message-use-https-home-page rename to etc/snippets/yas/text-mode/guix-commit-message-use-https-home-page -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 12 04:59:39 2022 Received: (at 57069) by debbugs.gnu.org; 12 Aug 2022 08:59:39 +0000 Received: from localhost ([127.0.0.1]:55639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMQW3-0003ph-9f for submit@debbugs.gnu.org; Fri, 12 Aug 2022 04:59:39 -0400 Received: from 7.mo575.mail-out.ovh.net ([46.105.63.230]:59367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMQVz-0003pD-Hs for 57069@debbugs.gnu.org; Fri, 12 Aug 2022 04:59:36 -0400 Received: from player746.ha.ovh.net (unknown [10.109.138.76]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 6E7AF22D2A for <57069@debbugs.gnu.org>; Fri, 12 Aug 2022 08:59:33 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player746.ha.ovh.net (Postfix) with ESMTPSA id C0F2C201D79ED; Fri, 12 Aug 2022 08:59:30 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-105G006d8208e3d-b8ee-4462-9bc6-62322af57ef6, 62590A30D50FD365DB0EC0A9D3D5D7E51EBD5635) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: 57069@debbugs.gnu.org Subject: [PATCH v3 2/4] etc: Add tempel snippet for :phases. Date: Fri, 12 Aug 2022 10:58:49 +0200 Message-Id: <20220812085851.12104-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220812085851.12104-1-ngraves@ngraves.fr> References: <20220812085851.12104-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 1617918170129687266 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegiedgudduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejgeeirdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheejtdeileesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhe X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- etc/snippets/tempel/scheme-mode | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/etc/snippets/tempel/scheme-mode b/etc/snippets/tempel/scheme-mode index 386c9e653f..34625420be 100644 --- a/etc/snippets/tempel/scheme-mode +++ b/etc/snippets/tempel/scheme-mode @@ -112,3 +112,13 @@ scheme-mode "(bzr-reference" n> "(url \"" p "\")" n> "(revision \"" p "\"))") + +(:phases + ":phases (modify-phases %standard-phases" n> + "(" (p (completing-read "modify:" + '("add-before" + "replace" + "add-after" + "delete ") + nil t)) + " '" q "))" ) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 12 04:59:39 2022 Received: (at 57069) by debbugs.gnu.org; 12 Aug 2022 08:59:40 +0000 Received: from localhost ([127.0.0.1]:55641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMQW3-0003pn-Ij for submit@debbugs.gnu.org; Fri, 12 Aug 2022 04:59:39 -0400 Received: from 11.mo561.mail-out.ovh.net ([87.98.184.158]:58589) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMQW0-0003pL-Fl for 57069@debbugs.gnu.org; Fri, 12 Aug 2022 04:59:37 -0400 Received: from player762.ha.ovh.net (unknown [10.109.146.213]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id CA26B23151 for <57069@debbugs.gnu.org>; Fri, 12 Aug 2022 08:59:34 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player762.ha.ovh.net (Postfix) with ESMTPSA id E39962D72B9E8; Fri, 12 Aug 2022 08:59:32 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G003b4038576-3860-4677-b6ba-772382ef5f18, 62590A30D50FD365DB0EC0A9D3D5D7E51EBD5635) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: 57069@debbugs.gnu.org Subject: [PATCH v3 3/4] etc: Add tempel snippet for license:. Date: Fri, 12 Aug 2022 10:58:50 +0200 Message-Id: <20220812085851.12104-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220812085851.12104-1-ngraves@ngraves.fr> References: <20220812085851.12104-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 1618481119590933218 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegiedgudduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejiedvrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheejtdeileesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiud X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- etc/snippets/tempel/scheme-mode | 117 ++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/etc/snippets/tempel/scheme-mode b/etc/snippets/tempel/scheme-mode index 34625420be..1a354923fa 100644 --- a/etc/snippets/tempel/scheme-mode +++ b/etc/snippets/tempel/scheme-mode @@ -122,3 +122,120 @@ scheme-mode "delete ") nil t)) " '" q "))" ) + +(license: + "license:" + (p (completing-read "license:" + '("agpl1" + "agpl3" + "agpl3+" + "apsl2" + "asl1.1" + "asl2.0" + "boost1.0" + "bsd-0" + "bsd-1" + "bsd-2" + "bsd-3" + "bsd-4" + "non-copyleft" + "cc0" + "cc-by-sa4.0" + "cc-by-sa3.0" + "cc-by-sa2.0" + "cc-by4.0" + "cc-by3.0" + "cc-by2.0" + "cddl1.0" + "cddl1.1" + "cecill" + "cecill-b" + "cecill-c" + "artistic2.0" + "clarified-artistic" + "copyleft-next" + "cpl1.0" + "cua-opl1.0" + "edl1.0" + "epl1.0" + "epl2.0" + "eupl1.2" + "expat" + "expat-0" + "freetype" + "giftware" + "gpl1" + "gpl1+" + "gpl2" + "gpl2+" + "gpl3" + "gpl3+" + "gfl1.0" + "fdl1.1+" + "fdl1.2+" + "fdl1.3+" + "freebsd-doc" + "opl1.0+" + "osl2.1" + "isc" + "ijg" + "ibmpl1.0" + "imlib2" + "ipa" + "knuth" + "lal1.3" + "lgpl2.0" + "lgpl2.0+" + "lgpl2.1" + "lgpl2.1+" + "lgpl3" + "lgpl3+" + "llgpl" + "lppl" + "lppl1.0+" + "lppl1.1+" + "lppl1.2" + "lppl1.2+" + "lppl1.3" + "lppl1.3+" + "lppl1.3a" + "lppl1.3a+" + "lppl1.3b" + "lppl1.3b+" + "lppl1.3c" + "lppl1.3c+" + "miros" + "mpl1.0" + "mpl1.1" + "mpl2.0" + "ms-pl" + "ncsa" + "nmap" + "ogl-psi1.0" + "openssl" + "openldap2.8" + "perl-license" + "psfl" + "public-domain" + "qpl" + "qwt1.0" + "repoze" + "ruby" + "sgifreeb2.0" + "silofl1.1" + "sleepycat" + "tcl/tk" + "vim" + "unicode" + "unlicense" + "w3c" + "wtfpl2" + "wxwindows3.1+" + "x11" + "x11-style" + "zpl2.1" + "zlib" + "hpnd" + "fsf-free" + "fsdg-compatible") + nil t))) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 12 04:59:45 2022 Received: (at 57069) by debbugs.gnu.org; 12 Aug 2022 08:59:45 +0000 Received: from localhost ([127.0.0.1]:55643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMQW8-0003q6-Ut for submit@debbugs.gnu.org; Fri, 12 Aug 2022 04:59:45 -0400 Received: from 6.mo576.mail-out.ovh.net ([46.105.50.107]:54871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMQW3-0003pf-0L for 57069@debbugs.gnu.org; Fri, 12 Aug 2022 04:59:39 -0400 Received: from player773.ha.ovh.net (unknown [10.110.208.62]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4F84022C5C for <57069@debbugs.gnu.org>; Fri, 12 Aug 2022 08:59:36 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player773.ha.ovh.net (Postfix) with ESMTPSA id 5C5822D8E919D; Fri, 12 Aug 2022 08:59:35 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-106R006f73c4f0a-1bfb-4edf-8203-07f9764941b4, 62590A30D50FD365DB0EC0A9D3D5D7E51EBD5635) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 From: Nicolas Graves To: 57069@debbugs.gnu.org Subject: [PATCH v3 4/4] etc: Update guix-package yasnippet build-system list. Date: Fri, 12 Aug 2022 10:58:51 +0200 Message-Id: <20220812085851.12104-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220812085851.12104-1-ngraves@ngraves.fr> References: <20220812085851.12104-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 1619044069973746402 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrvdegiedgudduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejjeefrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheejtdeileesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejie X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 Cc: ngraves@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- etc/snippets/yas/scheme-mode/guix-package | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/snippets/yas/scheme-mode/guix-package b/etc/snippets/yas/scheme-mode/guix-package index 9ff6f997d1..724a392f81 100644 --- a/etc/snippets/yas/scheme-mode/guix-package +++ b/etc/snippets/yas/scheme-mode/guix-package @@ -11,6 +11,7 @@ "ant-build-system" "asdf-build-system" "cargo-build-system" + "chicken-build-system" "clojure-build-system" "cmake-build-system" "copy-build-system" @@ -27,6 +28,7 @@ "linux-module-build-system" "maven-build-system" "meson-build-system" + "minetest-build-system" "minify-build-system" "node-build-system" "ocaml-build-system" @@ -35,6 +37,8 @@ "qt-build-system" "r-build-system" "rakudo-build-system" + "rebar-build-system" + "renpy-build-system" "ruby-build-system" "scons-build-system" "texlive-build-system" -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 16 00:24:04 2022 Received: (at 57069) by debbugs.gnu.org; 16 Aug 2022 04:24:05 +0000 Received: from localhost ([127.0.0.1]:44503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNo7Y-000196-HZ for submit@debbugs.gnu.org; Tue, 16 Aug 2022 00:24:04 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:56677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNo7T-00018X-4R for 57069@debbugs.gnu.org; Tue, 16 Aug 2022 00:24:03 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id 91863240002; Tue, 16 Aug 2022 04:23:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1660623832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=s2dtX5cd9C4Q1pxcnb9gNp38pR8CKMaWEI0AMhnwQJ8=; b=VBfkHB+r4oQhl7qMDOoO9HWK+PX0Z2A4sgRYjvUBJ6OhRM0BOR0PfwCbnU8dh4lZNnVJCw d4PsHowwGm3k8BmYxFB/Xy4PYKh7Q7xaFDIs+i6QfdD1l4tiF/GKV2KNoslAZ5oZY8pdJw 7VcUktiAj0NuvxxCYDoS/lhxLh87jbdMjz9uVRthzBsg2MZhJlwpHh26j8uBTMK2je1C5v 8u9MGokEsirg49Ub827N9i8NXJAr7OpRHAqUiqAuYQCmuQ59g4moQwCZ70Hk0IP1tk+NsX woEe8Mg3ACnlsbtc0owdSdFA0jwr0BVfBK3u/KfVYH32FUBLEjABQiZE4px7dA== From: Andrew Tropin To: Liliana Marie Prikler , Nicolas Graves , 57069@debbugs.gnu.org Subject: Re: Tempel snippets In-Reply-To: <39edb2a4b03ca1a052120fcebd5919350d65a779.camel@gmail.com> References: <87a68dpvre.fsf@ngraves.fr> <3582f9ef0c1fcc30719dd1479812354169d14277.camel@gmail.com> <87tu6j5moa.fsf@ngraves.fr> <39edb2a4b03ca1a052120fcebd5919350d65a779.camel@gmail.com> Date: Tue, 16 Aug 2022 07:23:47 +0300 Message-ID: <87o7wkolyk.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 57069 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2022-08-11 17:53, Liliana Marie Prikler wrote: > Am Donnerstag, dem 11.08.2022 um 08:17 +0200 schrieb Nicolas Graves: >>=20 >> > - I couldn't match a small part of current yasnippet configuration, >> > =C2=A0 currently only the part in uri when url-fetch is chosen. Sent >> > =C2=A0 a "help/feature report" here >> > https://github.com/minad/tempel/issues/65. >> >=20 >> > If this is possible, we could probably further factorize and >> > integrate the >> > snippets logic, maybe to reach something like that for origin >> > expansion. >>=20 >> Daniel Mendler confirmed that recursive templates were not supported, >> hence I cannot further improve snippets. I've sent an updated patch >> with "-build-system" added only once at the end. >>=20 >> Waiting for them to be adopted ;) > I'll reply to the actual patches with the review. > >> PS : it would be great to add a "snippets" output to the guix >> package, so that one can use (file-append guix:snippets "/tempel/") >> to include them in a guix home configuration. > Note that you can (file-append (package-source guix) "etc/snippets") Probably not yet, there is no build phase, which copies etc/snippets to out so far. > > Cheers =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmL7G9MACgkQIgjSCVjB 3rA7LA//bH2sfiG6OgDxT3R0Yl7rb9XqFXNiZsG4Da8Q3wQrorPGHefQN5P2Vaik FOlS+ohAcI5nUHCK87mnzVedUzkZUG/nSKdav9+9sXlKGBtwkLIDCar3aQoY8DUs LdbJDrD1teoLREIWLk+rjjFH+1Jwh4WaBopvaicBs5UKveU6StFC8/NV4qVhKeA4 xGjIXerS1F0MxYbcXDTESmnyYUsEwpKy0s4lzJ0FSowv3PWVd2zdFAH/kdfSB5Se XldWdQksm1Zk6b2uKrnctVSIW5t9/9SptV9EOx/26rO3qw7Au9/p0pkRRilr1ylF YOQ6sLtrqZHcoBxFcb+Vuyw8ZrZPl4bT9LVqyTZivj6jUCzz7W2O4LI9fVLpD2TJ LTfGicwcgIE/lD2nRdG8/rqYGeE6GEggB+Z90xgeoi+VDygKac9+DV8YSAsoHuJY YmQjCT6gHitwv0V7F42dt4frPOT/S0Nhg2yIQnlV7pan/lL6ZUlTbBMKXvI/LBvf 8nNUFCB9klkhTeZaTuU8x1BPxqOq4bhlYOdbIv/EhQtmzgdll3N0PpxORUQr3kvL Wc9sVQTB1OGQg2LV5De0Y99RvUOt8Vns2fYSGz6g3vgbKZrvkvvWJN4VXSx02aN9 yiW9trDAngtQq7rez98et5VrJaP3jzHxGiAFSEaC5Nh1C55VXJ4= =00aA -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 16 12:09:16 2022 Received: (at 57069) by debbugs.gnu.org; 16 Aug 2022 16:09:17 +0000 Received: from localhost ([127.0.0.1]:48105 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNz80-0008E4-Kt for submit@debbugs.gnu.org; Tue, 16 Aug 2022 12:09:16 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:44549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNz7w-0008Dr-GH for 57069@debbugs.gnu.org; Tue, 16 Aug 2022 12:09:15 -0400 Received: by mail-ed1-f66.google.com with SMTP id t5so14098031edc.11 for <57069@debbugs.gnu.org>; Tue, 16 Aug 2022 09:09:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:from:to:cc; bh=Eru3xnXs6+sv1HxDkYdfv97LGZCZ3aHzFPlUudNTEFI=; b=aFnuXzaLCWdpsAEiUGwH73moKFJWFV45BJfaC/gx/ycQ4NY4oo34LZ61EnRhbz/q8h /q/1pHx6RuJdzpN+i9K4gBqq5gxJnkhl7Bj7I2+5OjDbGgubLZilb4vASa2wfcYyVAl1 dwLtt+FxM6Ew8zGLTwzBI9oSxp3Rv4j+zF7QBWL8Z4S0ECDooT96BnDUZT4mkSiHpoZm 09GKtu3J+qTwsQPwT0D0Vn4tL3ETHaivjHBOyZWz7IGuAnf0DwB2V3dvuMH6RCFJPo4U c6R0Uzk1uye81I9VaU5AeK/BLcAPn6lfTLolRMe8YtwywVDmmXqMzCsJJHYZ3+DQvnvC cz2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc; bh=Eru3xnXs6+sv1HxDkYdfv97LGZCZ3aHzFPlUudNTEFI=; b=1Tl51uI5fsUxTRXrCCv/x49hiJm/cvdkMIwrrCAUWh3R8+KOJQFl7e819chymXFC1h FFrE1fDYj8w/wWjL1Ql2wqhOG16lt0w1jtcr+Y3CtxhS/gj4IYNRkhMvubECXfFel2LE OHjPqscTvQYOXvraG7Oydk8oe/SMeQf1Ll7MOVyAlUmu9I6pO4rFU0OUl5LvCuOO5rig oP1CEJRwdHlfHizkGeqZ0eUNAqeVbRyIhiV1cKeCOq5WrEXeHVvIBet70OAp2dqCbDnv xzfZcdsqkHtK6EUqQ0KIcbKvgFwHeSlTPdAqwGnLG9AX8P+zPAJ+zQFVbpCR8BB6hza9 v1ww== X-Gm-Message-State: ACgBeo1lpp1x0Sb5fk+iFVH7doeuShdq4weMoi87CuvfFL05KZQ3I6Og SVFMi+md6A74fc8jcRciDRU= X-Google-Smtp-Source: AA6agR4sbf99JKsLxKVuS5xayAtzG3C7cM4E2lMtXzTvnk5eUXytscD+jxK5oqXO49TLM4d6dt9T7w== X-Received: by 2002:a50:ed82:0:b0:43d:5334:9d19 with SMTP id h2-20020a50ed82000000b0043d53349d19mr19233350edr.232.1660666146485; Tue, 16 Aug 2022 09:09:06 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id l22-20020aa7d956000000b0043d8d0ba6a3sm8679988eds.85.2022.08.16.09.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Aug 2022 09:09:05 -0700 (PDT) Message-ID: <3071ca0bf84374b6187c53a3eb6ba89c9becedcb.camel@gmail.com> Subject: Re: Tempel snippets From: Liliana Marie Prikler To: Andrew Tropin , Nicolas Graves , 57069@debbugs.gnu.org Date: Tue, 16 Aug 2022 18:09:05 +0200 In-Reply-To: <87o7wkolyk.fsf@trop.in> References: <87a68dpvre.fsf@ngraves.fr> <3582f9ef0c1fcc30719dd1479812354169d14277.camel@gmail.com> <87tu6j5moa.fsf@ngraves.fr> <39edb2a4b03ca1a052120fcebd5919350d65a779.camel@gmail.com> <87o7wkolyk.fsf@trop.in> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 16.08.2022 um 07:23 +0300 schrieb Andrew Tropin: > On 2022-08-11 17:53, Liliana Marie Prikler wrote: > > > Am Donnerstag, dem 11.08.2022 um 08:17 +0200 schrieb Nicolas > > Graves: > > > > > > > - I couldn't match a small part of current yasnippet > > > > configuration, > > > >   currently only the part in uri when url-fetch is chosen. Sent > > > >   a "help/feature report" here > > > > https://github.com/minad/tempel/issues/65. > > > > > > > > If this is possible, we could probably further factorize and > > > > integrate the > > > > snippets logic, maybe to reach something like that for origin > > > > expansion. > > > > > > Daniel Mendler confirmed that recursive templates were not > > > supported, > > > hence I cannot further improve snippets.  I've sent an updated > > > patch > > > with "-build-system" added only once at the end. > > > > > > Waiting for them to be adopted ;) > > I'll reply to the actual patches with the review. > > > > > PS : it would be great to add a "snippets" output to the guix > > > package, so that one can use (file-append guix:snippets > > > "/tempel/") > > > to include them in a guix home configuration. > > Note that you can (file-append (package-source guix) > > "etc/snippets") > > Probably not yet, there is no build phase, which copies etc/snippets > to out so far. You don't need a build phase to copy from an origin, do you? From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 17 00:26:56 2022 Received: (at 57069) by debbugs.gnu.org; 17 Aug 2022 04:26:56 +0000 Received: from localhost ([127.0.0.1]:49090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOAds-0004Gs-4H for submit@debbugs.gnu.org; Wed, 17 Aug 2022 00:26:56 -0400 Received: from relay12.mail.gandi.net ([217.70.178.232]:34393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOAdl-0004Ga-B1 for 57069@debbugs.gnu.org; Wed, 17 Aug 2022 00:26:53 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id 6AEA0200005; Wed, 17 Aug 2022 04:26:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1660710403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=gSyXBEr0lR4WLUr3PhCG5/hRP2zLh75l9WszaoK2c+Y=; b=oS/lIntKJ9cx8KvbHorCvpm6EFCDD/elWi0dTNKjxeCvJYamSHZ42fkn5NJ4w5eDrD6ihr EAh+SR1BitjlduoVvKoGYsq38rGGGlDnok70DJ0SENZdbWLhk4AYkS2bUVEXDFfwcLDAwE AriHghUma2EXi0MHA3uCpirLr7ihg8k+8GL6sxYu0Pe8kaCjVwyfeiNw7bRcL066Dab1cD 6PlKnzNFhlWHhn5ZQn/Bp+71NIXvcgNM089CJsg2rGh19o0Vb9kzzUD4PBs+uW1MUF2ny4 iNoIHb9wrZFPyylcA54Na77T94Eds9PNHCde4PkYWLY/FPZ8Owj37p/g3BuFZg== From: Andrew Tropin To: Liliana Marie Prikler , Nicolas Graves , 57069@debbugs.gnu.org Subject: Re: Tempel snippets In-Reply-To: <3071ca0bf84374b6187c53a3eb6ba89c9becedcb.camel@gmail.com> References: <87a68dpvre.fsf@ngraves.fr> <3582f9ef0c1fcc30719dd1479812354169d14277.camel@gmail.com> <87tu6j5moa.fsf@ngraves.fr> <39edb2a4b03ca1a052120fcebd5919350d65a779.camel@gmail.com> <87o7wkolyk.fsf@trop.in> <3071ca0bf84374b6187c53a3eb6ba89c9becedcb.camel@gmail.com> Date: Wed, 17 Aug 2022 07:26:36 +0300 Message-ID: <87czczv6kj.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 57069 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2022-08-16 18:09, Liliana Marie Prikler wrote: > Am Dienstag, dem 16.08.2022 um 07:23 +0300 schrieb Andrew Tropin: >> On 2022-08-11 17:53, Liliana Marie Prikler wrote: >>=20 >> > Am Donnerstag, dem 11.08.2022 um 08:17 +0200 schrieb Nicolas >> > Graves: >> > >=20 >> > > > - I couldn't match a small part of current yasnippet >> > > > configuration, >> > > > =C2=A0 currently only the part in uri when url-fetch is chosen. Se= nt >> > > > =C2=A0 a "help/feature report" here >> > > > https://github.com/minad/tempel/issues/65. >> > > >=20 >> > > > If this is possible, we could probably further factorize and >> > > > integrate the >> > > > snippets logic, maybe to reach something like that for origin >> > > > expansion. >> > >=20 >> > > Daniel Mendler confirmed that recursive templates were not >> > > supported, >> > > hence I cannot further improve snippets.=C2=A0 I've sent an updated >> > > patch >> > > with "-build-system" added only once at the end. >> > >=20 >> > > Waiting for them to be adopted ;) >> > I'll reply to the actual patches with the review. >> >=20 >> > > PS : it would be great to add a "snippets" output to the guix >> > > package, so that one can use (file-append guix:snippets >> > > "/tempel/") >> > > to include them in a guix home configuration. >> > Note that you can (file-append (package-source guix) >> > "etc/snippets") >>=20 >> Probably not yet, there is no build phase, which copies etc/snippets >> to out so far. > You don't need a build phase to copy from an origin, do you? Oh, I missed (package-source ...) call. You are right, this should do the trick! =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmL8bfwACgkQIgjSCVjB 3rDgTRAAjGGSGw+EdAlcuG1UFLFvn+Xq4ow/J5oxB0xf8kiYKB9afVSdicaGe/OM j6fUHfJmo5UTC6LvUYLr4AUKt122fKO8+99Moqn7+fLaU4m0fZ+kKDGNbDD1uiTL 8NGHJ4DpVgYzPDjjCRMO6AsjLA0EYHdDYZ6N4NazxrLSCs6gqMW7/XxpW5zkYvEv Me5S6YhKvb5OhmO3IyzJS4JYnavzIVVFOBX7VgRTrb1YYalt9zFGuhwUPxPzypRa BUdRGiKW7i6EG6Pz94EyIxAftE5rEZnHO1y3a2S1a7VIOjpsFP5tFWgWvO/OZphx 8QmDiB/LcrUa/JCluEi9K0kSo3bvopnq9EHhMneLtzaXViq6FDfwFgy9JjGfVHqK IAEPcz+kK+/vyVeNDPXSCsz5aJFzqFtXOKnT25IabrDqinHNxc1jkfNB+2K05wsL whp5GOosHBy8aj7V0iunEjppdW97YQrejybrRC3dnp4taM9tRvvlqAQbEKLcmgL+ IT5e7IasZo/qrFXI5CJ359ChFy2b6jeVe2YHNNJahjR3Gm1cynmnNXM7jbiOrIq/ p/FoFYkWTFTnc7PyJkNFj3hfqheC8rPz63J2qoQA9RvgxS8LV6uNBNu6db8RLEcB rQSbWC051BIIdwDvRpCRB6LqWnRVO3qaQCh0Sf6CACs3BwYGLkU= =DfQv -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 30 05:51:44 2022 Received: (at 57069) by debbugs.gnu.org; 30 Aug 2022 09:51:44 +0000 Received: from localhost ([127.0.0.1]:34784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSxuJ-0000Rr-Sn for submit@debbugs.gnu.org; Tue, 30 Aug 2022 05:51:44 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:35736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSxuH-0000Rd-Mx for 57069@debbugs.gnu.org; Tue, 30 Aug 2022 05:51:42 -0400 Received: by mail-ej1-f66.google.com with SMTP id og21so21007648ejc.2 for <57069@debbugs.gnu.org>; Tue, 30 Aug 2022 02:51:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:from:to:cc; bh=GDezZFMvJI82Iod/8GuujkZftz+Mu9s6ZGuPG59+czU=; b=bRa//g9pOjXDEmvX8agLYskw0Sm2fksOu9Dy87jf+jUuhsHpysc82Jfs3D6hTuoNaA 9p+B8tjsYP9szdepzNCnrfUhRF4NWTquy0OdBVzqGd6homIH0JAKsSl4zhnHVtI2K5P/ iT/9U7I8/Kvk0z6DAM2nihwh2i7hZsS9xyxAj6lciDWFWBbXJQX2ljSlWQtCshSAZwoN BQBAwOgSDuhSN0ghcih0ZunEkYMqci+ftkZQ21KutSR40R+fSMZArhxoF4jiVJsIsntT vsQQRB0LWZF3txkRFmOV4pesC6vpxeoQYtlqx1WavPQjQwLvJfKYg5eXpYfRMysQYmzI /pcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc; bh=GDezZFMvJI82Iod/8GuujkZftz+Mu9s6ZGuPG59+czU=; b=VYd9HbxBbH7dl/WlneHK7nZlSlcuDocwt3QyXUW8RvMy/FaW2s2i0TrgaaJdQWPPko HRl+EKqTq3B2a2y29Uty2ZTkvEv4S9wVWdOUW19v6VkBz4lBPkk7PtaGVcillJfGi8FU H5F7o3Jt+O9JpDMGYJLuGXk7gTTq93qUyMZG0efWgbKoFcxWcQdwUTAm6p/EAvvPbgPa CxNohUqMyjJp9s10/fPo3FObd3uHYHnz4YsaFfenXINJXGanI1v2PvuXAuDFQM7KAGUu tPQVQIuPF1crsS47pacRilsEON6VZiErOvV83whXX3wLqq0G5ZkG9WLTLnpGO79e9yu3 Df2A== X-Gm-Message-State: ACgBeo3KOCQnEphb5uo1EoySi54KpxbqsXE1lKDKX1AamANyKPf6QZ3r Ltl4s5zi5O2F+7yprcWjRGU= X-Google-Smtp-Source: AA6agR7WRQDivIdwBbDl4Ig+wwcBYRn4lvZtQeA/N9ZCfLJDQN6FFc/BoP2xJQkKElX+Bl5FcYKwdg== X-Received: by 2002:a17:907:2bf9:b0:73d:dd00:9ce8 with SMTP id gv57-20020a1709072bf900b0073ddd009ce8mr14464821ejc.151.1661853095518; Tue, 30 Aug 2022 02:51:35 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id u26-20020a1709064ada00b007313a25e56esm5581328ejt.29.2022.08.30.02.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 02:51:34 -0700 (PDT) Message-ID: <5da120ffb052cbe3a3aaa684b5cde7092be45b7b.camel@gmail.com> Subject: Re: [PATCH v2] etc: Add tempel snippets. From: Liliana Marie Prikler To: Nicolas Graves , 57069@debbugs.gnu.org Date: Tue, 30 Aug 2022 11:51:33 +0200 In-Reply-To: <87czd69e4a.fsf@ngraves.fr> References: <20220811060745.6892-1-ngraves@ngraves.fr> <87czd69e4a.fsf@ngraves.fr> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 12.08.2022 um 08:20 +0200 schrieb Nicolas Graves: > > > +text-mode :when (git-commit-mode) > > Here I have a bug when magit has never been opened before opening a > text-mode file, saying that git-commit-mode is not defined. Not sure > what the best way to resolve this is. Will investigate that. A strange error indeed. I encounter a similar one if I use emacs as EDITOR in git. > > I'd suggest skipping the completing-read and just (p "gnu").  Most > > build systems should be easy enough to type without autocompletion. > > But then you have to know the name and loose the listing if you're a > beginner and not sure. I'm fine with both options. I will follow your > suggestion if you confirm that you took this type of user into > account and still prefer just (p "gnu"). The reason I prefer (p "gnu") is because completing-read completely breaks tempel. Yes, I'm aware that this won't yield complete feature parity between tempel and yasnippet, but you have to consider that these *are* distinct systems after all. FWIW you could try using NOINSERT t for the p, but I'd hazard a guess that that still won't give you the prompt at the right time with the correct safeties. > > Here, I think (p "url-fetch"), but (s "method") might also work. > > I'm not sure I understand what you meant here. Can you write the > final method you would get this way? I got (p "url-fetch" method), which uses "url-fetch" as default value and binds method. > > Will this cl-case be dynamically recomputed?  I wonder if we can > > get the result of the previous p/s here... > > Yes it is recomputed. p/s stores the variable and for evaluations > "Named fields are lexically bound." It works when tested, we can get > the result of the previous p. As Daniel Mendler stressed here > (https://github.com/minad/tempel/issues/65), there is no possibility > to do a recursive template i.e. with a FORM evaluating to elements of > a snippet. So the best thing we might do with conditionals is to > return a string. Bummer, but I got something working out of it anyway. > > Rather than that I think adding a template (git-file-name...) which > > expands to (file-name (git-file-name (p "name") (p "version")) and > > variants for the others is a better idea. > > In most guix packages, it is left as simply name and version strings, > since they are defined for the package itself. I took the same > approach as the yasnippet template, since these field are almost > always left untouched. I don't see the benefit of this other > approach. The benefit would have been that auto-completion is relatively cheap, so folks could just write git, see git-file-name, TAB, M-RET, done. > Your other comments have been taken into account, I'm sending an > updated series as soon as I'm done with the git-commit-mode issue. > Feel free to send an idea for this issue if you have one! I see you already solved it, so I'm now processing v3. As laid out above, I replaced all occurrences of completing-read with simple ps, as those are easier to work with in tempel. I did keep your cl-case to conditionally insert git-file-name, etc. but I fixed it up a little so that it's dynamically recomputed. I also fixed up the documentation and dropped the license: completion as it was a completing-read once more. You could replace those with a bunch of self-expanding snippets, but I think geiser and/or dabbrev ought to have us covered here. Cheers From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 30 05:53:26 2022 Received: (at 57069-done) by debbugs.gnu.org; 30 Aug 2022 09:53:26 +0000 Received: from localhost ([127.0.0.1]:34791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSxvy-0000Ua-El for submit@debbugs.gnu.org; Tue, 30 Aug 2022 05:53:26 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:45638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSxvx-0000UL-Ad for 57069-done@debbugs.gnu.org; Tue, 30 Aug 2022 05:53:25 -0400 Received: by mail-ed1-f68.google.com with SMTP id u6so13424716eda.12 for <57069-done@debbugs.gnu.org>; Tue, 30 Aug 2022 02:53:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:from:to:cc; bh=Q7v8vx1SAKOTyz+Z8q0PEjAXwQ7pD0BQ7MlcC68ATKE=; b=kimw6PjhrQLL6UDOZr0VQBfilxaYvjSniOmAANphbSgwi5TX6TOGPs9+/PJ+9hvs+d JSFM3b5SU/i44WBIjd7TeO3Qrq4QUtRpeZ6pJqrCJDudwVc0jjpWDQ1xpIovk32kFlQ9 B7cSJUVK6vKGuIUIOwDaIuf4hZd6dUeHYVkkkuPDZbp6Vf+BWWQ7bVs+qkabZ06Rxm8/ Y1eLYwAf3oLBW5dyh7kKRVdQpeGnayy0SokHRw/TTtoAdvrQo0AwJn6kuaq/iaSoyBEs MyoPitVQGbqsAkL6OGzKxgTstAPaXQ3ZViS6i+fjJMm/Gd0em4yVe0ZnHare8Fu8TAYx xx1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc; bh=Q7v8vx1SAKOTyz+Z8q0PEjAXwQ7pD0BQ7MlcC68ATKE=; b=rvHvySgLhRWC+oRn9uE8e4NPbtpYy7S8B4GScDWOUHkiaSo+BSwAKnqzsYxtskn46r hsg9ih5OLKCMnTNHtDlyUryMO9wh+d8LZGmJZIIufEYmOHmE6iqokeJ3fcr/+5cnZvtG vEMWcyXDqaS3T2mdVE5WpEsYfK5cCcv2TNh94T02uOf88lNmFTPiLtckkrXy6bFagWgl osNUd+omY0NA7/9K9YqPF/9NBO3AAGjcX9+cY+XBqkA7RJKbB73g6NcuA+k58hkNIw4G Jbr/gHqSEXc7kb9wYOOnsscj4Yn2x8gSDzvdOml9FZWkA8dBxn6J5wGi/6/8jK9JIndV rAVQ== X-Gm-Message-State: ACgBeo2/aIQoNd9qHbdKyU6a/Jkg4TNgqKnJLI+yyqRvU5OR+5NE2mev fZ/3DNAf5CmFWbJ5kh7orX41znfgYjk= X-Google-Smtp-Source: AA6agR4EAbIUtJu7hgCbZp/7JV8TPYbjhTjB5j0iidy+Qs2KKjagNDOjDxIrWsptZkDiynCmpcUz2A== X-Received: by 2002:a05:6402:5292:b0:446:80b0:4a5d with SMTP id en18-20020a056402529200b0044680b04a5dmr19818213edb.285.1661853199556; Tue, 30 Aug 2022 02:53:19 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id u21-20020a170906781500b0072f42ca292bsm5491346ejm.129.2022.08.30.02.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 02:53:18 -0700 (PDT) Message-ID: <9a805e4a8ca135262e8fa5a855d101e37581e31e.camel@gmail.com> Subject: Re: [PATCH v2] etc: Add tempel snippets. From: Liliana Marie Prikler To: Nicolas Graves , 57069-done@debbugs.gnu.org Date: Tue, 30 Aug 2022 11:53:18 +0200 In-Reply-To: <5da120ffb052cbe3a3aaa684b5cde7092be45b7b.camel@gmail.com> References: <20220811060745.6892-1-ngraves@ngraves.fr> <87czd69e4a.fsf@ngraves.fr> <5da120ffb052cbe3a3aaa684b5cde7092be45b7b.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 57069-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Dienstag, dem 30.08.2022 um 11:51 +0200 schrieb Liliana Marie Prikler: > I see you already solved it, so I'm now processing v3... Marking as done, since I did push the modified v3 Cheers From unknown Wed Aug 20 05:16:37 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 27 Sep 2022 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator