From: Leo Vivier <zaephon@gmail.com>
To: emacs-orgmode@gnu.org
Cc: Leo Vivier <zaephon@gmail.com>
Subject: [PATCH] org.el: Fix newline at eob in org-insert-heading
Date: Mon, 11 Feb 2019 15:40:14 +0100 [thread overview]
Message-ID: <20190211144014.22930-1-zaephon@gmail.com> (raw)
In-Reply-To: <20190211133813.4348-1-zaephon@gmail.com>
* lisp/org.el (org-insert-heading): Check if narrowed before inserting
newline at eob
When narrowed into an org-buffer (e.g. when capturing), adding a new
heading with C-<return> or M-<return> on the last line of a
buffer (i.e. that not without a newline at the end) would result in
the insertion of a newline at the bottom of the narrowed capture
buffer.
- C-<return>: `org-insert-heading-respect-content'
- M-<return>: `org-meta-return'
Both functions use `org-insert-heading' in their definitions.
The problem is due to `eobp' returning t when point is on the last
character of the narrowed buffer (as explained in its docstring).
Since those `eobp' predicates in `org-insert-heading' are probably
there to ensure a newline at the end of the *file*, checking whether
we are at the end of the *widened* buffer prior to inserting the
newline fixes the problem.
The patch I'd originally submitted failed to address narrowed buffer
whose `(max-pos)` was also that of the widened buffer. Rather than
using `(buffer-narrowed-p)`, I opted for a `(widen)` followed by
`(eobp)`.
TINYCHANGE
---
I was able to replicate the problem with `emacs -q`, so the problem
doesn't seem to come from custom options in my own setup.
The problematic lines were inserted in the following commit:
b16feed40c7f519ada0cd9315251dcc257be31d2 . Their goal was to C-<RET>
more predictable, and I don't think I've modified that behaviour in a
any way.
Let me know if you'd rather have me squash the changes.
lisp/org.el | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 7e74c2199..fef13f818 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7542,8 +7542,9 @@ unconditionally."
(unless (and blank? (org-previous-line-empty-p))
(org-N-empty-lines-before-current (if blank? 1 0)))
(insert stars " ")
- (when (and (eobp)
- (not (buffer-narrowed-p)))
+ (when (save-restriction
+ (widen)
+ (eobp))
(save-excursion (insert "\n")))
;; When INVISIBLE-OK is non-nil, ensure newly created headline
;; is visible.
@@ -7572,15 +7573,17 @@ unconditionally."
(when blank? (insert "\n"))
(insert "\n" stars " ")
(when (org-string-nw-p split) (insert split))
- (when (and (eobp)
- (not (buffer-narrowed-p)))
+ (when (save-restriction
+ (widen)
+ (eobp))
(save-excursion (insert "\n")))))
(t
(end-of-line)
(when blank? (insert "\n"))
(insert "\n" stars " ")
- (when (and (eobp)
- (not (buffer-narrowed-p)))
+ (when (save-restriction
+ (widen)
+ (eobp))
(save-excursion (insert "\n"))))))
;; On regular text, turn line into a headline or split, if
;; appropriate.
--
2.20.1
next prev parent reply other threads:[~2019-02-11 14:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-11 13:38 [PATCH] org.el: Fix newline at eob in org-insert-heading Leo Vivier
2019-02-11 14:40 ` Leo Vivier [this message]
2019-02-16 8:38 ` Nicolas Goaziou
2019-02-16 9:31 ` Leo Vivier
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=20190211144014.22930-1-zaephon@gmail.com \
--to=zaephon@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
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).