From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Gillespie Subject: [PATCH] Fix verbatim block fontification to end blocks on headlines Date: Wed, 11 Dec 2019 19:35:50 -0800 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000bf13fe05997971f8" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:43263) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifFGn-0004Ta-T2 for emacs-orgmode@gnu.org; Wed, 11 Dec 2019 22:36:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifFGm-0000p8-FE for emacs-orgmode@gnu.org; Wed, 11 Dec 2019 22:36:05 -0500 Received: from mail-lj1-x232.google.com ([2a00:1450:4864:20::232]:45626) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifFGm-0000lU-5G for emacs-orgmode@gnu.org; Wed, 11 Dec 2019 22:36:04 -0500 Received: by mail-lj1-x232.google.com with SMTP id d20so532334ljc.12 for ; Wed, 11 Dec 2019 19:36:03 -0800 (PST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode@gnu.org Cc: Nicolas Goaziou --000000000000bf13fe05997971f8 Content-Type: text/plain; charset="UTF-8" This patch is a change to how org fontifies verbatim source blocks re: [1]. Hopefully it answers Nicolas's question from that thread. Best! Tom On Sun, Dec 8, 2019 at 12:05 AM Nicolas Goaziou wrote: > I do not understand. Source and example blocks are verbatim blocks, > whereas verse blocks are not. There is nothing to match, is there? [1] Bug: headlines escape blocks: https://lists.gnu.org/archive/html/emacs-orgmode/2019-12/msg00133.html --000000000000bf13fe05997971f8 Content-Type: application/x-patch; name="0001-org.el-Fix-verbatim-block-fontification-to-end-block.patch" Content-Disposition: attachment; filename="0001-org.el-Fix-verbatim-block-fontification-to-end-block.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k425u9mq0 RnJvbSA1MzFlYWMyM2UyMmI1YjhiMTZmMjc0N2JiZDVjMWJkNDNmY2JlNDNiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUb20gR2lsbGVzcGllIDx0Z2J1Z3NAZ21haWwuY29tPgpEYXRl OiBXZWQsIDExIERlYyAyMDE5IDE3OjU3OjQ3IC0wODAwClN1YmplY3Q6IG9yZy5lbDogRml4IHZl cmJhdGltIGJsb2NrIGZvbnRpZmljYXRpb24gdG8gZW5kIGJsb2NrcyBvbiBoZWFkbGluZXMKCiog bGlzcC9vcmcuZWwgKG9yZy1mb250aWZ5LW1ldGEtbGluZXMtYW5kLWJsb2Nrcy0xKTogRW5oYW5j ZSByZWdleApmb3IgZmluZGluZyB0aGUgZW5kIG9mIGJsb2NrcyAoaS5lLiwgYGJlZy1vZi1lbmRs aW5lJykgdG8gZGV0ZWN0CmhlYWRsaW5lcyAoaS5lLiwgIl5cXCoiKSBzbyB0aGF0IGZvbnRpZmlj YXRpb24gbWF0Y2hlcyB0aGUgYmVoYXZpb3IKb2Ygb3JnIG1vZGUgKGkuZS4sIHRoYXQgaGVhZGxp bmVzIGFyZSBoZWFsaW5lcywgZXZlbiBpbiB2ZXJ0YWJpbSkuCgpUaGlzIGNoYW5nZSBhbGlnbnMg dGhlIGJlaGF2aW9yIGFuZCB0aGUgdmlzdWFsIGFwcGVhcmFuY2Ugb2YgdmVyYmF0aW0KYmxvY2tz IHRoYXQgY29udGFpbiBoZWFkbGluZXMuIFdoZW4gYGZvbnQtbG9jay1tb2RlJyBpcyBlbmFibGVk IHRoaXMKY2hhbmdlIG1ha2VzIHNpdHVhdGlvbnMgbGlrZSB0aG9zZSBpbiAoaW5mbyAiKG9yZykg TGl0ZXJhbCBFeGFtcGxlcyIpCmxpdGVyYWxseSBqdW1wIG9mZiB0aGUgcGFnZS4KCk92ZXJ2aWV3 IG9mIG5ldyBmb250aWZpY2F0aW9uCgpTb3VyY2UgICAgICAgICAgICAgICAgfCBmb250aWZpY2F0 aW9uIGJlZm9yZSB8IGZvbnRpZmljYXRpb24gYWZ0ZXIgIHwKXCMrQkVHSU5fRVhBTVBMRSAgICAg IHwgb3JnLWJsb2NrLWJlZ2luLWxpbmUgfCBvcmctYmxvY2stYmVnaW4tbGluZSB8CkkgbG9vayB2 ZXJiYXRpbSEgICAgICB8IG9yZy1ibG9jayAgICAgICAgICAgIHwgb3JnLWJsb2NrICAgICAgICAg ICAgfAoqIE9yZyBoZWFkZXJzIGluICAgICAgfCBvcmctYmxvY2sgICAgICAgICAgICB8IG9yZy1s ZXZlbC0xICAgICAgICAgIHwKdmVyYmF0aW0gYmxvY2tzICAgICAgIHwgb3JnLWJsb2NrICAgICAg ICAgICAgfCBuaWwgICAgICAgICAgICAgICAgICB8CioqIGhpZ2hseSBhY2NvcmRpbmdseSB8IG9y Zy1ibG9jayAgICAgICAgICAgIHwgb3JnLWxldmVsLTIgICAgICAgICAgfApcIytFTkRfRVhBTVBM RSAgICAgICAgfCBvcmctYmxvY2stZW5kLWxpbmUgICB8IG9yZy1tZXRhLWxpbmUgICAgICAgIHwK ClRJTllDSEFOR0UKLS0tCiBsaXNwL29yZy5lbCB8IDExICsrKysrKy0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgNiBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3Av b3JnLmVsIGIvbGlzcC9vcmcuZWwKaW5kZXggOWI4NDU5MmJhLi4wZThkZGE0OTUgMTAwNjQ0Ci0t LSBhL2xpc3Avb3JnLmVsCisrKyBiL2xpc3Avb3JnLmVsCkBAIC01Mjg3LDcgKzUyODcsNyBAQCBi eSBhICMuIgogCSAgKHNldHEgYmxvY2stdHlwZSAoZG93bmNhc2UgKG1hdGNoLXN0cmluZyA1KSkK IAkJcXVvdGluZyAobWVtYmVyIGJsb2NrLXR5cGUgb3JnLXByb3RlY3RpbmctYmxvY2tzKSkgOyBz cmMsIGV4YW1wbGUsIGV4cG9ydCwgbWF5YmUgbW9yZQogCSAgKHdoZW4gKHJlLXNlYXJjaC1mb3J3 YXJkCi0JCSAoY29uY2F0ICJeWyBcdF0qI1xcK2VuZCIgKG1hdGNoLXN0cmluZyA0KSAiXFw+Lioi KQorCQkgKGNvbmNhdCAiXFwoXlxcKlxcfF5bIFx0XSojXFwrZW5kIiAobWF0Y2gtc3RyaW5nIDQp ICJcXD4uKlxcKSIpCiAJCSBuaWwgdCkgIDs7IG9uIHB1cnBvc2UsIHdlIGxvb2sgZnVydGhlciB0 aGFuIExJTUlUCiAJICAgIDs7IFdlIGRvIGhhdmUgYSBtYXRjaGluZyAjK2VuZCBsaW5lCiAJICAg IChzZXRxIGJlZy1vZi1lbmRsaW5lIChtYXRjaC1iZWdpbm5pbmcgMCkKQEAgLTUzMjYsMTAgKzUz MjYsMTEgQEAgYnkgYSAjLiIKIAkgICAgKGFkZC10ZXh0LXByb3BlcnRpZXMKIAkgICAgIGJlZyAo aWYgd2hvbGUtYmxvY2tsaW5lIGJvbC1hZnRlci1iZWdpbmxpbmUgZW5kLW9mLWJlZ2lubGluZSkK IAkgICAgICcoZmFjZSBvcmctYmxvY2stYmVnaW4tbGluZSkpCi0JICAgIChhZGQtdGV4dC1wcm9w ZXJ0aWVzCi0JICAgICBiZWctb2YtZW5kbGluZQotCSAgICAgKG1pbiAocG9pbnQtbWF4KSAoaWYg d2hvbGUtYmxvY2tsaW5lIChtaW4gKHBvaW50LW1heCkgKDErIGVuZC1vZi1lbmRsaW5lKSkgZW5k LW9mLWVuZGxpbmUpKQotCSAgICAgJyhmYWNlIG9yZy1ibG9jay1lbmQtbGluZSkpCisJICAgICh3 aGVuIChub3QgKHN0cmluZz0gKG1hdGNoLXN0cmluZyAxKSAiKiIpKQorCSAgICAgIChhZGQtdGV4 dC1wcm9wZXJ0aWVzCisJICAgICAgIGJlZy1vZi1lbmRsaW5lCisJICAgICAgIChtaW4gKHBvaW50 LW1heCkgKGlmIHdob2xlLWJsb2NrbGluZSAobWluIChwb2ludC1tYXgpICgxKyBlbmQtb2YtZW5k bGluZSkpIGVuZC1vZi1lbmRsaW5lKSkKKwkgICAgICAgJyhmYWNlIG9yZy1ibG9jay1lbmQtbGlu ZSkpKQogCSAgICB0KSkKIAkgKChtZW1iZXIgZGMxICcoIit0aXRsZToiICIrYXV0aG9yOiIgIitl bWFpbDoiICIrZGF0ZToiKSkKIAkgIChvcmctcmVtb3ZlLWZseXNwZWxsLW92ZXJsYXlzLWluCi0t IAoyLjIzLjAKCg== --000000000000bf13fe05997971f8--