diff options
author | David Maus <dmaus@ictsoc.de> | 2011-11-01 06:24:42 +0100 |
---|---|---|
committer | David Maus <dmaus@ictsoc.de> | 2011-11-01 06:24:42 +0100 |
commit | a9559dc08ad0d913e39aeb822a7d7e137da15dfe (patch) | |
tree | d4195fb8ed6004980cf145ace90a127924fdff27 | |
parent | 8354fd9e0f5fff04665b2272fff6376b15ec0225 (diff) | |
download | org-mode-a9559dc08ad0d913e39aeb822a7d7e137da15dfe.tar.gz |
Don't use default-description if link description function is defined
* org.el (org-insert-link): Don't use default-description if a
`org-make-link-description-function' is defined.
-rw-r--r-- | lisp/org.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el index a75f96e..318ccfd 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9170,9 +9170,9 @@ Use TAB to complete link prefixes, then RET for type-specific completion support (setq desc path)))) (if org-make-link-description-function - (setq desc (funcall org-make-link-description-function link desc))) + (setq desc (funcall org-make-link-description-function link desc)) + (if default-description (setq desc default-description))) - (if default-description (setq desc default-description)) (setq desc (read-string "Description: " desc)) (unless (string-match "\\S-" desc) (setq desc nil)) (if remove (apply 'delete-region remove)) |