diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-09-23 09:32:57 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-09-23 09:32:57 -0400 |
| commit | cc8726d2c8bc0e3b67cb8b97e388f9339bea0f96 (patch) | |
| tree | a733c18c2a7c050fff3dde551b17279974238559 /lisp/org | |
| parent | 36e78f14804c658568791497733d3fcaaacae4cf (diff) | |
| parent | 6bc3800000c6d4ed87330df5eee0958e29aa6521 (diff) | |
| download | emacs-cc8726d2c8bc0e3b67cb8b97e388f9339bea0f96.tar.gz | |
Merge from origin/emacs-29
6bc3800000c Ensure ucs-names is consistent with Unicode names
93134bb9c2f Make key-translate actually work
85f49a9bc8b Update to Org 9.6.9
2826c26537c Add leim subdirectories to emacs package
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ob-python.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 4 | ||||
| -rw-r--r-- | lisp/org/org.el | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el index c19af0ab331..6c05d1c8b2a 100644 --- a/lisp/org/ob-python.el +++ b/lisp/org/ob-python.el @@ -235,7 +235,7 @@ then create. Return the initialized session." ;; multiple prompts during initialization. (with-current-buffer py-buffer (while (not org-babel-python--initialized) - (org-babel-comint-wait-for-output py-buffer))) + (sleep-for 0 10))) (org-babel-comint-wait-for-output py-buffer)) (setq org-babel-python-buffers (cons (cons session py-buffer) diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 3b58ea06818..a859fe6d412 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of Org. Inserted by installing Org mode or when a release is made." - (let ((org-release "9.6.8")) + (let ((org-release "9.6.9")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of Org mode. Inserted by installing Org or when a release is made." - (let ((org-git-version "release_9.6.8-3-g21171d")) + (let ((org-git-version "release_9.6.9")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/org.el b/lisp/org/org.el index 0e06c6e6bbc..5a600a84f22 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -9,7 +9,7 @@ ;; URL: https://orgmode.org ;; Package-Requires: ((emacs "26.1")) -;; Version: 9.6.8 +;; Version: 9.6.9 ;; This file is part of GNU Emacs. ;; |