mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-30 00:27:52 +00:00
Code Releases Activity

Merge branch 'bugfix'

Browse source
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) (require 'seq)
(declare-function org-open-at-point "org" (&optional arg)) (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-interpret-data "org-element" (data))
(declare-function org-element-property "org-element" (property element)) (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) (org-export-resolve-fuzzy-link link info)
;; Ignore broken links. On broken link, ;; Ignore broken links. On broken link,
;; `org-export-resolve-id-link' will throw an ;; `org-export-resolve-id-link' will throw an
;; error and `ignore-error' will return nil. ;; error and we will return nil.
(ignore-error 'org-link-broken (condition-case nil
(org-export-resolve-id-link link info))))) (org-export-resolve-id-link link info)
(org-link-broken nil)))))
(when dest (when dest
(concat (concat
(org-ascii--fill-string (org-ascii--fill-string

5
lisp/ox-md.el
View file

@ -195,8 +195,9 @@ of contents can refer to headlines."
(lambda (link) (lambda (link)
(equal headline (equal headline
;; Ignore broken links. ;; Ignore broken links.
(ignore-error 'org-link-broken (condition-case nil
(org-export-resolve-link link info)))) (org-export-resolve-id-link link info)
(org-link-broken nil))))
info t)))) info t))))
(defun org-md--headline-title (style level title &optional anchor tags) (defun org-md--headline-title (style level title &optional anchor tags)

8
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))) (or time ,at) args)))
((symbol-function 'decode-time) ((symbol-function 'decode-time)
(lambda (&optional time zone form) (lambda (&optional time zone form)
(condition-case err (condition-case nil
(funcall ,(symbol-function 'decode-time) (funcall ,(symbol-function 'decode-time)
(or time ,at) zone form) (or time ,at) zone form)
;; Fallback for Emacs <27.1. (wrong-number-of-arguments
(error (funcall ,(symbol-function 'decode-time) (funcall ,(symbol-function 'decode-time)
(or time ,at) zone))))) (or time ,at))))))
((symbol-function 'encode-time) ((symbol-function 'encode-time)
(lambda (time &rest args) (lambda (time &rest args)
(apply ,(symbol-function 'encode-time) (or time ,at) args))) (apply ,(symbol-function 'encode-time) (or time ,at) args)))