emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: stardiviner <numbchild@gmail.com>
To: Matthew Lundin <mdl@imapmail.org>
Cc: emacs-orgmode@gnu.org
Subject: [PATCH v3] Re: [BUG] recently commits on master branch breaks command 'org-babel-demarcate-block'
Date: Mon, 01 Jun 2020 15:32:07 +0800	[thread overview]
Message-ID: <87h7vv1bt4.fsf@gmail.com> (raw)
In-Reply-To: <87367fh9mw.fsf@fastmail.fm>


[-- Attachment #1.1: Type: text/plain, Size: 1019 bytes --]


Matthew Lundin <mdl@imapmail.org> writes:

> stardiviner <numbchild@gmail.com> writes:
>
>> Matthew Lundin <mdl@imapmail.org> 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. :)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-PATCH-fix-5f0a9cca3-missing-space.patch --]
[-- Type: text/x-patch, Size: 922 bytes --]

From 67b11b793d4ce45c75f5874571434c8a769ed7f3 Mon Sep 17 00:00:00 2001
From: stardiviner <numbchild@gmail.com>
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.
---
 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
--- 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"
-			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)
-- 
2.26.2


[-- Attachment #1.3: Type: text/plain, Size: 282 bytes --]


>
> Best,
>
> Matt


-- 
[ 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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 515 bytes --]

  reply	other threads:[~2020-06-01  7:32 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-30  2:03 stardiviner
2020-05-30 20:57 ` Berry, Charles via General discussions about Org-mode.
2020-05-31  3:02   ` [PATCH] " stardiviner
2020-05-31  3:07 ` [PATCH v2] " stardiviner
2020-05-31 16:47   ` Matthew Lundin
2020-06-01  0:43     ` stardiviner
2020-06-01  1:12       ` Matthew Lundin
2020-06-01  7:32         ` stardiviner [this message]
2020-06-01 13:50           ` [PATCH v3] " Bastien

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87h7vv1bt4.fsf@gmail.com \
    --to=numbchild@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=mdl@imapmail.org \
    --subject='[PATCH v3] Re: [BUG] recently commits on master branch breaks command '\''org-babel-demarcate-block'\''' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).