From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id CLHDCkRDlF6naAAA0tVLHw (envelope-from ) for ; Mon, 13 Apr 2020 10:47:32 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id EFUyJ0ZDlF4UYQAA1q6Kng (envelope-from ) for ; Mon, 13 Apr 2020 10:47:34 +0000 Received: from arlo.cworth.org (arlo.cworth.org [50.126.95.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8BF64942C4A for ; Mon, 13 Apr 2020 10:47:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 64D286DE13BA; Mon, 13 Apr 2020 03:47:27 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p1WME5fPZeDk; Mon, 13 Apr 2020 03:47:26 -0700 (PDT) Received: from arlo.cworth.org (localhost [IPv6:::1]) by arlo.cworth.org (Postfix) with ESMTP id 4B58C6DE0F5A; Mon, 13 Apr 2020 03:47:26 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id BCE746DE0F5A for ; Mon, 13 Apr 2020 03:47:25 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6axdqj2hXskg for ; Mon, 13 Apr 2020 03:47:24 -0700 (PDT) X-Greylist: delayed 372 seconds by postgrey-1.36 at arlo; Mon, 13 Apr 2020 03:47:24 PDT Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by arlo.cworth.org (Postfix) with ESMTP id 52DC36DE0EE7 for ; Mon, 13 Apr 2020 03:47:24 -0700 (PDT) Received: by guru.guru-group.fi (Postfix, from userid 501) id 54A4B10019F; Mon, 13 Apr 2020 13:41:10 +0300 (EEST) From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH] emacs doc: replace `...' with `...` in emacs docstrings for rst Date: Mon, 13 Apr 2020 13:41:08 +0300 Message-Id: <20200413104108.10837-1-tomi.ollila@iki.fi> X-Mailer: git-send-email 2.13.3 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tomi.ollila@iki.fi MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: notmuch-bounces@notmuchmail.org Sender: "notmuch" X-Scanner: scn0 X-Spam-Score: -0.01 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 50.126.95.6 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Scan-Result: default: False [-0.01 / 13.00]; RCVD_TLS_LAST(0.00)[]; GENERIC_REPUTATION(0.00)[-0.45074881315599]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; SPF_REPUTATION_HAM(0.00)[-0.44921060925534]; IP_REPUTATION_HAM(0.00)[asn: 27017(-0.18), country: US(-0.01), ip: 50.126.95.6(-0.45)]; R_SPF_ALLOW(-0.20)[+a]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[notmuch@notmuchmail.org]; TO_DN_NONE(0.00)[]; HAS_LIST_UNSUB(-0.01)[]; DMARC_NA(0.00)[iki.fi]; MX_GOOD(-0.50)[cached: notmuchmail.org]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; MAILLIST(-0.20)[mailman]; FORGED_SENDER_MAILLIST(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:27017, ipnet:50.126.64.0/18, country:US]; FROM_NEQ_ENVFROM(0.00)[tomi.ollila@iki.fi,notmuch-bounces@notmuchmail.org]; RCVD_COUNT_SEVEN(0.00)[7] X-TUID: sQxkZR8cM7qA Previously ' without preceding \ was replaced with `, to make emacs document content structure `...' to work with reStructuredText. But there are also single uses of ' in parts of the extracted docstrings, so better "restrict" the matching content to `[^']+'. Dropped checking preceding \ before ' -- it is not needed anymore; there is now one \' in the docstrings, but outside `...'. Note: In UTF-8 locales ` and ' may be replaced by some (arguably) better looking unicode counterparts (by emacs). --- This also "avoids" the bug building emacs/notmuch-parser.rsti in Debian 10. The doc content with "... SP's ..." no longer matches the re which caused emacs to barf then in (replace-match) (*) there. The bug is still a mystery (and may stay so). (* used (setq debug-on-error t) to dig a bit of the problem) emacs/rstdoc.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs/rstdoc.el b/emacs/rstdoc.el index 2225aefc..94596061 100644 --- a/emacs/rstdoc.el +++ b/emacs/rstdoc.el @@ -68,7 +68,7 @@ (defun rstdoc--insert-docstring (symbol docstring) (defvar rst--escape-alist '( ("\\\\='" . "\\\\'") - ("\\([^\\]\\)'" . "\\1`") + ("`\\([^']+\\)'" . "`\\1`") ("^[[:space:]\t]*$" . "|br|") ("^[[:space:]\t]" . "|indent| ")) "list of (regex . replacement) pairs") -- 2.25.2