emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: York Zhao <gtdplatform@gmail.com>
To: emacs-orgmode <emacs-orgmode@gnu.org>
Subject: Patch to fix `org-test-with-temp-text'
Date: Wed, 9 Apr 2014 18:39:06 -0400	[thread overview]
Message-ID: <CAD3zm23H+7Rb0ee=chNe-bO1KOynXbt2cK==aJteXSaC9OvhGA@mail.gmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 951 bytes --]

Hi list,

I've just found a bug in `org-test-with-temp-text' and have fixed it. Please
find attached my patch for the fix. Here's the description from git commit
message:

According to the docstring, if the string "<point>" appears in TEXT then the
string "<point>" is removed and point is placed there. The problem was that
after string "<point>" was removed, the point was *not* placed at the position
of the removed text, rather, it was placed one character before that position
which is wrong. The reason is that Emacs buffer position is a number started
from 1, instead of 0, in other words, the value of `(point-min)' is 1 not 0. The
problem is addressed by adding 1 to the calculated position.

I'm going to report another bug together with a reproducer written as an
"org-test". But my test relies on my fix in `org-test-with-temp-text'. Therefor,
I will appreciate it if this patch can be taken care of as soon as possible.

Thank you,

York

[-- Attachment #2: 0001-testing-org-test.el-org-test-with-temp-text-Fix-poin.patch --]
[-- Type: text/x-diff, Size: 1676 bytes --]

From 9bbfc37ab059e923c57eaa99e3a2d81144c80218 Mon Sep 17 00:00:00 2001
From: York Zhao <gtdplatform@gmail.com>
Date: Wed, 9 Apr 2014 13:39:16 -0400
Subject: [PATCH] testing/org-test.el (org-test-with-temp-text): Fix point
 position

According to the docstring, if the string "<point>" appears in TEXT
then the string "<point>" is removed and point is placed there. The
problem was that after string "<point>" was removed, the point
was *not* placed at the position of the removed text, rather, it was
placed one character before that position which is wrong. The reason
is that Emacs buffer position is a number started from 1, instead of
0, in other words, the value of `(point-min)' is 1 not 0. The problem
is addressed by adding 1 to the calculated position.

TINYCHANGE
---
 testing/org-test.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/testing/org-test.el b/testing/org-test.el
index 879d45e..983c012 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -209,11 +209,12 @@ otherwise place the point at the beginning of the inserted text."
      (with-temp-buffer
        (org-mode)
        (let ((point (string-match (regexp-quote "<point>") inside-text)))
-	  (if point
-	      (progn (insert (replace-match "" nil nil inside-text))
-		     (goto-char (match-beginning 0)))
-	    (progn (insert inside-text)
-		   (goto-char (point-min)))))
+	 (if point
+	     (progn
+	       (insert (replace-match "" nil nil inside-text))
+	       (goto-char (1+ (match-beginning 0))))
+	   (progn (insert inside-text)
+		  (goto-char (point-min)))))
        ,@body)))
 (def-edebug-spec org-test-with-temp-text (form body))
 
-- 
1.8.4

next             reply	other threads:[~2014-04-09 22:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-09 22:39 York Zhao [this message]
2014-04-10  9:57 ` Patch to fix `org-test-with-temp-text' Nicolas Goaziou

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:879d45e dfblob:983c012
	(help)

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='CAD3zm23H+7Rb0ee=chNe-bO1KOynXbt2cK==aJteXSaC9OvhGA@mail.gmail.com' \
    --to=gtdplatform@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /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 public 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).