From patchwork Thu Nov 22 14:42:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 277 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1736816847; Thu, 22 Nov 2018 14:43:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id C01AB16843 for ; Thu, 22 Nov 2018 14:43:08 +0000 (GMT) Received: from localhost ([::1]:47184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPqCB-0000jV-Ql for patchwork@mira.cbaines.net; Thu, 22 Nov 2018 09:43:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPqC9-0000io-46 for guix-patches@gnu.org; Thu, 22 Nov 2018 09:43:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPqC6-0005aq-0t for guix-patches@gnu.org; Thu, 22 Nov 2018 09:43:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:36445) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gPqC5-0005ai-Tn for guix-patches@gnu.org; Thu, 22 Nov 2018 09:43:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gPqC5-0007L8-QM for guix-patches@gnu.org; Thu, 22 Nov 2018 09:43:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33466] [PATCH 1/2] repl: Do not exit repl on SIGINT. References: <20181122144007.30568-1-go.wigust@gmail.com> In-Reply-To: <20181122144007.30568-1-go.wigust@gmail.com> Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Nov 2018 14:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33466@debbugs.gnu.org Received: via spool by 33466-submit@debbugs.gnu.org id=B33466.154289777328185 (code B ref 33466); Thu, 22 Nov 2018 14:43:01 +0000 Received: (at 33466) by debbugs.gnu.org; 22 Nov 2018 14:42:53 +0000 Received: from localhost ([127.0.0.1]:40700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPqBw-0007KX-Pl for submit@debbugs.gnu.org; Thu, 22 Nov 2018 09:42:52 -0500 Received: from mail-lf1-f50.google.com ([209.85.167.50]:42745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPqBu-0007KJ-Lq for 33466@debbugs.gnu.org; Thu, 22 Nov 2018 09:42:51 -0500 Received: by mail-lf1-f50.google.com with SMTP id l10so6693386lfh.9 for <33466@debbugs.gnu.org>; Thu, 22 Nov 2018 06:42:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RL+LbZT/ekWvEB0gEjdMv+07FlztkGTCcpAw48Yk3zE=; b=M1Sq6HBollUh9iNk/POH75KaMmErKBA2PfEXT2A0snf8tSDQzynVt9MD20a8p0Ci4m kTFHnEdY27wXtz5+8ghByC9SC1gkrgFsyQ4/0lqjdkvF1U9N2HlPFuL3ooeKL6JfXrhv nDI6O43DGQX+e2mBb5W+4S6bjGmEhlzKDzWySi4u1wHHuELVHKJugA8XE/gZaVcdv15N Or8RCpJ8FGkzxuMp6dfNV+1Mgarx68+4C4KVsuxp4RbA1r4TIAoXM5vZ2Lpotk+LAEFt a5RT8/gmPQ4S3O3UHgkGS6pIO2EfC/0qTh+/6OwSbwlJN6blL8zWjubNpq4jWJYcUJsB sXmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RL+LbZT/ekWvEB0gEjdMv+07FlztkGTCcpAw48Yk3zE=; b=tEXl3VyfiBf93VTtW355hf6H1VcYHiuOnKAfKssDYnEKU5da5jqm9yHfjo0CunH2hJ sGmtmoqBsLDYkCX4zyLnElT3/nE3aSIP5JZ1n350zbUN12mSThadaRgo1TNvj19KoDLL K1HOAyZaUDwDBQUnlSDL0AJHBwpvLkOuLqII3FYZw7uh96eNwK8H/HnOHaTr9NeUuvk9 MbTZ2wUWOrlypCRIUWBnFgprJLfh2BBWZnP89knPBkEp3xqlGpd7FtkELoCEOaqziVbM DRuauWgmvlYnl4FtX7cou1qaD4AM3i7b5L8ZKyQSQ5BtpxiI7j/S+qZ1Nj2TlmEahz3F 05jw== X-Gm-Message-State: AGRZ1gKS2vRdd2bq7ibQGUmbTsVyjb5nLEkGgsOEqsBCnxXjUwX54WnO MyWapF5jkHfB9mSMtxajlhzi0csEBUI= X-Google-Smtp-Source: AJdET5d+j7+6FyXVYFVeLBLp9m5KQyvpj5VoVcQwC3uCr151Yd88ia0SSPEo2+7QKvrCOwiIsN+Qfw== X-Received: by 2002:a19:e01e:: with SMTP id x30mr6402773lfg.89.1542897764083; Thu, 22 Nov 2018 06:42:44 -0800 (PST) Received: from localhost.localdomain (92-100-251-83.dynamic.avangarddsl.ru. [92.100.251.83]) by smtp.gmail.com with ESMTPSA id h85-v6sm6678917ljf.68.2018.11.22.06.42.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 06:42:43 -0800 (PST) From: Oleg Pykhalov Date: Thu, 22 Nov 2018 17:42:27 +0300 Message-Id: <20181122144228.31573-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/repl.scm (guix-repl): Do not exit repl on SIGINT. --- guix/scripts/repl.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index b157833a4..1a105f51e 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -188,7 +188,10 @@ call THUNK." (save-module-excursion (lambda () (set-current-module user-module) - (start-repl)))) + ;; Do not exit repl on SIGINT. + ((@@ (ice-9 top-repl) call-with-sigint) + (lambda () + (start-repl)))))) ((machine) (machine-repl)) (else From patchwork Thu Nov 22 14:42:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 278 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 229CB16847; Thu, 22 Nov 2018 14:43:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id CCD3416843 for ; Thu, 22 Nov 2018 14:43:14 +0000 (GMT) Received: from localhost ([::1]:47185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPqCH-0000k5-H5 for patchwork@mira.cbaines.net; Thu, 22 Nov 2018 09:43:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPqC9-0000j2-U2 for guix-patches@gnu.org; Thu, 22 Nov 2018 09:43:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPqC6-0005bV-Gt for guix-patches@gnu.org; Thu, 22 Nov 2018 09:43:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:36446) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gPqC6-0005bE-D5 for guix-patches@gnu.org; Thu, 22 Nov 2018 09:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gPqC6-0007LF-9g for guix-patches@gnu.org; Thu, 22 Nov 2018 09:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33466] [PATCH 2/2] repl: Add 'colorized' and 'readline' support. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Nov 2018 14:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33466@debbugs.gnu.org Received: via spool by 33466-submit@debbugs.gnu.org id=B33466.154289777728202 (code B ref 33466); Thu, 22 Nov 2018 14:43:02 +0000 Received: (at 33466) by debbugs.gnu.org; 22 Nov 2018 14:42:57 +0000 Received: from localhost ([127.0.0.1]:40703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPqC1-0007Ko-0R for submit@debbugs.gnu.org; Thu, 22 Nov 2018 09:42:57 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:43780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPqBz-0007KO-Cu for 33466@debbugs.gnu.org; Thu, 22 Nov 2018 09:42:55 -0500 Received: by mail-lj1-f196.google.com with SMTP id 83-v6so8156695ljf.10 for <33466@debbugs.gnu.org>; Thu, 22 Nov 2018 06:42:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LsM3nYq+OALq6tCLgXbjdKklFNbyqTpyLiIjjypvxxA=; b=knWf1/q1kvhcmlg2I9y4nCqF+0bd93PykyxSbDWRc+ESznLetrsou5t9tSJArFRNoG BO/ovSGXm7MuX0ksI0TBC5zoZjqoNskrfBZe3N92BeslZYfEX5I0IkuC9VpoeThbVHOt IRbCeW4AXzyx1eYN9RuxOtM+WFyVfSax1gDSdAXmjTucV4VB3r03crlaUQ8Swi+cxFpL a23gKLKkiBzyGDbaDutc3ccfaBDQULH1gpr3FqpqjT/fKbSvmGUGSdGbacVKzey6ve01 TfXEcbRg7uc9IWD3XEynmcFI1PGiO+X4wQsvD8+DeoYUL3cUVJu2BUS69IkJDyDfaxRw CFkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LsM3nYq+OALq6tCLgXbjdKklFNbyqTpyLiIjjypvxxA=; b=i/bujc6c6MBz3IdmtNquAR+m6AF1zIknVdZu/QjuhO3+x5KsqoSP/TrP8nxwBeE1uu CkcidLSyru+49goBuWdXvEr01xxqI3OUnmWwKHzfu96HtyzZ7SL3ZWDT5ub8R4A2Xi3C /E9CvbuhCm46oXv9JIn0u4t4jRpMT2peOLB/nCBe0yAIfdgv4T7ZZ6RCeEYk5ug+odWx XqcsroC8aZYIjqEqsmr0+zBYmVFa7tHOe8J7W5Xi9giWlrcbFtKjteqeUE6QgQ+4So55 4qmaV45nQf19ISnYOfsZIRuCc3HhiP1W6870a1xyWZIZiOOZo2dDYeB9MyERfPJ9ixnH gI8g== X-Gm-Message-State: AA+aEWYBy3ebq9k3ek/ylah5Ely4V8sythKSx5HbritRRDQI0ZcE6Sxv yfqOioRMP9XyYYltwHQr2F6YvTCQCJA= X-Google-Smtp-Source: AFSGD/WAIXsbvzCDgA4+EhCHTZkRIdM+UyUC398ECKTyLgHnClaI6PcHgAbjn+458+40vYDXXhjSUg== X-Received: by 2002:a2e:710a:: with SMTP id m10-v6mr7079936ljc.66.1542897768921; Thu, 22 Nov 2018 06:42:48 -0800 (PST) Received: from localhost.localdomain (92-100-251-83.dynamic.avangarddsl.ru. [92.100.251.83]) by smtp.gmail.com with ESMTPSA id h85-v6sm6678917ljf.68.2018.11.22.06.42.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Nov 2018 06:42:48 -0800 (PST) From: Oleg Pykhalov Date: Thu, 22 Nov 2018 17:42:28 +0300 Message-Id: <20181122144228.31573-2-go.wigust@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181122144228.31573-1-go.wigust@gmail.com> References: <20181122144228.31573-1-go.wigust@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/repl.scm (guix-repl): Add 'colorized' and 'readline' support. --- guix/scripts/repl.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index 1a105f51e..eeaf4acc4 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -188,6 +188,23 @@ call THUNK." (save-module-excursion (lambda () (set-current-module user-module) + (cond ((false-if-exception (resolve-interface '(ice-9 readline))) + => + (lambda (module) + ;; Enable completion and input history at the REPL. + ((module-ref module 'activate-readline)))) + (else + (display "Consider installing the 'guile-readline' package for +convenient interactive line editing and input history.\n\n"))) + (unless (getenv "INSIDE_EMACS") + (cond ((false-if-exception (resolve-interface '(ice-9 colorized))) + => + (lambda (module) + ;; Enable completion and input history at the REPL. + ((module-ref module 'activate-colorized)))) + (else + (display "Consider installing the 'guile-colorized' package +for a colorful Guile experience.\n\n")))) ;; Do not exit repl on SIGINT. ((@@ (ice-9 top-repl) call-with-sigint) (lambda ()