From: Kevin Liu <kevin@nivekuil.com>
To: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Fix org-narrow-to-subtree smaller than subtree
Date: Sat, 30 May 2020 06:35:13 -0700 [thread overview]
Message-ID: <877dwtpmum.fsf@nivekuil.com> (raw)
In-Reply-To: <87d06lpn3o.fsf@nivekuil.com>
[-- Attachment #1: Type: text/plain, Size: 90 bytes --]
Oh, of course I attached the wrong patch again. Wish mu4e-compose could preview these.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Make-narrowed-subtree-same-size-as-the-subtree-not-1.patch --]
[-- Type: text/x-patch, Size: 3547 bytes --]
From 5f7cf68f92d3fa82d01646f7f1e12a4d18bad2fb Mon Sep 17 00:00:00 2001
From: nivekuil <mail@nivekuil.com>
Date: Sat, 30 May 2020 00:11:19 -0700
Subject: [PATCH] Make narrowed subtree same size as the subtree, not 1 char
less
Right now a narrowed subtree is one char smaller than the actual
subtree. (org-mark-element) on a narrowed subtree will select a
region 1 char out of bounds, for example. There doesn't seem like a
good reason for this to be the case.
* lisp/org.el (org-toggle-narrow-to-subtree): Just
use (org-end-of-subtree) as the end of the subtree.
* testing/lisp/test-ob.el (test-ob/parse-header-args2): Since we're no
longer subtracting the narrowed subtree size by 1, the subtree text
here is now 1 character longer. I think this is reasonable and
shouldn't be surprising enough to ruin anyone's day. If it isn't,
then (org-end-of-subtree) should be changed rather than org-narrow-to-subtree.
* testing/lisp/test-org-datetree.el (test-org-datetree/find-date-create):
(test-org-datetree/find-iso-week-create): No more double
newlines between months in datetree, but this just seems like
incidental behavior more than deliberate behavior to begin with.
---
lisp/org.el | 4 +---
testing/lisp/test-ob.el | 2 +-
testing/lisp/test-org-datetree.el | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 0808fc210..f69919b20 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7748,9 +7748,7 @@ If yes, remember the marker and the distance to BEG."
(org-with-limited-levels
(narrow-to-region
(progn (org-back-to-heading t) (point))
- (progn (org-end-of-subtree t t)
- (when (and (org-at-heading-p) (not (eobp))) (backward-char 1))
- (point)))))))
+ (progn (org-end-of-subtree t t) (point)))))))
(defun org-toggle-narrow-to-subtree ()
"Narrow to the subtree at point or widen a narrowed buffer."
diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el
index 7c44622ef..2a2a66952 100644
--- a/testing/lisp/test-ob.el
+++ b/testing/lisp/test-ob.el
@@ -233,7 +233,7 @@ this is simple"
(should (string-match (regexp-quote "this is simple")
(org-babel-ref-resolve "simple-subtree")))
(org-babel-next-src-block)
- (should (= 14 (org-babel-execute-src-block)))))
+ (should (= 15 (org-babel-execute-src-block)))))
(ert-deftest test-ob/inline-src-blocks ()
(should
diff --git a/testing/lisp/test-org-datetree.el b/testing/lisp/test-org-datetree.el
index 5557d5e23..f7247766a 100644
--- a/testing/lisp/test-org-datetree.el
+++ b/testing/lisp/test-org-datetree.el
@@ -58,7 +58,7 @@
;; Sort new entry in right place.
(should
(string-match
- "\\`\\* 2012\n\\*\\* 2012-02 .*\n\\*\\*\\* 2012-02-01 .*\n\n\\*\\* 2012-03 .*\n\\*\\*\\* 2012-03-29 .*\\'"
+ "\\`\\* 2012\n\\*\\* 2012-02 .*\n\\*\\*\\* 2012-02-01 .*\n\\*\\* 2012-03 .*\n\\*\\*\\* 2012-03-29 .*\\'"
(org-test-with-temp-text "* 2012\n** 2012-03 month\n*** 2012-03-29 day"
(let ((org-datetree-add-timestamp nil))
(org-datetree-find-date-create '(3 29 2012))
@@ -161,7 +161,7 @@
;; Sort new entry in right place.
(should
(string-match
- "\\`\\* 2015\n\\*\\* 2015-W01\n\\*\\*\\* 2014-12-31 .*\n\n\\*\\* 2015-W36\n\\*\\*\\* 2015-09-01 .*\\'"
+ "\\`\\* 2015\n\\*\\* 2015-W01\n\\*\\*\\* 2014-12-31 .*\n\\*\\* 2015-W36\n\\*\\*\\* 2015-09-01 .*\\'"
(org-test-with-temp-text "* 2015"
(let ((org-datetree-add-timestamp nil))
(org-datetree-find-iso-week-create '(9 1 2015))
--
2.26.2
next prev parent reply other threads:[~2020-05-30 13:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-30 13:29 [PATCH] Fix org-narrow-to-subtree smaller than subtree Kevin Liu
2020-05-30 13:35 ` Kevin Liu [this message]
2020-05-30 16:05 ` Nicolas Goaziou
2020-05-31 1:54 ` Kevin Liu
2020-05-31 12:23 ` Nicolas Goaziou
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=877dwtpmum.fsf@nivekuil.com \
--to=kevin@nivekuil.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).