ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New optional argument: Merge user table with default table 

* org.el (org-link-escape): New optional argument.  Merge user table
with default table.
This commit is contained in:
David Maus 2010-11-21 11:12:07 +01:00
parent 41c771378a
commit 27915744a2
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/org.el
View File

@ -8614,14 +8614,22 @@ This is the list that is used for internal purposes.")
"List of escapes for characters that are problematic in links.
This is the list that is used before handing over to the browser.")
(defun org-link-escape (text &optional table)
(defun org-link-escape (text &optional table merge)
"Return percent escaped representation of TEXT.
TEXT is a string with the text to escape.
Optional argument TABLE is a list with characters that should be
escaped. When nil, `org-link-escape-chars' is used."
escaped. When nil, `org-link-escape-chars' is used.
If optional argument MERGE is set, merge TABLE into
`org-link-escape-chars'."
(if (and org-url-encoding-use-url-hexify (not table))
(url-hexify-string text)
(setq table (or table org-link-escape-chars))
(cond
((and table merge)
(mapc (lambda (defchr)
(unless (member defchr table)
(setq table (cons defchr table)))) org-link-escape-chars))
((null table)
(setq table org-link-escape-chars)))
(mapconcat
(lambda (char)
(if (or (member char table)