From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id iP32Dyav1F6aYAAA0tVLHw (envelope-from ) for ; Mon, 01 Jun 2020 07:32:54 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id CNPhCyav1F6YSgAAB5/wlQ (envelope-from ) for ; Mon, 01 Jun 2020 07:32:54 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BE7B39400B1 for ; Mon, 1 Jun 2020 07:32:53 +0000 (UTC) Received: from localhost ([::1]:57292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfewG-00079J-M0 for larch@yhetil.org; Mon, 01 Jun 2020 03:32:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfevj-000764-4x for emacs-orgmode@gnu.org; Mon, 01 Jun 2020 03:32:21 -0400 Received: from [183.249.132.153] (port=1995 helo=localhost) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfevi-0007Rf-4J for emacs-orgmode@gnu.org; Mon, 01 Jun 2020 03:32:18 -0400 Received: by localhost (Postfix, from userid 1000) id 70B81241446; Mon, 1 Jun 2020 15:32:07 +0800 (CST) References: <874kryi3g6.fsf@gmail.com> <87mu5oby49.fsf@gmail.com> <87o8q4t5k4.fsf@fastmail.fm> <87k10r1upi.fsf@gmail.com> <87367fh9mw.fsf@fastmail.fm> User-agent: mu4e 1.4; emacs 28.0.50 From: stardiviner To: Matthew Lundin Subject: [PATCH v3] Re: [BUG] recently commits on master branch breaks command 'org-babel-demarcate-block' In-reply-to: <87367fh9mw.fsf@fastmail.fm> Date: Mon, 01 Jun 2020 15:32:07 +0800 Message-ID: <87h7vv1bt4.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Host-Lookup-Failed: Reverse DNS lookup failed for 183.249.132.153 (deferred) Received-SPF: softfail client-ip=183.249.132.153; envelope-from=numbchild@gmail.com; helo=localhost X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/01 03:32:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: 53 X-Spam_score: 5.3 X-Spam_bar: +++++ X-Spam_report: (5.3 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FROM=0.001, FSL_HELO_NON_FQDN_1=0.001, HELO_LOCALHOST=3.828, NML_ADSP_CUSTOM_MED=0.9, RDNS_NONE=0.793, SPF_SOFTFAIL=0.665, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: reject X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: numbchild@gmail.com Cc: emacs-orgmode@gnu.org Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Spam-Score: -3.01 X-TUID: Tc0h6zq/OR0J --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Matthew Lundin writes: > stardiviner writes: > >> Matthew Lundin writes: >> >>> >>> I think you also need to replace the newline with a space in the upper >>> case version. >>> >> Supposed there is \n after #+end_src. I also checked the original version before >> that change commit. The original has an newline. I write patch by comparing >> before and after (side by side). > > I'm referring to this line in the patch: > > indent (if upper-case-p "#+BEGIN_SRC\n" "#+begin_src ") > ^ > > The newline that needs to be removed is indicated by "^". > > You can see a correct similar version of this line on line 1932 of > ob-core.el. > > The original line the problematic commit replaced would also have had a > space in both, since it called either downcase or upcase on the string > "#+begin_src ". You're right, I updated the patch now. I really missed seeing that. :) --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-PATCH-fix-5f0a9cca3-missing-space.patch Content-Transfer-Encoding: quoted-printable From=2067b11b793d4ce45c75f5874571434c8a769ed7f3 Mon Sep 17 00:00:00 2001 From: stardiviner Date: Mon, 1 Jun 2020 08:44:22 +0800 Subject: [PATCH] [PATCH] fix 5f0a9cca3 missing space * lisp/ob-core.el (org-babel-demarcate-block): replace wrong newline with missing space. =2D-- lisp/ob-core.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index e554e3934..e798595bd 100644 =2D-- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -1908,7 +1908,7 @@ (defun org-babel-demarcate-block (&optional arg) (if (looking-at "^") "" "\n") indent (if upper-case-p "#+END_SRC\n" "#+end_src\n") (if arg stars indent) "\n" =2D indent (if upper-case-p "#+BEGIN_SRC\n" "#+begin_src\n") + indent (if upper-case-p "#+BEGIN_SRC " "#+begin_src ") lang (if (> (length headers) 1) (concat " " headers) headers) =2D-=20 2.26.2 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable > > Best, > > Matt =2D-=20 [ stardiviner ] I try to make every word tell the meaning that I want to express. Blog: https://stardiviner.github.io/ IRC(freenode): stardiviner, Matrix: stardiviner GPG: F09F650D7D674819892591401B5DF1C95AE89AC3 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFIBAEBCAAyFiEE8J9lDX1nSBmJJZFAG13xyVromsMFAl7UrvcUHG51bWJjaGls ZEBnbWFpbC5jb20ACgkQG13xyVromsM3FwgAinyUnd8OBiVKY//nTrqz0XL9px8J mtvaUlprrI9ALrzPTJYhPYE15qF1y98bDCUNE1OBHYyDQ0SXyrD8hzMEv/shaR0Y e2KqN0NZJAsgPYxC81nAaZdvRiYb7/qVrEsFjAdYPglxgP1SJwnJZ3HnPLttV4+1 4yyNd2u7dtgW26fqUhsybU9aZJQ+oOb499YpvVIHG0AVQqKe58sdlz8Q5P0rNEID pf5VagrechwwQ4r7zL0b99Ku40Gl7IPFrG8Lvb4YeCxA8Jj01LCFuKMNWoF4yJ5g K4C3ruRe+3In+Bh7AKgQgeb7MfPAOFva7Kl9WGTYJf/8dY2JnkQp1opz1w== =KKif -----END PGP SIGNATURE----- --==-=-=--