mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 22:07:49 +00:00
Merge branch 'bugfix'
This commit is contained in:
commit
d8133e80d8
|
@ -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))
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)))
|
||||
|
|
Loading…
Reference in a new issue