Update to Org 9.5.4-19-g4dff42

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 7e40f5bcd0b..148e111fd4c 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