summaryrefslogtreecommitdiff
path: root/lisp/org/org.el
diff options
context:
space:
mode:
authorBastien Guerry <bzg@gnu.org>2020-12-13 22:26:51 +0100
committerBastien Guerry <bzg@gnu.org>2020-12-13 22:26:51 +0100
commit2dbc95063b5ee3d48aceff05f89e63a134df86ed (patch)
tree706720c6def867ac680fab7139585864936fe117 /lisp/org/org.el
parentf22856a5c54d99867cd24c08a14bbda23d5c6229 (diff)
downloademacs-2dbc95063b5ee3d48aceff05f89e63a134df86ed.tar.gz
emacs-2dbc95063b5ee3d48aceff05f89e63a134df86ed.tar.bz2
emacs-2dbc95063b5ee3d48aceff05f89e63a134df86ed.zip
Update to Org 9.4.2
Mostly fixing compiler warnings.
Diffstat (limited to 'lisp/org/org.el')
-rw-r--r--lisp/org/org.el5
1 files changed, 3 insertions, 2 deletions
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