From: Richard Lawrence <firstname.lastname@example.org> To: Tim Cross <email@example.com> Cc: firstname.lastname@example.org Subject: [PATCH] Fix org-comment-line-break-function (was: Is M-j broken for you in Org on Emacs 27 and 28?) Date: Tue, 30 Nov 2021 18:03:42 +0100 [thread overview] Message-ID: <email@example.com> (raw) In-Reply-To: <firstname.lastname@example.org> [-- Attachment #1: Type: text/plain, Size: 2836 bytes --] Hi Tim and all, Thanks for sticking with me here... Tim Cross <email@example.com> writes: > I just checked this when running emacs -Q and get the following > > comment-line-break-function is a variable defined in ‘simple.el’. > > Its value is ‘org-comment-line-break-function’ > > and fill-prefix is > > fill-prefix is a variable defined in ‘simple.el’. > > Its value is nil OK, those are the values I have too... > and I don't get any error with M-j and cannot reproduce the issue you > are encountering. . Do you see an error if you explicitly call (insert-before-markers-and-inherit nil) ? Because that is what org-comment-line-break-function does when fill-prefix is nil. That is the source of the error on all the versions where I have reproduced it. If you don't see the error then, it would indicate to me that something in your setup is suppressing it. > Looking at the git log, I can only find these messages relating to > default-indent-new-line > ... > which indicates the function was added in 2007 by RMS and made the > default for M-j in 2019. Right, which is why I don't see it with M-j in Emacs 26, presumably. Emacs 26.1, the version installed on my Debian system, was released May 28, 2018. > my suspicion is that your org version is too old for the current Emacs > versions... The other possibility is that you have a broken "mixed" > installation of org. I'm aware of the difficulties of a mixed installation and have been careful to avoid them. I run Org from git, usually a recent pull of the bugfix branch, which I load via use-package from my init file. But I have also tested it with the built-in Org for various versions of Emacs with emacs -Q. I do not have Org installed via ELPA. Just to be extra, super sure, I built Emacs this afternoon from a checkout of the repo, and the error is *still* there, with the same cause. In that build, with emacs -Q, I have: (org-version) "9.5" (emacs-version) "GNU Emacs 29.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.5, cairo version 1.16.0) of 2021-11-30" At this point I've replicated the bug on my machine in four different builds of Emacs (version 26.1 from Debian, 27.2 and "emacs-next" from Guix, and version 29.0.50 I built myself from source) with several versions of Org (the built-in ones in these Emacsen and a recent build of the bugfix branch). It is robustly reproducible for me, and the cause is clear: default-indent-new-line calls org-comment-line-break-function, which calls (insert-before-markers-and-inherit nil) which is a type error. I'm looking for help figuring out what the right fix is. I attach a patch for the simplest fix I can think of; please let me know if something else would be better. -- Best, Richard [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: org.el.diff --] [-- Type: text/x-diff, Size: 418 bytes --] diff --git a/lisp/org.el b/lisp/org.el index 1a1375461..fdeec0d67 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19695,7 +19695,8 @@ non-nil." (save-excursion (forward-char -1) (delete-horizontal-space)) (delete-horizontal-space) (indent-to-left-margin) - (insert-before-markers-and-inherit fill-prefix)) + (when fill-prefix + (insert-before-markers-and-inherit fill-prefix))) ;;; Fixed Width Areas
next prev parent reply other threads:[~2021-11-30 17:06 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-28 10:26 Is M-j broken for you in Org on Emacs 27 and 28? Richard Lawrence 2021-11-28 14:37 ` Greg Minshall 2021-11-28 14:45 ` Colin Baxter 😺 2021-11-28 20:17 ` Richard Lawrence 2021-11-29 1:18 ` Tim Cross 2021-11-29 8:09 ` Richard Lawrence 2021-11-29 13:35 ` Tim Cross 2021-11-29 15:49 ` Richard Lawrence 2021-11-29 14:31 ` Colin Baxter 😺 2021-11-30 1:10 ` Tim Cross 2021-11-30 17:03 ` Richard Lawrence [this message] 2021-11-30 20:18 ` [PATCH] Fix org-comment-line-break-function Marco Wahl 2021-11-30 22:06 ` Tim Cross 2021-12-01 8:36 ` Marco Wahl 2021-11-30 22:08 ` Kaushal Modi 2021-11-30 23:15 ` Tim Cross 2021-11-30 23:53 ` Kaushal Modi 2021-12-01 1:44 ` Kaushal Modi 2021-12-01 6:17 ` Tim Cross 2021-12-01 8:16 ` Richard Lawrence 2021-12-01 13:02 ` Nicolas Goaziou 2021-12-04 22:23 ` Tim Cross 2021-12-05 3:36 ` Kaushal Modi 2021-12-05 9:14 ` Nicolas Goaziou 2021-12-06 13:17 ` Richard Lawrence 2021-12-06 13:51 ` Kaushal Modi 2021-12-11 15:47 ` Nicolas Goaziou 2021-11-30 17:16 ` Is M-j broken for you in Org on Emacs 27 and 28? Morgan Willcock 2021-11-29 8:22 ` Richard Lawrence
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 \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH] Fix org-comment-line-break-function (was: Is M-j broken for you in Org on Emacs 27 and 28?)' \ /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).