[elpa] externals/org d8133e80d8 1/2: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit d8133e80d8672ad6e636a6e2c12b9ffe1cd11df7
Merge: 127e7fee49 1c3a46268f
Author: Ihor Radchenko <yantar92@gmail.com>
Commit: Ihor Radchenko <yantar92@gmail.com>

    Merge branch 'bugfix'
---
 lisp/oc-basic.el    |  1 +
 lisp/ox-ascii.el    |  7 ++++---
 lisp/ox-md.el       |  5 +++--
 testing/org-test.el | 10 +++++-----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el
index 1dd433cdef..25bbe3784b 100644
--- a/lisp/oc-basic.el
+++ b/lisp/oc-basic.el
@@ -73,6 +73,7 @@
 (require 'seq)
 
 (declare-function org-open-at-point "org" (&optional arg))
+(declare-function org-open-file "org" (path &optional in-emacs line search))
 
 (declare-function org-element-interpret-data "org-element" (data))
 (declare-function org-element-property "org-element" (property element))
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el
index 3c39225a3c..cfc2bc5fd4 100644
--- a/lisp/ox-ascii.el
+++ b/lisp/ox-ascii.el
@@ -953,9 +953,10 @@ channel."
                           (org-export-resolve-fuzzy-link link info)
                          ;; Ignore broken links.  On broken link,
                          ;; `org-export-resolve-id-link' will throw an
-                         ;; error and `ignore-error' will return nil.
-                        (ignore-error 'org-link-broken
-                           (org-export-resolve-id-link link info)))))
+                         ;; error and we will return nil.
+                        (condition-case nil
+                             (org-export-resolve-id-link link info)
+                           (org-link-broken nil)))))
              (when dest
               (concat
                (org-ascii--fill-string
diff --git a/lisp/ox-md.el b/lisp/ox-md.el
index c268aa5ddd..50db53910a 100644
--- a/lisp/ox-md.el
+++ b/lisp/ox-md.el
@@ -195,8 +195,9 @@ of contents can refer to headlines."
        (lambda (link)
         (equal headline
                 ;; Ignore broken links.
-                (ignore-error 'org-link-broken
-                  (org-export-resolve-link link info))))
+                (condition-case nil
+                    (org-export-resolve-id-link link info)
+                  (org-link-broken nil))))
        info t))))
 
 (defun org-md--headline-title (style level title &optional anchor tags)
diff --git a/testing/org-test.el b/testing/org-test.el
index d19c7f0447..0520e82f9e 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -471,12 +471,12 @@ TIME can be a non-nil Lisp time value, or a string 
specifying a date and time."
                      (or time ,at) args)))
            ((symbol-function 'decode-time)
             (lambda (&optional time zone form)
-               (condition-case err
+               (condition-case nil
                    (funcall ,(symbol-function 'decode-time)
                            (or time ,at) zone form)
-                 ;; Fallback for Emacs <27.1.
-                 (error (funcall ,(symbol-function 'decode-time)
-                                (or time ,at) zone)))))
+                 (wrong-number-of-arguments
+                  (funcall ,(symbol-function 'decode-time)
+                          (or time ,at))))))
            ((symbol-function 'encode-time)
             (lambda (time &rest args)
               (apply ,(symbol-function 'encode-time) (or time ,at) args)))
@@ -492,7 +492,7 @@ TIME can be a non-nil Lisp time value, or a string 
specifying a date and time."
               (funcall ,(symbol-function 'set-file-times) file (or time ,at))))
            ((symbol-function 'time-add)
             (lambda (a b) (funcall ,(symbol-function 'time-add)
-                                   (or a ,at) (or b ,at))))
+                              (or a ,at) (or b ,at))))
            ((symbol-function 'time-equal-p)
             (lambda (a b) (funcall ,(symbol-function 'time-equal-p)
                                    (or a ,at) (or b ,at))))