0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 10:10:42 +00:00

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.
This commit is contained in:
David Maus 2011-11-01 06:24:42 +01:00
parent 8354fd9e0f
commit a9559dc08a

View file

@ -9170,9 +9170,9 @@ Use TAB to complete link prefixes, then RET for type-specific completion support
(setq desc path)))) (setq desc path))))
(if org-make-link-description-function (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)) (setq desc (read-string "Description: " desc))
(unless (string-match "\\S-" desc) (setq desc nil)) (unless (string-match "\\S-" desc) (setq desc nil))
(if remove (apply 'delete-region remove)) (if remove (apply 'delete-region remove))