From mboxrd@z Thu Jan 1 00:00:00 1970 From: Reuben Thomas Subject: Re: Bug: Fix for org-make-link-description-function use in org-insert-link [9.0.10 (9.0.10-5-g1654a5-elpa @ /home/rrt/.emacs.d/elpa/org-20170904/)] Date: Fri, 8 Sep 2017 00:06:51 +0100 Message-ID: References: <874lsh5cwj.fsf@sc3d.org> <87a828na5m.fsf@nicolasgoaziou.fr> <87o9qols74.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="001a113c333c19f10f0558a18472" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dq5sy-0004eo-OY for emacs-orgmode@gnu.org; Thu, 07 Sep 2017 19:07:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dq5st-0004RG-CZ for emacs-orgmode@gnu.org; Thu, 07 Sep 2017 19:07:00 -0400 Received: from mail-oi0-x230.google.com ([2607:f8b0:4003:c06::230]:33834) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dq5st-0004QM-1a for emacs-orgmode@gnu.org; Thu, 07 Sep 2017 19:06:55 -0400 Received: by mail-oi0-x230.google.com with SMTP id l74so2086801oih.1 for ; Thu, 07 Sep 2017 16:06:53 -0700 (PDT) In-Reply-To: <87o9qols74.fsf@nicolasgoaziou.fr> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: Nicolas Goaziou Cc: "emacs-orgmode@gnu.org" --001a113c333c19f10f0558a18472 Content-Type: multipart/alternative; boundary="001a113c333c19f10a0558a18470" --001a113c333c19f10a0558a18470 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On 5 September 2017 at 23:02, Nicolas Goaziou wrote: > Reuben Thomas writes: > > > =E2=80=8BIf you (or someone) can confirm your interpretation above, I w= ould be > > happy to update my patch to implement the two behaviours required, > namely, > > that org-make-link-description-function is only called if the > > default-description argument to org-insert-link is nil > > Ack. > > > and that if that function returns nil, then the link location is used. > > I would also clarify the docstring regarding the second behaviour. > > It may not be a terribly useful behaviour anyway. You can always use > (lambda (link description) link) as > `org-make-link-description-function'. > > Perhaps we can simply remove "When nil, the link location will be used" > from the docstring. Your call. > =E2=80=8BI've removed it.=E2=80=8B =E2=80=8BAttached, a revised patch. --=20 https://rrt.sc3d.org --001a113c333c19f10a0558a18470 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On 5 September 2017 at 23:02, Nicolas Goaziou <mail@= nicolasgoaziou.fr> wrote:
Reube= n Thomas <rrt@sc3d.org> writes:
> =E2=80=8BIf you (or someone) can confirm your interpretation above, I = would be
> happy to update my patch to implement the two behaviours required, nam= ely,
> that org-make-link-description-function is only called if the
> default-description argument to org-insert-link is nil

Ack.

> and that if that function returns nil, then the link location is used.=
> I would also clarify the docstring regarding the second behaviour.

It may not be a terribly useful behaviour anyway. You can always use=
(lambda (link description) link) as
`org-make-link-description-function'.

Perhaps we can simply remove "When nil, the link location will be used= "
from the docstring. Your call.

=E2=80=8BI've removed it.=E2=80=8B

= =E2=80=8BAttached, a revised patch.

--
--001a113c333c19f10a0558a18470-- --001a113c333c19f10f0558a18472 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Fix-logic-of-calling-org-make-link-desciption-functi.patch" Content-Disposition: attachment; filename="0001-Fix-logic-of-calling-org-make-link-desciption-functi.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j7b2b6q10 RnJvbSBkZjZlMTU1YzBlMTRiYWU2Y2ViYjJlOGFjOTA0NDA1MTYzYzMyYjdkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSZXViZW4gVGhvbWFzIDxycnRAc2MzZC5vcmc+CkRhdGU6IFR1 ZSwgNSBTZXAgMjAxNyAxNzowMDoyNSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIEZpeCBsb2dpYyBv ZiBjYWxsaW5nIG9yZy1tYWtlLWxpbmstZGVzY2lwdGlvbi1mdW5jdGlvbgoKKiBsaXNwL29yZy5l bCAob3JnLWluc2VydC1saW5rKTogU2ltcGxpZnkgc28gdGhhdCBkZXNjcmlwdGlvbiBpcyBvbmx5 CnByb21wdGVkIGZvciBvbmNlLCBpZiBhdXRvLWRlc2MgaXMgbm90IHNldCwgYW5kIHRha2VzIGFz IGl0cyBkZWZhdWx0CnZhbHVlLCBpbiBvcmRlciwgZGVmYXVsdC1kZXNjcmlwdGlvbiwgdGhlIHJl dHVybiB2YWx1ZSBvZgpvcmctbWFrZS1saW5rLWRlc2NyaXB0aW9uLWZ1bmN0aW9uIChpZiB0aGUg dmFyaWFibGUgaXMgbm9uLW5pbCksIGFuZAp0aGUgY3VycmVudCBkZXNjLiBVcGRhdGUgdGhlIGRv Y3N0cmluZyB0byByZWZsZWN0IHRoYXQKZGVmYXVsdC1kZXNjcmlwdGlvbiB0YWtlcyBwcmVjZWRl bmNlIG92ZXIKb3JnLW1ha2UtbGluay1kZXNjcmlwdGlvbi1mdW5jdGlvbi4KKG9yZy1tYWtlLWxp bmstZGVzY3JpcHRpb24tZnVuY3Rpb24pOiBSZW1vdmUgZnJvbSBkb2NzdHJpbmcgdGhlCnN0YXRl bWVudCB0aGF0IGlmIHRoZSB2YXJpYWJsZSBpcyBuaWwsIHRoZW4gdGhlIGxpbmsgd2lsbCBiZSB1 c2VkIGFzCnRoZSBkZWZhdWx0IGRlc2NyaXB0aW9uLiBUaGlzIGlzIHVuZGVzaXJhYmxlLCBhbmQg d2FzIG5vdCBpbiBhbnkgY2FzZQppbXBsZW1lbnRlZC4KLS0tCiBsaXNwL29yZy5lbCB8IDQxICsr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MjAgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9vcmcu ZWwgYi9saXNwL29yZy5lbAppbmRleCA4ODk5ODdjLi40MzQ3MTExIDEwMDY0NAotLS0gYS9saXNw L29yZy5lbAorKysgYi9saXNwL29yZy5lbApAQCAtMTkzOSwxMCArMTkzOSwxMCBAQCBpbiB0aGUg T3JnIGJ1ZmZlciBzbyB0aGF0IHRoZSBjaGFuZ2UgdGFrZXMgZWZmZWN0LiIKIAogKGRlZmN1c3Rv bSBvcmctbWFrZS1saW5rLWRlc2NyaXB0aW9uLWZ1bmN0aW9uIG5pbAogICAiRnVuY3Rpb24gdG8g dXNlIGZvciBnZW5lcmF0aW5nIGxpbmsgZGVzY3JpcHRpb25zIGZyb20gbGlua3MuCi1XaGVuIG5p bCwgdGhlIGxpbmsgbG9jYXRpb24gd2lsbCBiZSB1c2VkLiAgVGhpcyBmdW5jdGlvbiBtdXN0IHRh a2UKLXR3byBwYXJhbWV0ZXJzOiB0aGUgZmlyc3Qgb25lIGlzIHRoZSBsaW5rLCB0aGUgc2Vjb25k IG9uZSBpcyB0aGUKLWRlc2NyaXB0aW9uIGdlbmVyYXRlZCBieSBgb3JnLWluc2VydC1saW5rJy4g IFRoZSBmdW5jdGlvbiBzaG91bGQKLXJldHVybiB0aGUgZGVzY3JpcHRpb24gdG8gdXNlLiIKK1Ro aXMgZnVuY3Rpb24gbXVzdCB0YWtlIHR3byBwYXJhbWV0ZXJzOiB0aGUgZmlyc3Qgb25lIGlzIHRo ZQorbGluaywgdGhlIHNlY29uZCBvbmUgaXMgdGhlIGRlc2NyaXB0aW9uIGdlbmVyYXRlZCBieQor YG9yZy1pbnNlcnQtbGluaycuICBUaGUgZnVuY3Rpb24gc2hvdWxkIHJldHVybiB0aGUgZGVzY3Jp cHRpb24gdG8KK3VzZS4iCiAgIDpncm91cCAnb3JnLWxpbmsKICAgOnR5cGUgJyhjaG9pY2UgKGNv bnN0IG5pbCkgKGZ1bmN0aW9uKSkpCiAKQEAgLTEwMTUyLDE1ICsxMDE1MiwxNCBAQCB0aGUgY3Vy cmVudCBkaXJlY3Rvcnkgb3IgYmVsb3cuCiBBIGBcXFt1bml2ZXJzYWwtYXJndW1lbnRdIFxcW3Vu aXZlcnNhbC1hcmd1bWVudF0gXFxbdW5pdmVyc2FsLWFyZ3VtZW50XScgXAogcHJlZml4IG5lZ2F0 ZXMgYG9yZy1rZWVwLXN0b3JlZC1saW5rLWFmdGVyLWluc2VydGlvbicuCiAKLUlmIGBvcmctbWFr ZS1saW5rLWRlc2NyaXB0aW9uLWZ1bmN0aW9uJyBpcyBub24tbmlsLCB0aGlzIGZ1bmN0aW9uIHdp bGwgYmUKLWNhbGxlZCB3aXRoIHRoZSBsaW5rIHRhcmdldCwgYW5kIHRoZSByZXN1bHQgd2lsbCBi ZSB0aGUgZGVmYXVsdAotbGluayBkZXNjcmlwdGlvbi4KLQogSWYgdGhlIExJTkstTE9DQVRJT04g cGFyYW1ldGVyIGlzIG5vbi1uaWwsIHRoaXMgdmFsdWUgd2lsbCBiZSB1c2VkIGFzCiB0aGUgbGlu ayBsb2NhdGlvbiBpbnN0ZWFkIG9mIHJlYWRpbmcgb25lIGludGVyYWN0aXZlbHkuCiAKLUlmIHRo ZSBERUZBVUxULURFU0NSSVBUSU9OIHBhcmFtZXRlciBpcyBub24tbmlsLCB0aGlzIHZhbHVlIHdp bGwgYmUgdXNlZAotYXMgdGhlIGRlZmF1bHQgZGVzY3JpcHRpb24uIgorSWYgdGhlIERFRkFVTFQt REVTQ1JJUFRJT04gcGFyYW1ldGVyIGlzIG5vbi1uaWwsIHRoaXMgdmFsdWUgd2lsbAorYmUgdXNl ZCBhcyB0aGUgZGVmYXVsdCBkZXNjcmlwdGlvbi4gIE90aGVyd2lzZSwgaWYKK2BvcmctbWFrZS1s aW5rLWRlc2NyaXB0aW9uLWZ1bmN0aW9uJyBpcyBub24tbmlsLCB0aGlzIGZ1bmN0aW9uCit3aWxs IGJlIGNhbGxlZCB3aXRoIHRoZSBsaW5rIHRhcmdldCwgYW5kIHRoZSByZXN1bHQgd2lsbCBiZSB0 aGUKK2RlZmF1bHQgbGluayBkZXNjcmlwdGlvbi4iCiAgIChpbnRlcmFjdGl2ZSAiUCIpCiAgIChs ZXQqICgod2NmIChjdXJyZW50LXdpbmRvdy1jb25maWd1cmF0aW9uKSkKIAkgKG9yaWdidWYgKGN1 cnJlbnQtYnVmZmVyKSkKQEAgLTEwMjk0LDE3ICsxMDI5MywxNyBAQCBVc2UgVEFCIHRvIGNvbXBs ZXRlIGxpbmsgcHJlZml4ZXMsIHRoZW4gUkVUIGZvciB0eXBlLXNwZWNpZmljIGNvbXBsZXRpb24g c3VwcG9ydAogCSAgKHdoZW4gKGVxdWFsIGRlc2Mgb3JpZ3BhdGgpCiAJICAgIChzZXRxIGRlc2Mg cGF0aCkpKSkpCiAKLSAgICAoaWYgb3JnLW1ha2UtbGluay1kZXNjcmlwdGlvbi1mdW5jdGlvbgot CShzZXRxIGRlc2MKLQkgICAgICAob3IgKGNvbmRpdGlvbi1jYXNlIG5pbAotCQkgICAgICAoZnVu Y2FsbCBvcmctbWFrZS1saW5rLWRlc2NyaXB0aW9uLWZ1bmN0aW9uIGxpbmsgZGVzYykKLQkJICAg IChlcnJvciAocHJvZ24gKG1lc3NhZ2UgIkNhbid0IGdldCBsaW5rIGRlc2NyaXB0aW9uIGZyb20g YCVzJyIKLQkJCQkJICAgKHN5bWJvbC1uYW1lIG9yZy1tYWtlLWxpbmstZGVzY3JpcHRpb24tZnVu Y3Rpb24pKQotCQkJCSAgKHNpdC1mb3IgMikgbmlsKSkpCi0JCSAgKHJlYWQtc3RyaW5nICJEZXNj cmlwdGlvbjogIiBkZWZhdWx0LWRlc2NyaXB0aW9uKSkpCi0gICAgICAoaWYgZGVmYXVsdC1kZXNj cmlwdGlvbiAoc2V0cSBkZXNjIGRlZmF1bHQtZGVzY3JpcHRpb24pCi0JKHNldHEgZGVzYyAob3Ig KGFuZCBhdXRvLWRlc2MgZGVzYykKLQkJICAgICAgIChyZWFkLXN0cmluZyAiRGVzY3JpcHRpb246 ICIgZGVzYykpKSkpCisgICAgKHVubGVzcyBhdXRvLWRlc2MKKyAgICAgIChzZXRxIGRlc2MgKHJl YWQtc3RyaW5nICJEZXNjcmlwdGlvbjogIgorCQkJICAgICAgKG9yIGRlZmF1bHQtZGVzY3JpcHRp b24KKwkJCQkgICh3aGVuIG9yZy1tYWtlLWxpbmstZGVzY3JpcHRpb24tZnVuY3Rpb24KKwkJCQkg ICAgKGNvbmRpdGlvbi1jYXNlIG5pbAorCQkJCQkoZnVuY2FsbCBvcmctbWFrZS1saW5rLWRlc2Ny aXB0aW9uLWZ1bmN0aW9uIGxpbmsgZGVzYykKKwkJCQkgICAgICAoZXJyb3IgKHByb2duIChtZXNz YWdlICJDYW4ndCBnZXQgbGluayBkZXNjcmlwdGlvbiBmcm9tIGAlcyciCisJCQkJCQkJICAgICAo c3ltYm9sLW5hbWUgb3JnLW1ha2UtbGluay1kZXNjcmlwdGlvbi1mdW5jdGlvbikpCisJCQkJCQkg ICAgKHNpdC1mb3IgMikgbmlsKSkpKQorCQkJCSAgCisJCQkJICBkZXNjKSkpKQogCiAgICAgKHVu bGVzcyAoc3RyaW5nLW1hdGNoICJcXFMtIiBkZXNjKSAoc2V0cSBkZXNjIG5pbCkpCiAgICAgKHdo ZW4gcmVtb3ZlIChhcHBseSAnZGVsZXRlLXJlZ2lvbiByZW1vdmUpKQotLSAKMi43LjQKCg== --001a113c333c19f10f0558a18472--