From: Kyle Meyer Date: Mon, 18 Sep 2023 02:11:36 +0000 (-0400) Subject: Update to Org 9.6.9 X-Git-Tag: emacs-29.1.90~66 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=85f49a9bc8b9bf699a692787820efc0f8aa67545;p=emacs.git Update to Org 9.6.9 --- diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 23a2f73dba7..62ba687c19f 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{9.6.8} +\def\orgversionnumber{9.6.9} \def\versionyear{2023} % latest update \input emacsver.tex 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 750c8f97201..f97b9b6c753 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. ;;