mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2022-07-24 20:29:20 +08:00
parent 127e7fee49 1c3a46268f
commit d8133e80d8
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/oc-basic.el
View File

@ -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))

7
lisp/ox-ascii.el
View File

@ -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

5
lisp/ox-md.el
View File

@ -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)

10
testing/org-test.el
View File

@ -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))))