From mboxrd@z Thu Jan 1 00:00:00 1970 From: "R. Michael Weylandt" Subject: Re: Prepare release 8.2.6 Date: Sun, 6 Apr 2014 21:48:59 -0400 Message-ID: References: <87ha6adikd.fsf@bzg.ath.cx> <87y4zj60vz.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=089e014943246782d204f66a1399 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWygc-0007RW-J4 for emacs-orgmode@gnu.org; Sun, 06 Apr 2014 21:49:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WWygb-0007Jc-J0 for emacs-orgmode@gnu.org; Sun, 06 Apr 2014 21:49:22 -0400 Received: from mail-lb0-x234.google.com ([2a00:1450:4010:c04::234]:49535) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWygb-0007JX-5A for emacs-orgmode@gnu.org; Sun, 06 Apr 2014 21:49:21 -0400 Received: by mail-lb0-f180.google.com with SMTP id 10so4232865lbg.11 for ; Sun, 06 Apr 2014 18:49:19 -0700 (PDT) In-Reply-To: <87y4zj60vz.fsf@gmail.com> 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 Cc: "emacs-orgmode@gnu.org" --089e014943246782d204f66a1399 Content-Type: text/plain; charset=ISO-8859-1 On Sat, Apr 5, 2014 at 3:18 PM, Nicolas Goaziou wrote: > Hello, > > "R. Michael Weylandt" writes: > >>> 1) Tell Emacs not to break inline source blocks when filling paragraphs: > > I suggest not to use `org-in-regexp' here but `org-element-context'. I'm not as familiar with org-element-context, but I think the attached is what you had in mind. > Besides inline source blocks, ISTR there was other places where filling > was inappropriate (verbatim, code, export snippet, macro...). A single > `org-element-context' will find them all. Verbatim seems to work over multiple lines so I've left them out. Macros and inline source blocks don't so I've included them. Not sure what other elements to look at: > > Another option for the problem at hand is to simply remove newline > characters in inline source blocks before executing them. > That might be better but would require a bit more work: at present, inline source blocks can't extend over multiple lines so org wouldn't recognize a construct like src_python[:exports results]{1 + 2 + 3 + 4} as an inline source block in the first place. Looking at org-inline-src-block-regexp I'm not sure why though. Patch also attached to improve link handling Michael --089e014943246782d204f66a1399 Content-Type: application/octet-stream; name="0001-org.el-Don-t-fill-on-inline-source-blocks-or-macros.patch" Content-Disposition: attachment; filename="0001-org.el-Don-t-fill-on-inline-source-blocks-or-macros.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_htp3ojlz0 RnJvbSAwM2Y1OGFmMWViYTQ1NTBkZDhmMjUwMDQ2OGVlODUyZDUyYTg5MjYwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIFdleWxhbmR0IDxtaWNoYWVsLndleWxhbmR0QGdt YWlsLmNvbT4KRGF0ZTogU3VuLCA2IEFwciAyMDE0IDIxOjE5OjU2IC0wNDAwClN1YmplY3Q6IFtQ QVRDSCAxLzJdIG9yZy5lbDogRG9uJ3QgZmlsbCBvbiBpbmxpbmUgc291cmNlIGJsb2NrcyBvciBt YWNyb3MKCiogbGlzcC9vcmcuZWwgKG9yZy1maWxsLWVsZW1lbnQtbm9icmVhay1wKTogTmV3IGZ1 bmN0aW9uCgoqIGxpc3Avb3JnLmVsIChvcmctc2V0dXAtZmlsbGluZyk6IEFkZCBvcmctZmlsbC1l bGVtZW50LW5vYnJlYWstcCB0bwogIGZpbGwtbm9icmVhay1wcmVkaWNhdGUKCk9yZyBjdXJyZW50 bHkgZG9lc24ndCByZWNvZ25pemUgaW5saW5lIHNvdXJjZSBibG9ja3Mgb3IgbWFjcm9zIHNwcmVh ZApvdmVyIG11bHRpcGxlIGxpbmVzIHNvIHdlIG5lZWQgdG8ga2VlcCBFbWFjcyBmcm9tIGZpbGxp bmcgKGxpbmUKd3JhcHBpbmcpIGFuZCBicmVha2luZyB0aGVzZSBlbGVtZW50cy4KClRJTllDSEFO R0UKLS0tCiBsaXNwL29yZy5lbCB8IDkgKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNl cnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9vcmcuZWwgYi9saXNw L29yZy5lbAppbmRleCAzMThkOTVhLi41MmFjOGRkIDEwMDY0NAotLS0gYS9saXNwL29yZy5lbAor KysgYi9saXNwL29yZy5lbApAQCAtMjIyNDYsNyArMjIyNDYsOCBAQCBoaWVyYXJjaHkgb2YgaGVh ZGxpbmVzIGJ5IFVQIGxldmVscyBiZWZvcmUgbWFya2luZyB0aGUgc3VidHJlZS4iCiAgICAgIChv cmctdW5pcXVpZnkKICAgICAgIChhcHBlbmQgZmlsbC1ub2JyZWFrLXByZWRpY2F0ZQogCSAgICAg ICcob3JnLWZpbGwtbGluZS1icmVhay1ub2JyZWFrLXAKLQkJb3JnLWZpbGwtcGFyYWdyYXBoLXdp dGgtdGltZXN0YW1wLW5vYnJlYWstcCkpKSkpCisJCW9yZy1maWxsLXBhcmFncmFwaC13aXRoLXRp bWVzdGFtcC1ub2JyZWFrLXAKKwkJb3JnLWZpbGwtZWxlbWVudC1ub2JyZWFrLXApKSkpKQogICAo bGV0ICgocGFyYWdyYXBoLWVuZGluZyAoc3Vic3RyaW5nIG9yZy1lbGVtZW50LXBhcmFncmFwaC1z ZXBhcmF0ZSAxKSkpCiAgICAgKG9yZy1zZXQtbG9jYWwgJ3BhcmFncmFwaC1zdGFydCBwYXJhZ3Jh cGgtZW5kaW5nKQogICAgIChvcmctc2V0LWxvY2FsICdwYXJhZ3JhcGgtc2VwYXJhdGUgcGFyYWdy YXBoLWVuZGluZykpCkBAIC0yMjI2OCw2ICsyMjI2OSwxMiBAQCBoaWVyYXJjaHkgb2YgaGVhZGxp bmVzIGJ5IFVQIGxldmVscyBiZWZvcmUgbWFya2luZyB0aGUgc3VidHJlZS4iCiAgIChhbmQgKG9y Zy1hdC10aW1lc3RhbXAtcCB0KQogICAgICAgIChub3QgKGxvb2tpbmctYXQgb3JnLXRzLXJlZ2V4 cC1ib3RoKSkpKQogCisoZGVmdW4gb3JnLWZpbGwtZWxlbWVudC1ub2JyZWFrLXAgKCkKKyAgIk5v bi1uaWwgd2hlbiBhIG5ldyBsaW5lIGF0IHBvaW50IHdvdWxkIGJyZWFrIGFuIGVsZW1lbnQgd2hp Y2gKKyAgY2Fubm90IGJlIHNwbGl0IG92ZXIgbXVsdGlwbGUgbGluZXMuIgorICAobWVtYmVyIChj YXIgKG9yZy1lbGVtZW50LWNvbnRleHQpKQorCSAgJyhpbmxpbmUtc3JjLWJsb2NrIG1hY3JvKSkp CisKIChkZWNsYXJlLWZ1bmN0aW9uIG1lc3NhZ2UtaW4tYm9keS1wICJtZXNzYWdlIiAoKSkKIChk ZWZ2YXIgb3JndGJsLWxpbmUtc3RhcnQtcmVnZXhwKSA7IEZyb20gb3JnLXRhYmxlLmVsCiAoZGVm dW4gb3JnLWFkYXB0aXZlLWZpbGwtZnVuY3Rpb24gKCkKLS0gCjEuOC4zLjQgKEFwcGxlIEdpdC00 NykKCg== --089e014943246782d204f66a1399 Content-Type: application/octet-stream; name="0002-org.el-Remove-and-from-org-link-escape-chars.patch" Content-Disposition: attachment; filename="0002-org.el-Remove-and-from-org-link-escape-chars.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_htp3ojnq1 RnJvbSA3MDIzZjQxMjA5M2UxYzE3MjAzYzk5NTllOTI5YWQ1NzU1NzAwNmY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIFdleWxhbmR0IDxtaWNoYWVsLndleWxhbmR0QGdt YWlsLmNvbT4KRGF0ZTogU3VuLCA2IEFwciAyMDE0IDIxOjM3OjEyIC0wNDAwClN1YmplY3Q6IFtQ QVRDSCAyLzJdIG9yZy5lbDogUmVtb3ZlID0sICssIGFuZCA7IGZyb20gb3JnLWxpbmstZXNjYXBl LWNoYXJzCgoqIG9yZy5lbCAob3JnLWxpbmstZXNjYXBlLWNoYXJzKTogUmVtb3ZlID0sICssIGFu ZCA7Cgo9LCArLCBhbmQgOyBhcmUgYWxsIHZhbGlkIFVSSSBjaGFyYWN0ZXJzIChSRkMgMzk4Nikg YW5kIGRvbid0IGJyZWFrCm9yZydzIHN5bnRheCBzbyB0aGVyZSdzIG5vIG5lZWQgdG8gZXNjYXBl IHRoZW0gaW4gbGluayBoYW5kbGluZy4KClRoaXMgZml4ZXMsIGUuZy4sCgoob3JnLWluc2VydC1s aW5rIG5pbCAiaHR0cDovL2dvb2dsZS5jb20vc2VhcmNoP3E9b3JnbW9kZSIgIk9yZyBtb2RlIikK CndoaWNoIHByZXZpb3VzbHkgd291bGQgcHJvZHVjZSBhbiBpbnZhbGlkIFVSSSBpbiBib3RoIHRo ZSBvcmcgZmlsZSBhbmQKZXhwb3J0ZWQgZG9jdW1lbnRzLgoKVElOWUNIQU5HRQotLS0KIGxpc3Av b3JnLmVsIHwgMiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9u KC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9vcmcuZWwgYi9saXNwL29yZy5lbAppbmRleCA1MmFjOGRk Li5mODgzZjU2IDEwMDY0NAotLS0gYS9saXNwL29yZy5lbAorKysgYi9saXNwL29yZy5lbApAQCAt OTc0MCw3ICs5NzQwLDcgQEAgYWNjb3JkaW5nIHRvIEZNVCAoZGVmYXVsdCBmcm9tIGBvcmctZW1h aWwtbGluay1kZXNjcmlwdGlvbi1mb3JtYXQnKS4iCiAJICAiXSIpKQogCiAoZGVmY29uc3Qgb3Jn LWxpbmstZXNjYXBlLWNoYXJzCi0gICcoP1wgP1xbID9cXSA/XDsgP1w9ID9cKykKKyAgJyg/XCA/ XFsgP1xdKQogICAiTGlzdCBvZiBjaGFyYWN0ZXJzIHRoYXQgc2hvdWxkIGJlIGVzY2FwZWQgaW4g bGluay4KIFRoaXMgaXMgdGhlIGxpc3QgdGhhdCBpcyB1c2VkIGZvciBpbnRlcm5hbCBwdXJwb3Nl cy4iKQogCi0tIAoxLjguMy40IChBcHBsZSBHaXQtNDcpCgo= --089e014943246782d204f66a1399--