Merge branch 'maint'

lisp/org-duration.el

@@ -51,6 +51,7 @@
 
 (require 'cl-lib)
 (require 'org-macs)
+(declare-function org-trim "org" (s &optional keep-lead))
 
 
 ;;; Public variables

lisp/org.el

@@ -9674,6 +9674,12 @@ according to FMT (default from `org-email-link-description-format')."
 				    (reverse slines))) "\n")))))
     (mapconcat #'identity (split-string s) " ")))
 
+(defconst org-link-escape-chars
+  ;;%20 %5B %5D %25
+  '(?\s ?\[ ?\] ?%)
+  "List of characters that should be escaped in a link when stored to Org.
+This is the list that is used for internal purposes.")
+
 (defun org-make-link-string (link &optional description)
   "Make a link with brackets, consisting of LINK and DESCRIPTION."
   (unless (org-string-nw-p link) (error "Empty link"))
@@ -9696,12 +9702,6 @@ according to FMT (default from `org-email-link-description-format')."
 	    uri
 	    (if description (format "[%s]" description) ""))))
 
-(defconst org-link-escape-chars
-  ;;%20 %5B %5D %25
-  '(?\s ?\[ ?\] ?%)
-  "List of characters that should be escaped in a link when stored to Org.
-This is the list that is used for internal purposes.")
-
 (defun org-link-escape (text &optional table merge)
   "Return percent escaped representation of TEXT.
 TEXT is a string with the text to escape.