From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexey Lebedeff Subject: [PATCH] `org-return' in 8.3 no longer follows links in headings Date: Wed, 12 Aug 2015 23:49:13 +0300 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a11c26120f6a459051d2359be Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPcxZ-0005bo-54 for emacs-orgmode@gnu.org; Wed, 12 Aug 2015 16:49:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPcxX-0002sK-S5 for emacs-orgmode@gnu.org; Wed, 12 Aug 2015 16:49:17 -0400 Received: from mail-wi0-x236.google.com ([2a00:1450:400c:c05::236]:38040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPcxX-0002ru-Gs for emacs-orgmode@gnu.org; Wed, 12 Aug 2015 16:49:15 -0400 Received: by wicja10 with SMTP id ja10so43215496wic.1 for ; Wed, 12 Aug 2015 13:49:14 -0700 (PDT) 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-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --001a11c26120f6a459051d2359be Content-Type: multipart/alternative; boundary=001a11c26120f6a455051d2359bc --001a11c26120f6a455051d2359bc Content-Type: text/plain; charset=UTF-8 Hi all, After switching to 8.3 I discovered that `org-return' no longer follows links in headings, even if `org-return-follows-link' is non-nil. Instead it started inserting newlines in the middle of link. This change of behavior was introduced by a7e62499f2fe5c313567212ee90ff743c5e734a8 In the attached patch I just shuffled parts of `org-return' around. Maybe it is better to move tag-preserving newline code to some helper function, but I'm not sure how to do it properly. Best, Alexey --001a11c26120f6a455051d2359bc Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi all,

After switching to 8.3 I discov= ered that `org-return' no longer follows links in headings, even if `or= g-return-follows-link' is non-nil. Instead it started inserting newline= s in the middle of link. This change of behavior was introduced by=C2=A0a7e= 62499f2fe5c313567212ee90ff743c5e734a8

In the attac= hed patch I just shuffled parts of `org-return' around. Maybe it is bet= ter to move tag-preserving newline code to some helper function, but I'= m not sure how to do it properly.


B= est,
Alexey
--001a11c26120f6a455051d2359bc-- --001a11c26120f6a459051d2359be Content-Type: text/x-patch; charset=US-ASCII; name="0001-Make-org-return-follow-links-in-headings-again.patch" Content-Disposition: attachment; filename="0001-Make-org-return-follow-links-in-headings-again.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_id98ztex0 RnJvbSBkMzAwOTNkNDAxOWQ0NDViNmI4ZDE3NjgzNzYwMWJjM2Y3MTJiMTkwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4ZXkgTGViZWRlZmYgPGJpbmFyaW5AZ21haWwuY29tPgpE YXRlOiBXZWQsIDEyIEF1ZyAyMDE1IDIzOjAyOjQ5ICswMzAwClN1YmplY3Q6IFtQQVRDSF0gTWFr ZSBgb3JnLXJldHVybicgZm9sbG93IGxpbmtzIGluIGhlYWRpbmdzIGFnYWluCgoqIG9yZy5lbCAo b3JnLXJldHVybik6IENoZWNrIGZvciBsaW5rcyBmaXJzdCB3aGVuCiAgYG9yZy1yZXR1cm4tZm9s bG93cy1saW5rJyBpcyBub24tbmlsLCBiZWZvcmUgaW5zZXJ0aW5nIGFueSBuZXdsaW5lcy4KClRo aXMgcGF0Y2ggcmVzdG9yZXMgb3JkZXIgaW4gd2hpY2ggYG9yZy1yZXR1cm4nIHBlcmZvcm0gYWN0 aW9ucyAod2hpY2gKd2FzIGNoYW5nZWQgaW4gYTdlNjI0OTlmMmZlNWMzMTM1NjcyMTJlZTkwZmY3 NDNjNWU3MzRhOCkuICBJdCBpcwpUSU5ZQ0hBTkdFLCBiZWNhdXNlIHBhdGNoIG1vc3RseSBjb25z aXN0cyBvZiBtb3ZpbmcgZXhpc3RpbmcgY29kZQphcm91bmQuCi0tLQogbGlzcC9vcmcuZWwgICAg ICAgICAgICAgIHwgNjMgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCiB0ZXN0aW5nL2xpc3AvdGVzdC1vcmcuZWwgfCAgNiArKysrKwogMiBmaWxlcyBjaGFu Z2VkLCAzOCBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNw L29yZy5lbCBiL2xpc3Avb3JnLmVsCmluZGV4IGU4NjQzZTEuLmQ3ZWNmODUgMTAwNzU1Ci0tLSBh L2xpc3Avb3JnLmVsCisrKyBiL2xpc3Avb3JnLmVsCkBAIC0yMTI4Nyw3ICsyMTI4NywyOCBAQCB3 aWxsIG5vdCBoYXBwZW4gaWYgcG9pbnQgaXMgaW4gYSB0YWJsZSBvciBvbiBhIFwiZGVhZFwiCiBv YmplY3QgKGUuZy4sIHdpdGhpbiBhIGNvbW1lbnQpLiAgSW4gdGhlc2UgY2FzZSwgeW91IG5lZWQg dG8gdXNlCiBgb3JnLW9wZW4tYXQtcG9pbnQnIGRpcmVjdGx5LiIKICAgKGludGVyYWN0aXZlKQot ICAoaWYgKGFuZCAobm90IChib2xwKSkKKyAgKGxldCogKChjb250ZXh0IChpZiBvcmctcmV0dXJu LWZvbGxvd3MtbGluayAob3JnLWVsZW1lbnQtY29udGV4dCkKKwkJICAgIChvcmctZWxlbWVudC1h dC1wb2ludCkpKQorCSAodHlwZSAob3JnLWVsZW1lbnQtdHlwZSBjb250ZXh0KSkpCisgICAgKGNv bmQKKyAgICAgOzsgSW4gYSB0YWJsZSwgY2FsbCBgb3JnLXRhYmxlLW5leHQtcm93Jy4KKyAgICAg KChvciAoYW5kIChlcSB0eXBlICd0YWJsZSkKKwkgICAgICAgKD49IChwb2ludCkgKG9yZy1lbGVt ZW50LXByb3BlcnR5IDpjb250ZW50cy1iZWdpbiBjb250ZXh0KSkKKwkgICAgICAgKDwgKHBvaW50 KSAob3JnLWVsZW1lbnQtcHJvcGVydHkgOmNvbnRlbnRzLWVuZCBjb250ZXh0KSkpCisJICAob3Jn LWVsZW1lbnQtbGluZWFnZSBjb250ZXh0ICcodGFibGUtcm93IHRhYmxlLWNlbGwpIHQpKQorICAg ICAgKG9yZy10YWJsZS1qdXN0aWZ5LWZpZWxkLW1heWJlKQorICAgICAgKGNhbGwtaW50ZXJhY3Rp dmVseSAjJ29yZy10YWJsZS1uZXh0LXJvdykpCisgICAgIDs7IE9uIGEgbGluayBvciBhIHRpbWVz dGFtcCBidXQgbm90IG9uIHdoaXRlIHNwYWNlcyBhZnRlciBpdCwKKyAgICAgOzsgY2FsbCBgb3Jn LW9wZW4tbGluZScgaWYgYG9yZy1yZXR1cm4tZm9sbG93cy1saW5rJyBhbGxvd3MgaXQuCisgICAg ICgoYW5kIG9yZy1yZXR1cm4tZm9sbG93cy1saW5rCisJICAgKG1lbXEgdHlwZSAnKGxpbmsgdGlt ZXN0YW1wKSkKKwkgICAoPCAocG9pbnQpCisJICAgICAgKHNhdmUtZXhjdXJzaW9uIChnb3RvLWNo YXIgKG9yZy1lbGVtZW50LXByb3BlcnR5IDplbmQgY29udGV4dCkpCisJCQkgICAgICAoc2tpcC1j aGFycy1iYWNrd2FyZCAiIFx0IikKKwkJCSAgICAgIChwb2ludCkpKSkKKyAgICAgIChjYWxsLWlu dGVyYWN0aXZlbHkgIydvcmctb3Blbi1hdC1wb2ludCkpCisgICAgIDs7IEluc2VydCBuZXdsaW5l IGluIGhlYWRpbmcsIGJ1dCBwcmVzZXJ2ZSB0YWdzLgorICAgICAoKGFuZCAobm90IChib2xwKSkK IAkgICAoc2F2ZS1leGN1cnNpb24gKGJlZ2lubmluZy1vZi1saW5lKQogCQkJICAgKGxvb2tpbmct YXQgb3JnLWNvbXBsZXgtaGVhZGluZy1yZWdleHApKSkKICAgICAgIDs7IEF0IGhlYWRsaW5lLgpA QCAtMjEzMTcsMzYgKzIxMzM4LDE2IEBAIG9iamVjdCAoZS5nLiwgd2l0aGluIGEgY29tbWVudCku ICBJbiB0aGVzZSBjYXNlLCB5b3UgbmVlZCB0byB1c2UKIAkoZW5kLW9mLWxpbmUpCiAJKG9yZy1z aG93LWVudHJ5KQogCShpZiBpbmRlbnQgKG5ld2xpbmUtYW5kLWluZGVudCkgKG5ld2xpbmUpKQot CShhbmQgc3RyaW5nIChzYXZlLWV4Y3Vyc2lvbiAoaW5zZXJ0IChvcmctdHJpbSBzdHJpbmcpKSkp KQotICAgIChsZXQqICgoY29udGV4dCAoaWYgb3JnLXJldHVybi1mb2xsb3dzLWxpbmsgKG9yZy1l bGVtZW50LWNvbnRleHQpCi0JCSAgICAgIChvcmctZWxlbWVudC1hdC1wb2ludCkpKQotCSAgICh0 eXBlIChvcmctZWxlbWVudC10eXBlIGNvbnRleHQpKSkKLSAgICAgIChjb25kCi0gICAgICAgOzsg SW4gYSB0YWJsZSwgY2FsbCBgb3JnLXRhYmxlLW5leHQtcm93Jy4KLSAgICAgICAoKG9yIChhbmQg KGVxIHR5cGUgJ3RhYmxlKQotCQkgKD49IChwb2ludCkgKG9yZy1lbGVtZW50LXByb3BlcnR5IDpj b250ZW50cy1iZWdpbiBjb250ZXh0KSkKLQkJICg8IChwb2ludCkgKG9yZy1lbGVtZW50LXByb3Bl cnR5IDpjb250ZW50cy1lbmQgY29udGV4dCkpKQotCSAgICAob3JnLWVsZW1lbnQtbGluZWFnZSBj b250ZXh0ICcodGFibGUtcm93IHRhYmxlLWNlbGwpIHQpKQotCShvcmctdGFibGUtanVzdGlmeS1m aWVsZC1tYXliZSkKLQkoY2FsbC1pbnRlcmFjdGl2ZWx5ICMnb3JnLXRhYmxlLW5leHQtcm93KSkK LSAgICAgICA7OyBPbiBhIGxpbmsgb3IgYSB0aW1lc3RhbXAgYnV0IG5vdCBvbiB3aGl0ZSBzcGFj ZXMgYWZ0ZXIgaXQsCi0gICAgICAgOzsgY2FsbCBgb3JnLW9wZW4tbGluZScgaWYgYG9yZy1yZXR1 cm4tZm9sbG93cy1saW5rJyBhbGxvd3MgaXQuCi0gICAgICAgKChhbmQgb3JnLXJldHVybi1mb2xs b3dzLWxpbmsKLQkgICAgIChtZW1xIHR5cGUgJyhsaW5rIHRpbWVzdGFtcCkpCi0JICAgICAoPCAo cG9pbnQpCi0JCShzYXZlLWV4Y3Vyc2lvbiAoZ290by1jaGFyIChvcmctZWxlbWVudC1wcm9wZXJ0 eSA6ZW5kIGNvbnRleHQpKQotCQkJCShza2lwLWNoYXJzLWJhY2t3YXJkICIgXHQiKQotCQkJCShw b2ludCkpKSkKLQkoY2FsbC1pbnRlcmFjdGl2ZWx5ICMnb3JnLW9wZW4tYXQtcG9pbnQpKQotICAg ICAgIDs7IEluIGEgbGlzdCwgbWFrZSBzdXJlIGluZGVudGluZyBrZWVwcyB0cmFpbGluZyB0ZXh0 IHdpdGhpbi4KLSAgICAgICAoKGFuZCBpbmRlbnQKLQkgICAgIChub3QgKGVvbHApKQotCSAgICAg KG9yZy1lbGVtZW50LWxpbmVhZ2UgY29udGV4dCAnKGl0ZW0pKSkKLQkobGV0ICgodHJhaWxpbmct ZGF0YQotCSAgICAgICAoZGVsZXRlLWFuZC1leHRyYWN0LXJlZ2lvbiAocG9pbnQpIChsaW5lLWVu ZC1wb3NpdGlvbikpKSkKLQkgIChuZXdsaW5lLWFuZC1pbmRlbnQpCi0JICAoc2F2ZS1leGN1cnNp b24gKGluc2VydCB0cmFpbGluZy1kYXRhKSkpKQotICAgICAgICh0IChpZiBpbmRlbnQgKG5ld2xp bmUtYW5kLWluZGVudCkgKG5ld2xpbmUpKSkpKSkpCisJKGFuZCBzdHJpbmcgKHNhdmUtZXhjdXJz aW9uIChpbnNlcnQgKG9yZy10cmltIHN0cmluZykpKSkpKQorICAgICA7OyBJbiBhIGxpc3QsIG1h a2Ugc3VyZSBpbmRlbnRpbmcga2VlcHMgdHJhaWxpbmcgdGV4dCB3aXRoaW4uCisgICAgICgoYW5k IGluZGVudAorCSAgIChub3QgKGVvbHApKQorCSAgIChvcmctZWxlbWVudC1saW5lYWdlIGNvbnRl eHQgJyhpdGVtKSkpCisgICAgICAobGV0ICgodHJhaWxpbmctZGF0YQorCSAgICAgKGRlbGV0ZS1h bmQtZXh0cmFjdC1yZWdpb24gKHBvaW50KSAobGluZS1lbmQtcG9zaXRpb24pKSkpCisJKG5ld2xp bmUtYW5kLWluZGVudCkKKwkoc2F2ZS1leGN1cnNpb24gKGluc2VydCB0cmFpbGluZy1kYXRhKSkp KQorICAgICAodCAoaWYgaW5kZW50IChuZXdsaW5lLWFuZC1pbmRlbnQpIChuZXdsaW5lKSkpKSkp CiAKIChkZWZ1biBvcmctcmV0dXJuLWluZGVudCAoKQogICAiR290byBuZXh0IHRhYmxlIHJvdyBv ciBpbnNlcnQgYSBuZXdsaW5lIGFuZCBpbmRlbnQuCmRpZmYgLS1naXQgYS90ZXN0aW5nL2xpc3Av dGVzdC1vcmcuZWwgYi90ZXN0aW5nL2xpc3AvdGVzdC1vcmcuZWwKaW5kZXggM2ExNTZiOC4uOWZl ZTc4NyAxMDA2NDQKLS0tIGEvdGVzdGluZy9saXNwL3Rlc3Qtb3JnLmVsCisrKyBiL3Rlc3Rpbmcv bGlzcC90ZXN0LW9yZy5lbApAQCAtODkzLDYgKzg5MywxMiBAQAogICAgKG9yZy10ZXN0LXdpdGgt dGVtcC10ZXh0ICJMaW5rIFtbdGFyZ2V0PHBvaW50Pl1dIDw8dGFyZ2V0Pj4iCiAgICAgIChsZXQg KChvcmctcmV0dXJuLWZvbGxvd3MtbGluayBuaWwpKSAob3JnLXJldHVybikpCiAgICAgIChvcmct bG9va2luZy1hdC1wICI8PHRhcmdldD4+IikpKQorICA7OyBMaW5rIGluIGhlYWRpbmcgc2hvdWxk IGFsc28gYmUgb3BlbmVkIHdoZW4gYG9yZy1yZXR1cm4tZm9sbG93cy1saW5rYCBpcyBub24tbmls LgorICAoc2hvdWxkCisgICAob3JnLXRlc3Qtd2l0aC10ZW1wLXRleHQgIiogW1tiXVthPHBvaW50 Pl1dXG4qIGIiCisgICAgIChsZXQgKChvcmctcmV0dXJuLWZvbGxvd3MtbGluayB0KSkKKyAgICAg ICAob3JnLXJldHVybikpCisgICAgIChvcmctbG9va2luZy1hdC1wICIqIGIiKSkpCiAgIDs7IEhv d2V2ZXIsIGRvIG5vdCBvcGVuIGxpbmsgd2hlbiBwb2ludCBpcyBpbiBhIHRhYmxlLgogICAoc2hv dWxkCiAgICAob3JnLXRlc3Qtd2l0aC10ZW1wLXRleHQgInwgW1t0YXJnZXQ8cG9pbnQ+XV0gfFxu fCBiZXR3ZWVuIHxcbnwgPDx0YXJnZXQ+PiB8IgotLSAKMi4xLjQKCg== --001a11c26120f6a459051d2359be--