diff options
| author | Sean Whitton | 2024-10-24 17:04:40 +0800 |
|---|---|---|
| committer | Sean Whitton | 2024-10-27 11:06:40 +0800 |
| commit | d354300993e6a48e2d3e72a7e89348cc06b326fb (patch) | |
| tree | a75acd57aafeffd040c97ccbdc34424cca2c83e8 /lisp/org/ob-python.el | |
| parent | 2030b8c7f24a10024ab973149b10194fd50dd2bb (diff) | |
| download | emacs-d354300993e6a48e2d3e72a7e89348cc06b326fb.tar.gz emacs-d354300993e6a48e2d3e72a7e89348cc06b326fb.zip | |
lisp/org: Backport org-mode.git fix for if-let/when-let obsolescence
Backporting this acked by Org maintainer Ihor Radchenko.
* lisp/org/ob-R.el (org-babel-R-associate-session):
* lisp/org/ob-clojure.el (ob-clojure-nbb-command)
(ob-clojure-cli-command):
* lisp/org/ob-core.el (org-babel-execute-src-block):
* lisp/org/ob-exp.el (org-babel-exp-code):
* lisp/org/ob-julia.el (org-babel-julia-associate-session):
* lisp/org/ob-python.el
(org-babel-python--python-util-comint-end-of-output-p):
* lisp/org/ol.el (org-insert-link):
* lisp/org/org-attach.el (org-attach):
* lisp/org/org-clock.el (org-clock-select-task):
* lisp/org/org-compat.el (fboundp):
* lisp/org/org-element-ast.el (org-element-property-raw)
(org-element-put-property, org-element-copy):
* lisp/org/org-element.el (org-element-timestamp-interpreter)
(org-element--cache-key):
* lisp/org/org-goto.el (org-goto-location):
* lisp/org/org-lint.el
(org-lint-suspicious-language-in-src-block)
(org-lint-export-option-keywords):
* lisp/org/org-macs.el (org-mks):
* lisp/org/org-persist.el: (org-persist-write:elisp):
* lisp/org/org-table.el (org-table-fedit-finish):
* lisp/org/org.el (org-entry-get-with-inheritance):
* lisp/org/ox-html.el (org-html--reference)
(org-html--build-mathjax-config, org-html-example-block):
* lisp/org/ox-latex.el (org-latex-table-row):
* lisp/org/ox.el (org-export--prune-tree)
(org-export--blindly-expand-include):
Replace use of if-let and when-let, obsolete in Emacs 31.0.50.
Diffstat (limited to 'lisp/org/ob-python.el')
| -rw-r--r-- | lisp/org/ob-python.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el index 8a3c24f7038..f881918c75c 100644 --- a/lisp/org/ob-python.el +++ b/lisp/org/ob-python.el | |||
| @@ -269,7 +269,7 @@ results as a string." | |||
| 269 | "Return non-nil if the last prompt matches input prompt. | 269 | "Return non-nil if the last prompt matches input prompt. |
| 270 | Backport of `python-util-comint-end-of-output-p' to emacs28. To | 270 | Backport of `python-util-comint-end-of-output-p' to emacs28. To |
| 271 | be removed after minimum supported version reaches emacs29." | 271 | be removed after minimum supported version reaches emacs29." |
| 272 | (when-let ((prompt (python-util-comint-last-prompt))) | 272 | (when-let* ((prompt (python-util-comint-last-prompt))) |
| 273 | (python-shell-comint-end-of-output-p | 273 | (python-shell-comint-end-of-output-p |
| 274 | (buffer-substring-no-properties | 274 | (buffer-substring-no-properties |
| 275 | (car prompt) (cdr prompt))))) | 275 | (car prompt) (cdr prompt))))) |