Update to Org 9.4.2

Mostly fixing compiler warnings.

diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index b890fe2ca835f9f01753860413d724470392fd90..5613fdd6527e7be8a78ae0281aee06350aca4be6 100644 (file)
--- 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 5ed29f8891abe86507183774c615a8f45962f560..2e33bfa29afb30f40d7f7dbb358a50d0e30d79f5 100644 (file)
--- 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 e8f246e7f64165a2b962728b4656df5a2ad64faa..bf25d22057b4321eaf07325decfe25421f8b2310 100644 (file)
--- 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))
+
 \f
 ;;; Bibtex data
 (defvar org-bibtex-types

diff --git a/lisp/org/ol.el b/lisp/org/ol.el
index 77ca21e26435e0ddc22318d0cd5da89c9f831f36..5bb01e3f5fdf71aa37b07fa8487dac781cbb2dad 100644 (file)
--- 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 e4d8658197c96c93d56d0dd290a878c6824fbd59..6e9e248d23a09dd55ef2aaeae589d944ec1322f2 100644 (file)
--- 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 bca0c4338a31a3a008a6bd01329d43171e48d68f..b2878609d87f22430abdfed58c10bda4f10ac078 100644 (file)
--- 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 b8383283be8b00e3c4587ab67bddba70270fa340..dc7dc2a2c26480df2332b77951d319844a898173 100644 (file)
--- 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 f25efe07f33781c7a61bba4e58c852805a652a8f..f375c33d96ace803820c33b16f09e53513d0eff6 100644 (file)
--- 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 28733d0115b47734a030218e2b17689217eb869c..b4e54083d24b2c46f491c85a777e5638326a1e36 100644 (file)
--- 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 8dd3f392d2d2fc1ef2ae47e6b3ee9d76287fbd96..546326d0d585dc88790fa969d4133c4f4413ca50 100644 (file)
--- 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 a5219a0e11bc77dbd0a7cbee1b947cf2709dd29b..738dbd663c117305dfaf160b9a08f0970d77d568 100644 (file)
--- 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))
 \f
 (provide 'org-version)

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 3db07cd89b3f729122182fa8891847daafcaf537..063d0449d29a5b97d6f66539b26b42be15e73e20 100644 (file)
--- 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