| commit | a307011136d3c07825d519ae6d08bec95d9e67ba | |
| author | Reuben Thomas <rrt@sc3d.org> | |
| Tue, 5 Sep 2017 16:00:25 +0000 (5 17:00 +0100) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Fri, 8 Sep 2017 04:59:30 +0000 (8 06:59 +0200) | ||
| tree | 8789706c7865d8a76c2b71b05461b0cd3914c372 | treesnapshot (tar.gz zip) |
| parent | e09cb53bde19f1530d1adf966fedebb96cb22244 | commitdiff |
Fix logic of calling org-make-link-desciption-function
* lisp/org.el (org-insert-link): Simplify so that description is only
prompted for once, if auto-desc is not set, and takes as its default
value, in order, default-description, the return value of
org-make-link-description-function (if the variable is non-nil), and
the current desc. Update the docstring to reflect that
default-description takes precedence over
org-make-link-description-function.
(org-make-link-description-function): Remove from docstring the
statement that if the variable is nil, then the link will be used as
the default description. This is undesirable, and was not in any case
implemented.
* lisp/org.el (org-insert-link): Simplify so that description is only
prompted for once, if auto-desc is not set, and takes as its default
value, in order, default-description, the return value of
org-make-link-description-function (if the variable is non-nil), and
the current desc. Update the docstring to reflect that
default-description takes precedence over
org-make-link-description-function.
(org-make-link-description-function): Remove from docstring the
statement that if the variable is nil, then the link will be used as
the default description. This is undesirable, and was not in any case
implemented.
| lisp/org.el | diffblobblamehistory |