diff options
| author | Bastien Guerry <bzg@gnu.org> | 2020-12-13 13:44:15 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2020-12-13 13:44:15 +0100 |
| commit | f22856a5c54d99867cd24c08a14bbda23d5c6229 (patch) | |
| tree | b6bd688963531eccb8b9d18195df0edfc34ba59d /lisp/org/ox-ascii.el | |
| parent | 6aa9fe3e1b4052b2acde86404a90e35893ebfa00 (diff) | |
| download | emacs-f22856a5c54d99867cd24c08a14bbda23d5c6229.tar.gz emacs-f22856a5c54d99867cd24c08a14bbda23d5c6229.tar.bz2 emacs-f22856a5c54d99867cd24c08a14bbda23d5c6229.zip | |
Update to Org 9.4.1
Diffstat (limited to 'lisp/org/ox-ascii.el')
| -rw-r--r-- | lisp/org/ox-ascii.el | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el index 972b58a9912..e5240f5c895 100644 --- a/lisp/org/ox-ascii.el +++ b/lisp/org/ox-ascii.el @@ -31,6 +31,8 @@ (require 'ox-publish) (require 'cl-lib) +;;; Function Declarations + (declare-function aa2u "ext:ascii-art-to-unicode" ()) ;;; Define Back-End @@ -954,7 +956,7 @@ channel." ((not (org-element-contents link)) nil) ;; Do not add a link already handled by custom export ;; functions. - ((org-export-custom-protocol-maybe link anchor 'ascii) nil) + ((org-export-custom-protocol-maybe link anchor 'ascii info) nil) (t (concat (org-ascii--fill-string @@ -1270,7 +1272,8 @@ CONTENTS is nil. INFO is a plist holding contextual information." (org-ascii--justify-element (org-ascii--box-string (org-remove-indentation - (org-element-property :value fixed-width)) info) + (org-element-property :value fixed-width)) + info) fixed-width info)) @@ -1569,7 +1572,7 @@ DESC is the description part of the link, or the empty string. INFO is a plist holding contextual information." (let ((type (org-element-property :type link))) (cond - ((org-export-custom-protocol-maybe link desc 'ascii)) + ((org-export-custom-protocol-maybe link desc 'ascii info)) ((string= type "coderef") (let ((ref (org-element-property :path link))) (format (org-export-get-coderef-format ref desc) @@ -1605,13 +1608,11 @@ INFO is a plist holding contextual information." ;; Don't know what to do. Signal it. (_ "???")))) (t - (let ((raw-link (concat (org-element-property :type link) - ":" - (org-element-property :path link)))) - (if (not (org-string-nw-p desc)) (format "<%s>" raw-link) + (let ((path (org-element-property :raw-link link))) + (if (not (org-string-nw-p desc)) (format "<%s>" path) (concat (format "[%s]" desc) (and (not (plist-get info :ascii-links-to-notes)) - (format " (<%s>)" raw-link))))))))) + (format " (<%s>)" path))))))))) ;;;; Node Properties |