Selaa lähdekoodia

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.
David Maus 13 vuotta sitten
vanhempi
commit
a9559dc08a
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2 2
      lisp/org.el

+ 2 - 2
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))