diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-08-22 06:30:29 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-08-22 06:30:29 +0200 |
| commit | 0c410206aa91b9bc9a0922d63ec34de765eb86a6 (patch) | |
| tree | 6d29238a1cad7a1067c375c93fb97d9c761139e0 /lisp/org | |
| parent | e154ba196a38c1398d506f9c1c8ba58966d9aa3e (diff) | |
| parent | 582ea6a1e9f98c124a7b044f1db7d4c63da5646d (diff) | |
| download | emacs-0c410206aa91b9bc9a0922d63ec34de765eb86a6.tar.gz emacs-0c410206aa91b9bc9a0922d63ec34de765eb86a6.tar.bz2 emacs-0c410206aa91b9bc9a0922d63ec34de765eb86a6.zip | |
Merge from origin/emacs-28
582ea6a1e9 Update to Org 9.5.4-19-g4dff42
7a3ae3cb62 ; * lisp/find-file.el (ff-other-file-alist): Fix typo.
c3087b59f0 ; * lisp/find-file.el (ff-other-file-alist): Another doc f...
1e1263b00b * lisp/find-file.el (ff-other-file-alist): Doc fix. (Bug#...
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ob-julia.el | 7 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 2 | ||||
| -rw-r--r-- | lisp/org/ox-icalendar.el | 12 |
3 files changed, 13 insertions, 8 deletions
diff --git a/lisp/org/ob-julia.el b/lisp/org/ob-julia.el index 50a44bcf448..de69f25fc30 100644 --- a/lisp/org/ob-julia.el +++ b/lisp/org/ob-julia.el @@ -26,6 +26,9 @@ ;; Org-Babel support for evaluating julia code ;; ;; Based on ob-R.el by Eric Schulte and Dan Davison. +;; +;; Session support requires the installation of the DataFrames and CSV +;; Julia packages. ;;; Code: (require 'cl-lib) @@ -62,6 +65,7 @@ (defvar ess-current-process-name) ; dynamically scoped (defvar ess-local-process-name) ; dynamically scoped (defvar ess-eval-visibly-p) ; dynamically scoped +(defvar ess-local-customize-alist); dynamically scoped (defun org-babel-edit-prep:julia (info) (let ((session (cdr (assq :session (nth 2 info))))) (when (and session @@ -281,7 +285,8 @@ last statement in BODY, as elisp." (value (with-temp-buffer (insert (org-babel-chomp body)) - (let ((ess-local-process-name + (let ((ess-local-customize-alist t) + (ess-local-process-name (process-name (get-buffer-process session))) (ess-eval-visibly-p nil)) (ess-eval-buffer nil))) diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 915c3f63c7d..353d533c06c 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made." (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.5.4-17-g6e991f")) + (let ((org-git-version "release_9.5.4-19-g4dff42")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/ox-icalendar.el b/lisp/org/ox-icalendar.el index a3fe31d7b8f..7a62145076b 100644 --- a/lisp/org/ox-icalendar.el +++ b/lisp/org/ox-icalendar.el @@ -276,14 +276,14 @@ re-read the iCalendar file.") ;;; Define Back-End (org-export-define-derived-backend 'icalendar 'ascii - :translate-alist '((clock . ignore) - (footnote-definition . ignore) - (footnote-reference . ignore) + :translate-alist '((clock . nil) + (footnote-definition . nil) + (footnote-reference . nil) (headline . org-icalendar-entry) (inner-template . org-icalendar-inner-template) - (inlinetask . ignore) - (planning . ignore) - (section . ignore) + (inlinetask . nil) + (planning . nil) + (section . nil) (template . org-icalendar-template)) :options-alist '((:exclude-tags |