master 0c410206aa: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 0c410206aa91b9bc9a0922d63ec34de765eb86a6
Merge: e154ba196a 582ea6a1e9
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    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#...
---
 lisp/find-file.el        | 15 +++++++++++++--
 lisp/org/ob-julia.el     |  7 ++++++-
 lisp/org/org-version.el  |  2 +-
 lisp/org/ox-icalendar.el | 12 ++++++------
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/lisp/find-file.el b/lisp/find-file.el
index 809592413d..614ff420f2 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -189,8 +189,19 @@ filename that EXTRACT returned."
 (defcustom ff-other-file-alist 'cc-other-file-alist
   "Alist of extensions to find given the current file's extension.
 
-This list should contain the most used extensions before the others,
-since the search algorithm searches sequentially through each
+The value could be an alist or a symbol whose value is an alist.
+Each element of the alist has the form
+
+   (REGEXP (EXTENSION...))
+or
+   (REGEXP FUNCTION)
+
+where REGEXP is the regular expression matching a file's extension,
+EXTENSIONs is the list of literal file-name extensions to search for,
+and FUNCTION is a function of one argument, the current file's name,
+that returns the list of extensions to search for.
+The list of extensions should contain the most used extensions before the
+others, since the search algorithm searches sequentially through each
 directory specified in `ff-search-directories'.  If a file is not found,
 a new one is created with the first matching extension (`.cc' yields `.hh').
 This alist should be set by the major mode."
diff --git a/lisp/org/ob-julia.el b/lisp/org/ob-julia.el
index 50a44bcf44..de69f25fc3 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 915c3f63c7..353d533c06 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 a3fe31d7b8..7a62145076 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