From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Re: master f866c85ac4e: (jsonrpc--log-event): Try and fix bug#68072 Date: Sun, 07 Jan 2024 18:38:31 +0800 Message-ID: <87jzol77iw.fsf@yahoo.com> References: <170460373801.27011.3995281640682361109@vcs2.savannah.gnu.org> <20240107050218.48567C002E0@vcs2.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28753"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Stefan Monnier To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Jan 07 11:39:23 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rMQYt-0007IM-JK for ged-emacs-devel@m.gmane-mx.org; Sun, 07 Jan 2024 11:39:23 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMQYV-0005t7-Rw; Sun, 07 Jan 2024 05:38:59 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMQYK-0005sr-Hu for emacs-devel@gnu.org; Sun, 07 Jan 2024 05:38:48 -0500 Original-Received: from sonic303-21.consmr.mail.ne1.yahoo.com ([66.163.188.147]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMQYI-0006X8-5n for emacs-devel@gnu.org; Sun, 07 Jan 2024 05:38:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1704623924; bh=t43QhyPuTjeanQddQ2Fe0cSeptNwbHvizDbHWz9qE3g=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=QmvZb9b8D2qFzALSav+dbTwgC1WW5oIB64HWODWBisApxvS9xAOTXpfrFP043mrsj9WXwAkxtxuDntqMa/GyvWu9y9aYGeIJo7sAfY4ug1NQk3s/wpa+9BKGA2em2UJYJPANZHLsLS8hAb4OQYYclPNJB1JHwrEhnKpTg4PZzjMTw++xwxdGsV22i/A8wc0AoGmYgeEAWkyQiB9ooRlsgthMIpjKFzWz7CAZxT9HYnV9Z8TDlLt35P1xvFiQoKmFj7W97zYLdb7e6oTX2oeLCZFuPxRecEqTqZmjI55ozRdqnJzlXisUoPonqXwve8GILPEISWyGe9l0DttSfU9QVw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1704623924; bh=criOF0rj+b1FIPg0p/r1beUWnDdCfhCmiZ9QxbG9zq0=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=Xlclc/d2zh8DTsszJNodzr7bE0TAhj1ibCXTuy2FrwToKXsL3Hw+PTR2bxjLnOV+RCaZ5jdejB5wyeUWXamvdOgv4rgQtoqUF+WckCH98kSHr4pib2PzbtudONhpKaj8b34JUwupO9nWaFta6808d5O9sKVFaaQLrjPQ4RyYZwqXva0UJe6NrOew1CwGoisL3zYItFIo+EImPzsg+0InCdn65VW/5VExzlabjzfs9Gmw9kB0XnfY88BG+g1Cog4Wsgg8TqHOiPJC6fSmaWk7EYt8EoZ+cT2Qb+bLgb9ry1DkyH+UoayBh7vaLs5cJwHNcfw0E1tXyg8Wyq+F/5Hn+w== X-YMail-OSG: tnIIMuYVM1nCkvvse9EyEVJVt2WtFNSPGuBvbMCA7OvP5u66yTboG_2T3rz_S35 QbpuH0dby.sHcSzgGaWw_.E40fgSFwBchNj3JY1EjhYlvMICb22Y5e.WdOY7NDItrI8tbQlroooI Me3vTM7LNKkLngGGKI21_aUqAOhDE5MX6LK5WE6WQ0xBakMNRolAdtL6PMIJtbx7uTt_aYsQ0WMo rUEXYm75eDCfuFQKzuF0I7HRn3GSEWA.j1u1wwnLm7wNx0Cr36e8MKD2XhsrAgmGi9M_1.mZWx6w BwzZpeLuSt_rqEB1Tb2l6WeTrt8oZeq757Xzenm5dHFcb010joYiSl6M.xkojk3MqCNeseTvwqZS oWbqGqcnoCqHaMif02cQ97mSRJp5qOzYLaYz6VqzKfUd7mw7GwFHaUrPORZqysSnIDAXyZw5qWWH pBOVnxHhet_J8NaHpOyVofgDVAqb3TdcDO8ECIvqlkjRk423P3Ak31Nybu7i09jiyULvKyV4KJ9o .tYq8_wsiXHDgyU7b95_RJ9OcHC_Tc6syvUjhZum_FUnVy9tYmpbfCDc1qoolMRoloZtQ6ZFkHE2 dm6aHrl52o3Wt321WbfVSud0xtEufeorxOBoNzNfTIR1uiyJpvyVExMrsxug93elj1fmWhj2w3eE vdpFHYEvCZUz5L.bjQ_qJ7QTif.yPc6T4DUIRD7St95upDMkutFlb35Yky.z2jJSKKa99qlsA_kH jqejyB_ZRukUadX4hJzFD5hXz9bUioLgrOwkS4sNl8_7jfglUJp5eh6UBEToy00yuzh83qzE2YQ9 ZZbirx2BLu3U.f7yuze1L3MtHXUBGg3glrX.j9TUn1 X-Sonic-MF: X-Sonic-ID: 92a0cec3-d7f8-44dc-9e52-11e0d4e775f3 Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.ne1.yahoo.com with HTTP; Sun, 7 Jan 2024 10:38:44 +0000 Original-Received: by hermes--production-sg3-65d57d948b-rd6qq (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 760b537540747a86796028efb8aee3b5; Sun, 07 Jan 2024 10:38:36 +0000 (UTC) In-Reply-To: <20240107050218.48567C002E0@vcs2.savannah.gnu.org> (Stefan Monnier via Mailing list for Emacs changes's message of "Sun, 7 Jan 2024 00:02:18 -0500 (EST)") X-Mailer: WebService/1.1.21952 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.188.147; envelope-from=luangruo@yahoo.com; helo=sonic303-21.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:314678 Archived-At: Stefan Monnier via Mailing list for Emacs changes writes: > branch: master > commit f866c85ac4e32df8061b285b6b44b15346994f3d > Author: Stefan Monnier > Commit: Stefan Monnier > > (jsonrpc--log-event): Try and fix bug#68072 > > * lisp/jsonrpc.el (jsonrpc--log-event): Force the use of > `lisp-indent-function` in `pp-to-string`. > --- > lisp/jsonrpc.el | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > > diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el > index 3f33443f321..f0f5842a0ee 100644 > --- a/lisp/jsonrpc.el > +++ b/lisp/jsonrpc.el > @@ -1003,16 +1003,17 @@ of the API instead.") > (or method "") > (if id (format "[%s]" id) ""))))) > (msg > - (cond ((eq format 'full) > - (format "%s%s\n" preamble (or json log-text))) > - ((eq format 'short) > - (format "%s%s\n" preamble (or log-text ""))) > - (t > - (format "%s%s" preamble > - (or (and foreign-message > - (concat "\n" (pp-to-string > - foreign-message))) > - (concat log-text "\n"))))))) > + (pcase format > + ('full (format "%s%s\n" preamble (or json log-text))) > + ('short (format "%s%s\n" preamble (or log-text ""))) > + (_ > + (format "%s%s" preamble > + (or (and foreign-message > + (let ((lisp-indent-function ;bug#68072 > + #'lisp-indent-function)) > + (concat "\n" (pp-to-string > + foreign-message)))) > + (concat log-text "\n"))))))) > (goto-char (point-max)) > ;; XXX: could use `run-at-time' to delay server logs > ;; slightly to play nice with verbose servers' stderr. Is there any substantive reason it was necessary to replace cond with pcase? If not, why was cond replaced with pcase? Thanks.