From 2dbc95063b5ee3d48aceff05f89e63a134df86ed Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@gnu.org>
Date: Sun, 13 Dec 2020 22:26:51 +0100
Subject: [PATCH] Update to Org 9.4.2

Mostly fixing compiler warnings.
---
 etc/refcards/orgcard.tex |  2 +-
 lisp/org/ob-ruby.el      | 11 +++++++----
 lisp/org/ol-bibtex.el    |  2 ++
 lisp/org/ol.el           |  2 ++
 lisp/org/org-compat.el   |  2 ++
 lisp/org/org-entities.el |  1 +
 lisp/org/org-list.el     |  1 +
 lisp/org/org-macs.el     |  1 +
 lisp/org/org-src.el      |  1 +
 lisp/org/org-table.el    |  3 +++
 lisp/org/org-version.el  |  4 ++--
 lisp/org/org.el          |  5 +++--
 12 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index b890fe2ca83..5613fdd6527 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.4.1}
+\def\orgversionnumber{9.4.2}
 \def\versionyear{2019}          % latest update
 \input emacsver.tex
 
diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el
index 5ed29f8891a..2e33bfa29af 100644
--- a/lisp/org/ob-ruby.el
+++ b/lisp/org/ob-ruby.el
@@ -159,13 +159,16 @@ If there is not a current inferior-process-buffer in SESSION
 then create one.  Return the initialized session."
   (unless (string= session "none")
     (require 'inf-ruby)
-    (let* ((cmd (cdr (or (assq :ruby params)
-			 (assoc inf-ruby-default-implementation
-				inf-ruby-implementations))))
+    (let* ((command (cdr (or (assq :ruby params)
+			     (assoc inf-ruby-default-implementation
+				    inf-ruby-implementations))))
 	   (buffer (get-buffer (format "*%s*" session)))
 	   (session-buffer (or buffer (save-window-excursion
 					(run-ruby-or-pop-to-buffer
-					 cmd (or session "ruby")
+					 (if (functionp command)
+					     (funcall command)
+					   command)
+					 (or session "ruby")
 					 (unless session
 					   (inf-ruby-buffer)))
 					(current-buffer)))))
diff --git a/lisp/org/ol-bibtex.el b/lisp/org/ol-bibtex.el
index e8f246e7f64..bf25d22057b 100644
--- a/lisp/org/ol-bibtex.el
+++ b/lisp/org/ol-bibtex.el
@@ -137,6 +137,8 @@
 (declare-function org-set-property "org" (property value))
 (declare-function org-toggle-tag "org" (tag &optional onoff))
 
+(declare-function org-search-view "org-agenda" (&optional todo-only string edit-at))
+
 
 ;;; Bibtex data
 (defvar org-bibtex-types
diff --git a/lisp/org/ol.el b/lisp/org/ol.el
index 77ca21e2643..5bb01e3f5fd 100644
--- a/lisp/org/ol.el
+++ b/lisp/org/ol.el
@@ -63,10 +63,12 @@
 (declare-function org-insert-heading "org" (&optional arg invisible-ok top))
 (declare-function org-load-modules-maybe "org" (&optional force))
 (declare-function org-mark-ring-push "org" (&optional pos buffer))
+(declare-function org-mode "org" ())
 (declare-function org-occur "org" (regexp &optional keep-previous callback))
 (declare-function org-open-file "org" (path &optional in-emacs line search))
 (declare-function org-overview "org" ())
 (declare-function org-restart-font-lock "org" ())
+(declare-function org-run-like-in-org-mode "org" (cmd))
 (declare-function org-show-context "org" (&optional key))
 (declare-function org-src-coderef-format "org-src" (&optional element))
 (declare-function org-src-coderef-regexp "org-src" (fmt &optional label))
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index e4d8658197c..6e9e248d23a 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -34,7 +34,9 @@
 
 (declare-function org-agenda-diary-entry "org-agenda")
 (declare-function org-agenda-maybe-redo "org-agenda" ())
+(declare-function org-agenda-set-restriction-lock "org-agenda" (&optional type))
 (declare-function org-agenda-remove-restriction-lock "org-agenda" (&optional noupdate))
+(declare-function org-calendar-goto-agenda "org-agenda" ())
 (declare-function org-align-tags "org" (&optional all))
 (declare-function org-at-heading-p "org" (&optional ignored))
 (declare-function org-at-table.el-p "org" ())
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index bca0c4338a3..b2878609d87 100644
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(declare-function org-mode "org" ())
 (declare-function org-toggle-pretty-entities "org"       ())
 (declare-function org-table-align            "org-table" ())
 
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index b8383283be8..dc7dc2a2c26 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -132,6 +132,7 @@
 (declare-function org-inlinetask-in-task-p "org-inlinetask" ())
 (declare-function org-inlinetask-outline-regexp "org-inlinetask" ())
 (declare-function org-level-increment "org" ())
+(declare-function org-mode "org" ())
 (declare-function org-narrow-to-subtree "org" ())
 (declare-function org-outline-level "org" ())
 (declare-function org-previous-line-empty-p "org" ())
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index f25efe07f33..f375c33d96a 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -34,6 +34,7 @@
 (require 'cl-lib)
 (require 'format-spec)
 
+(declare-function org-mode "org" ())
 (declare-function org-show-context "org" (&optional key))
 (declare-function org-string-collate-lessp "org-compat" (s1 s2 &optional locale ignore-case))
 
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 28733d0115b..b4e54083d24 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -37,6 +37,7 @@
 (require 'org-compat)
 (require 'org-keys)
 
+(declare-function org-mode "org" ())
 (declare-function org-element-at-point "org-element" ())
 (declare-function org-element-class "org-element" (datum &optional parent))
 (declare-function org-element-context "org-element" (&optional element))
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 8dd3f392d2d..546326d0d58 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -44,6 +44,9 @@
 (declare-function face-remap-add-relative "face-remap" (face &rest specs))
 (declare-function org-at-timestamp-p "org" (&optional extended))
 (declare-function org-delete-backward-char "org" (N))
+(declare-function org-mode "org" ())
+(declare-function org-duration-p "org-duration" (duration &optional canonical))
+(declare-function org-duration-to-minutes "org-duration" (duration &optional canonical))
 (declare-function org-element-at-point "org-element" ())
 (declare-function org-element-contents "org-element" (element))
 (declare-function org-element-extract-element "org-element" (element))
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index a5219a0e11b..738dbd663c1 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.4.1"))
+   (let ((org-release "9.4.2"))
      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.4.1-116-g353bb4"))
+   (let ((org-git-version "release_9.4.2"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 3db07cd89b3..063d0449d29 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -8,7 +8,7 @@
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: https://orgmode.org
 
-;; Version: 9.4.1
+;; Version: 9.4.2
 
 ;; This file is part of GNU Emacs.
 ;;
@@ -149,6 +149,7 @@ Stars are put in group 1 and the trimmed body in group 2.")
 (declare-function org-columns-quit "org-colview" ())
 (declare-function org-columns-insert-dblock "org-colview" ())
 (declare-function org-duration-from-minutes "org-duration" (minutes &optional fmt canonical))
+(declare-function org-duration-to-minutes "org-duration" (duration &optional canonical))
 (declare-function org-element-at-point "org-element" ())
 (declare-function org-element-cache-refresh "org-element" (pos))
 (declare-function org-element-cache-reset "org-element" (&optional all))
@@ -4179,7 +4180,7 @@ After a match, the following groups carry important information:
   "Variable associated with STARTUP options for Org.
 Each element is a list of three items: the startup options (as written
 in the #+STARTUP line), the corresponding variable, and the value to set
-this variable to if the option is found.  An optional forth element PUSH
+this variable to if the option is found.  An optional fourth element PUSH
 means to push this value onto the list in the variable.")
 
 (defcustom org-group-tags t
-- 
2.39.2