emacs/lisp, branch main Emacs is the extensible, customizable, self-documenting real-time display editor. Merge branch 'bugfix' 2022-12-02T06:01:25+00:00 Ihor Radchenko 2022-12-02T06:01:25+00:00 53814a8068489eb7baa8ff408b4da15ae6699beb 






org-babel-comit-with-output: Fix when prompt is emitted partially
2022-12-02T05:59:24+00:00

Ihor Radchenko

2022-12-02T05:57:14+00:00

4564627415b1e609acdddd6e92b33d51c8e427c1

* lisp/ob-comint.el (org-babel-comint-with-output): Do not rely on
output filter when detecting prompt lines.  Search for
`comint-prompt-regexp' in the full output after applying the filter.
This is needed when the filter is supplied with partial prompts.

Reported-by: Frédéric Santos <frederic.santos@u-bordeaux.fr>
Link: https://orgmode.org/list/877czca7oj.fsf@u-bordeaux.fr





* lisp/ob-comint.el (org-babel-comint-with-output): Do not rely on
output filter when detecting prompt lines.  Search for
`comint-prompt-regexp' in the full output after applying the filter.
This is needed when the filter is supplied with partial prompts.

Reported-by: Frédéric Santos <frederic.santos@u-bordeaux.fr>
Link: https://orgmode.org/list/877czca7oj.fsf@u-bordeaux.fr







org-element: Prefer `org-element-with-disabled-cache' macro
2022-12-02T05:26:56+00:00

Ihor Radchenko

2022-12-02T05:26:56+00:00

9e9412919e863bc0d95918903d4e55c9a2ce499d

* lisp/org-element.el (org-element--cache-verify-element):
(org-element-at-point-no-context): Use
`org-element-with-disabled-cache' instead of let-binding
`org-element-use-cache' variable.  The former is more reliable.





* lisp/org-element.el (org-element--cache-verify-element):
(org-element-at-point-no-context): Use
`org-element-with-disabled-cache' instead of let-binding
`org-element-use-cache' variable.  The former is more reliable.







ox-md: Tweak a defcustom type for compatibility with Emacs<28
2022-12-01T22:26:01+00:00

Kyle Meyer

2022-12-01T22:26:01+00:00

d122c2b5b41cd0df6431683242e0fa0f4303d863

* lisp/ox-md.el (org-md-toplevel-hlevel): Change the type from natnum
to integer, which is less accurate but compatible with all Emacs
versions that Org supports.

This is a follow-up to the recent port of 4b2f5425d.





* lisp/ox-md.el (org-md-toplevel-hlevel): Change the type from natnum
to integer, which is less accurate but compatible with all Emacs
versions that Org supports.

This is a follow-up to the recent port of 4b2f5425d.







Backport commit 8b3baadf6 from Emacs
2022-12-01T22:25:59+00:00

Eli Zaretskii

2022-12-01T12:40:47+00:00

3159ea296f6fd37bb3e4d51b1343bb3b1c9fd887

* lisp/org-clock.el (org-x11idle-exists-p): Don't try to
invoke "command x11idle" on MS-Windows and MS-DOS.  This fixes a
hang during byte-compilation of Org.

Fix compilation of Org 9.6 on MS-Windows
8b3baadf671b7b3d5058808c4655eca8bd46015e
Eli Zaretskii
Thu Dec 1 14:40:47 2022 +0200





* lisp/org-clock.el (org-x11idle-exists-p): Don't try to
invoke "command x11idle" on MS-Windows and MS-DOS.  This fixes a
hang during byte-compilation of Org.

Fix compilation of Org 9.6 on MS-Windows
8b3baadf671b7b3d5058808c4655eca8bd46015e
Eli Zaretskii
Thu Dec 1 14:40:47 2022 +0200







Backport commit 4b2f5425d from Emacs
2022-12-01T22:25:58+00:00

Mattias Engdegård

2022-12-01T11:40:28+00:00

9b856c273f7c9844bb25a86223d942f62648c668

* lisp/ob-clojure.el
(ob-clojure-babashka-command, ob-clojure-nbb-command):
Account for the possibility of nil (commands absent).
* lisp/org.el (org-safe-remote-resources):
* lisp/ox-md.el (org-md-toplevel-hlevel):
Fix incorrect or invalid types.

Fix types in various defcustom declarations
4b2f5425d7af1a6f992ad8ce0a4452a2e778815a
Mattias Engdegård
Thu Dec 1 13:03:19 2022 +0100

[km] The natnum change will be adjusted in an upcoming commit because
     natnum not available until Emacs 28.





* lisp/ob-clojure.el
(ob-clojure-babashka-command, ob-clojure-nbb-command):
Account for the possibility of nil (commands absent).
* lisp/org.el (org-safe-remote-resources):
* lisp/ox-md.el (org-md-toplevel-hlevel):
Fix incorrect or invalid types.

Fix types in various defcustom declarations
4b2f5425d7af1a6f992ad8ce0a4452a2e778815a
Mattias Engdegård
Thu Dec 1 13:03:19 2022 +0100

[km] The natnum change will be adjusted in an upcoming commit because
     natnum not available until Emacs 28.







Backport commit 8617edfff from Emacs
2022-11-30T22:19:12+00:00

Stefan Kangas

2022-11-30T15:59:41+00:00

c8ad9e4b28f7b96199ef78b53c7935df4b79b35b

; Fix typos
8617edfffd07eb80561b4de6a37c5b0b5f442e07
Stefan Kangas
Wed Nov 30 16:59:41 2022 +0100





; Fix typos
8617edfffd07eb80561b4de6a37c5b0b5f442e07
Stefan Kangas
Wed Nov 30 16:59:41 2022 +0100







Backport commit c3466099c from Emacs
2022-11-30T13:55:24+00:00

Mattias Engdegård

2022-11-30T12:23:38+00:00

7ba099a3fda43b0d73107c454474a8d9300489c5

* lisp/org-element.el (org-element--get-node-properties):
Escape literal `+`.
* lisp/org-persist.el (org-persist-load:index):
Replace line-start with string-start when the latter is meant.

Org regexp style fixes
c3466099c5f44c52ec73a1bbbb2b42de6f29ac7f
Mattias Engdegård
Wed Nov 30 13:23:38 2022 +0100





* lisp/org-element.el (org-element--get-node-properties):
Escape literal `+`.
* lisp/org-persist.el (org-persist-load:index):
Replace line-start with string-start when the latter is meant.

Org regexp style fixes
c3466099c5f44c52ec73a1bbbb2b42de6f29ac7f
Mattias Engdegård
Wed Nov 30 13:23:38 2022 +0100







ob-core: Silence byte-compiler warning
2022-11-30T02:22:05+00:00

Kyle Meyer

2022-11-30T02:22:05+00:00

5fd5912fa4dab0e1730b7bcd08ae8b630466d8b1

* lisp/ob-core.el (org-babel-read-list): Reflow docstring paragraph to
silence "docstring wider than 80 characters" warning.





* lisp/ob-core.el (org-babel-read-list): Reflow docstring paragraph to
silence "docstring wider than 80 characters" warning.







Update version numbers for the 9.6 release
2022-11-29T06:34:50+00:00

Bastien

2022-11-29T06:34:50+00:00

b3da427ebb1c401355aa4cba9baeaa92f87ccb2f