From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtVgL-00010s-Qr for guix-patches@gnu.org; Sun, 17 Sep 2017 05:16:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtVgI-0000iK-MT for guix-patches@gnu.org; Sun, 17 Sep 2017 05:16:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35779) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dtVgI-0000hk-HJ for guix-patches@gnu.org; Sun, 17 Sep 2017 05:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dtVgI-0006NR-6n for guix-patches@gnu.org; Sun, 17 Sep 2017 05:16:02 -0400 Subject: [bug#28381] [PATCH] gnu: emacs-skewer-mode: Install html and js files. Resent-Message-ID: From: Oleg Pykhalov References: <87wp5azpab.fsf@magnolia> <87bmmjsk4j.fsf@gmail.com> Date: Sun, 17 Sep 2017 12:15:18 +0300 In-Reply-To: <87bmmjsk4j.fsf@gmail.com> (Alex Kost's message of "Sat, 09 Sep 2017 23:16:28 +0300") Message-ID: <87377ladp5.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Alex Kost Cc: 28381@debbugs.gnu.org --=-=-= Content-Type: text/plain Hello Alex, Alex Kost writes: > Oleg Pykhalov (2017-09-07 15:06 +0300) wrote: > >>>>>From 1cc40f4a0088cbed1ae9f6ca0efdf89a52bf01a5 Mon Sep 17 00:00:00 2001 >> From: Oleg Pykhalov >> Date: Thu, 7 Sep 2017 15:03:31 +0300 >> Subject: [PATCH] gnu: emacs-skewer-mode: Install html and js files. >> >> * gnu/packages/emacs.scm (emacs-skewer-mode): Install html and js files. >> --- >> gnu/packages/emacs.scm | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm >> index 9c0f9bc89..a7ec0b146 100644 >> --- a/gnu/packages/emacs.scm >> +++ b/gnu/packages/emacs.scm >> @@ -1967,6 +1967,21 @@ serve files and directory listings.") >> (propagated-inputs >> `(("emacs-simple-httpd" ,emacs-simple-httpd) >> ("emacs-js2-mode" ,emacs-js2-mode))) >> + (arguments >> + `(#:phases >> + (modify-phases %standard-phases >> + (add-after 'install 'install-html-js >> + (lambda* (#:key outputs #:allow-other-keys) >> + (let ((skewer-mode (string-append (assoc-ref outputs "out") >> + "/share/emacs/site-lisp/guix.d" >> + "/skewer-mode-" >> + ,version))) >> + (for-each (lambda (file) >> + (install-file file skewer-mode)) >> + '("example.html" >> + "skewer-everything.user.js" >> + "skewer.js"))) >> + #t))))) > > I think it would be easier to use '#:include' instead of this phase, > like this: > > (arguments '(#:include '("\\.el$" "\\.js$" "\\.html$"))) > > What do you think? If it is OK for you, could you please send an > updated patch? Sure, it's better. Thanks for great suggestion. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-emacs-skewer-mode-Include-html-and-js-files.patch >From 595a0e662d9e18f366870497555dee77ea22dae2 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 17 Sep 2017 12:08:11 +0300 Subject: [PATCH] gnu: emacs-skewer-mode: Include html and js files. * gnu/packages/emacs.scm (emacs-skewer-mode): Include html and js files. --- gnu/packages/emacs.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2b82ced4e..5839f0faf 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1979,6 +1979,9 @@ serve files and directory listings.") (propagated-inputs `(("emacs-simple-httpd" ,emacs-simple-httpd) ("emacs-js2-mode" ,emacs-js2-mode))) + (arguments + '(#:include + '("\\.el$" "\\.js$" "\\.html$"))) (home-page "https://github.com/skeeto/skewer-mode") (synopsis "Live web development in Emacs") (description -- 2.14.1 --=-=-=--