From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Brand Subject: Re: Add the capture feature "%(sexp)" to org-feed Date: Sat, 11 Aug 2012 17:31:00 +0200 Message-ID: References: <7822.1339898820@alphaville> <87y5lqe21l.fsf@gnu.org> <87liho86cp.fsf@gnu.org> <87a9y3m8ko.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=f46d0444ec19d5fa1f04c6ff25d6 Return-path: Received: from eggs.gnu.org ([208.118.235.92]:37383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0Deb-00059z-H3 for emacs-orgmode@gnu.org; Sat, 11 Aug 2012 11:31:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T0DeY-0006Xv-EN for emacs-orgmode@gnu.org; Sat, 11 Aug 2012 11:31:05 -0400 In-Reply-To: <87a9y3m8ko.fsf@gnu.org> 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: Bastien Cc: Org Mode --f46d0444ec19d5fa1f04c6ff25d6 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Hi Bastien On Fri, Aug 10, 2012 at 10:53 AM, Bastien wrote: > Please try the attached patch and let me know if it works. Thank you for making `org-capture-inside-embedded-elisp-p' much clearer. I was not sure if you really wanted to omit switching to Emacs Lisp Mode although it is useful for example for =93%(length ")")=94. So I attach a new patch where I restored this part, now cleaner too. Also a small change against your latest patch to not stop at =93%=94 without following =93(=94 and possibly miss a =93%(=94 before. I temporarily emptied =93:FEEDSTATUS:=94 in all my feeds and updated them and also tried some odd artificial examples. All works the same as with my first patch. Can you please review this new patch compared against your latest and apply when appropriate? Michael --f46d0444ec19d5fa1f04c6ff25d6 Content-Type: text/plain; charset=US-ASCII; name="0001-Add-the-capture-feature-sexp-to-org-feed.patch.txt" Content-Disposition: attachment; filename="0001-Add-the-capture-feature-sexp-to-org-feed.patch.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h5qv1s4i1 RnJvbSAxNDI2MjViYWQ0NWNhMDdhMTg1ZDk1Y2FhMGQ4MTAyMjVlMzg5Yjk1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIEJyYW5kIDxtaWNoYWVsLmNoLmJyYW5kQGdtYWls LmNvbT4KRGF0ZTogU2F0LCAxMSBBdWcgMjAxMiAxNzoyNjo1NyArMDIwMApTdWJqZWN0OiBbUEFU Q0hdIEFkZCB0aGUgY2FwdHVyZSBmZWF0dXJlIHNleHAgdG8gb3JnIGZlZWQKCiogb3JnLWZlZWQu ZWwgKG9yZy1mZWVkLWZvcm1hdC1lbnRyeSk6IFJlcXVpcmUgYG9yZy1jYXB0dXJlJy4KRXhwYW5k IEVsaXNwICUoLi4uKSB0ZW1wbGF0ZXMuCihvcmctZmVlZC1kZWZhdWx0LXRlbXBsYXRlKTogVXBk YXRlIGRvY3N0cmluZy4KCiogb3JnLWNhcHR1cmUuZWwgKG9yZy1jYXB0dXJlLWV4cGFuZC1lbWJl ZGRlZC1lbGlzcCk6IE5ldwpmdW5jdGlvbi4KKG9yZy1jYXB0dXJlLWZpbGwtdGVtcGxhdGUpOiBV c2UgaXQuCihvcmctY2FwdHVyZS1pbnNpZGUtZW1iZWRkZWQtZWxpc3AtcCk6IE5ldyBmdW5jdGlv biB0byB0ZWxsIGlmCndlIGFyZSB3aXRoaW4gYW4gRWxpc3AgJSguLi4pIHRlbXBsYXRlLgotLS0K IGxpc3Avb3JnLWNhcHR1cmUuZWwgfCAgIDQwICsrKysrKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLQogbGlzcC9vcmctZmVlZC5lbCAgICB8ICAgNTYgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNjggaW5zZXJ0 aW9ucygrKSwgMjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9vcmctY2FwdHVyZS5l bCBiL2xpc3Avb3JnLWNhcHR1cmUuZWwKaW5kZXggODRlNWZmNi4uNGExMTQ2MiAxMDA2NDQKLS0t IGEvbGlzcC9vcmctY2FwdHVyZS5lbAorKysgYi9saXNwL29yZy1jYXB0dXJlLmVsCkBAIC0xMzg4 LDE1ICsxMzg4LDcgQEAgVGhlIHRlbXBsYXRlIG1heSBzdGlsbCBjb250YWluIFwiJT9cIiBmb3Ig Y3Vyc29yIHBvc2l0aW9uaW5nLiIKIAkgICAgICAoZXJyb3IgKGluc2VydCAoZm9ybWF0ICIlJSFb Q291bGRuJ3QgaW5zZXJ0ICVzOiAlc10iCiAJCQkJICAgICBmaWxlbmFtZSBlcnJvcikpKSkpKSkK ICAgICAgIDs7ICUoKSBlbWJlZGRlZCBlbGlzcAotICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWlu KSkKLSAgICAgICh3aGlsZSAocmUtc2VhcmNoLWZvcndhcmQgIiVcXCgoLispXFwpIiBuaWwgdCkK LQkodW5sZXNzIChvcmctY2FwdHVyZS1lc2NhcGVkLSUpCi0JICAoZ290by1jaGFyIChtYXRjaC1i ZWdpbm5pbmcgMCkpCi0JICAobGV0ICgodGVtcGxhdGUtc3RhcnQgKHBvaW50KSkpCi0JICAgIChm b3J3YXJkLWNoYXIgMSkKLQkgICAgKGxldCAoKHJlc3VsdCAob3JnLWV2YWwgKHJlYWQgKGN1cnJl bnQtYnVmZmVyKSkpKSkKLQkgICAgICAoZGVsZXRlLXJlZ2lvbiB0ZW1wbGF0ZS1zdGFydCAocG9p bnQpKQotCSAgICAgIChpbnNlcnQgcmVzdWx0KSkpKSkKKyAgICAgIChvcmctY2FwdHVyZS1leHBh bmQtZW1iZWRkZWQtZWxpc3ApCiAKICAgICAgIDs7IFRoZSBjdXJyZW50IHRpbWUKICAgICAgIChn b3RvLWNoYXIgKHBvaW50LW1pbikpCkBAIC0xNTMwLDYgKzE1MjIsMzYgQEAgVGhlIHRlbXBsYXRl IG1heSBzdGlsbCBjb250YWluIFwiJT9cIiBmb3IgY3Vyc29yIHBvc2l0aW9uaW5nLiIKIAl0KQog ICAgIG5pbCkpCiAKKyhkZWZ1biBvcmctY2FwdHVyZS1leHBhbmQtZW1iZWRkZWQtZWxpc3AgKCkK KyAgIkV2YWx1YXRlIGVtYmVkZGVkIGVsaXNwICUoc2V4cCkgYW5kIHJlcGxhY2Ugd2l0aCB0aGUg cmVzdWx0LiIKKyAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKKyAgKHdoaWxlIChyZS1zZWFyY2gt Zm9yd2FyZCAiJSgiIG5pbCB0KQorICAgICh1bmxlc3MgKG9yZy1jYXB0dXJlLWVzY2FwZWQtJSkK KyAgICAgIChnb3RvLWNoYXIgKG1hdGNoLWJlZ2lubmluZyAwKSkKKyAgICAgIChsZXQgKCh0ZW1w bGF0ZS1zdGFydCAocG9pbnQpKSkKKwkoZm9yd2FyZC1jaGFyIDEpCisJKGxldCAoKHJlc3VsdCAo b3JnLWV2YWwgKHJlYWQgKGN1cnJlbnQtYnVmZmVyKSkpKSkKKwkgIChkZWxldGUtcmVnaW9uIHRl bXBsYXRlLXN0YXJ0IChwb2ludCkpCisJICAoaW5zZXJ0IHJlc3VsdCkpKSkpKQorCisoZGVmdW4g b3JnLWNhcHR1cmUtaW5zaWRlLWVtYmVkZGVkLWVsaXNwLXAgKCkKKyAgIlJldHVybiBub24tbmls IGlmIHBvaW50IGlzIGluc2lkZSBvZiBlbWJlZGRlZCBlbGlzcCAlKHNleHApLiIKKyAgKGxldCAo KGJ1ZiAoYnVmZmVyLXN0cmluZykpIChwIChwb2ludCkpIGJlZyBlbmQpCisgICAgKHdpdGgtdGVt cC1idWZmZXIgICA7IHRvIGtlZXAgbWFqb3IgbW9kZSBhbmQgZm9udC1sb2NrIGluIG9yaWdpbmFs IGJ1ZmZlcgorICAgICAgKGVtYWNzLWxpc3AtbW9kZSkgOyB0byBkZWFsIHdpdGggZm9yIGV4YW1w bGUgJShsZW5ndGggIikiKQorICAgICAgKGluc2VydCBidWYpCisgICAgICAoZ290by1jaGFyIHAp CisgICAgICA7OyBgbG9va2luZy1hdCcgYW5kIGBzZWFyY2gtYmFja3dhcmQnIGJlbG93IGRvIG5v dCBtYXRjaCB0aGUgIiUoIiBpZgorICAgICAgOzsgcG9pbnQgaXMgaW4gaXRzIG1pZGRsZQorICAg ICAgKHdoZW4gKGVxdWFsIChjaGFyLWJlZm9yZSkgPyUpCisgICAgICAgIChiYWNrd2FyZC1jaGFy KSkKKyAgICAgIChzYXZlLW1hdGNoLWRhdGEKKwkod2hlbiAob3IgKGxvb2tpbmctYXQgIiUoIikg KHNlYXJjaC1iYWNrd2FyZCAiJSgiIG5pbCB0KSkKKwkgIChzZXRxIGJlZyAocG9pbnQpKQorCSAg KHNldHEgZW5kIChwcm9nbiAoZm9yd2FyZC1jaGFyKSAoZm9yd2FyZC1zZXhwKSAoMS0gKHBvaW50 KSkpKSkpKQorICAgICh3aGVuIChhbmQgYmVnIGVuZCkKKyAgICAgIChhbmQgKDw9IHAgZW5kKSAo Pj0gcCBiZWcpKSkpKQorCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIG9yZy1jYXB0dXJlLWltcG9y dC1yZW1lbWJlci10ZW1wbGF0ZXMgKCkKICAgIlNldCBvcmctY2FwdHVyZS10ZW1wbGF0ZXMgdG8g YmUgc2ltaWxhciB0byBgb3JnLXJlbWVtYmVyLXRlbXBsYXRlcycuIgpkaWZmIC0tZ2l0IGEvbGlz cC9vcmctZmVlZC5lbCBiL2xpc3Avb3JnLWZlZWQuZWwKaW5kZXggNjkwMWZmYS4uOGIzNDE0YiAx MDA2NDQKLS0tIGEvbGlzcC9vcmctZmVlZC5lbAorKysgYi9saXNwL29yZy1mZWVkLmVsCkBAIC0y MjUsMTIgKzIyNSwxNCBAQCBBbnkgZmllbGRzIGZyb20gdGhlIGZlZWQgaXRlbSBjYW4gYmUgaW50 ZXJwb2xhdGVkIGludG8gdGhlIHRlbXBsYXRlIHdpdGgKICVuYW1lLCBmb3IgZXhhbXBsZSAldGl0 bGUsICVkZXNjcmlwdGlvbiwgJXB1YkRhdGUgZXRjLiAgSW4gYWRkaXRpb24sIHRoZQogZm9sbG93 aW5nIHNwZWNpYWwgZXNjYXBlcyBhcmUgdmFsaWQgYXMgd2VsbDoKIAotJWggICAgICB0aGUgdGl0 bGUsIG9yIHRoZSBmaXJzdCBsaW5lIG9mIHRoZSBkZXNjcmlwdGlvbgotJXQgICAgICB0aGUgZGF0 ZSBhcyBhIHN0YW1wLCBlaXRoZXIgZnJvbSA8cHViRGF0ZT4gKGlmIHByZXNlbnQpLCBvcgotICAg ICAgICB0aGUgY3VycmVudCBkYXRlLgotJVQgICAgICBkYXRlIGFuZCB0aW1lCi0ldSwlVSAgIGxp a2UgJXQsJVQsIGJ1dCBpbmFjdGl2ZSB0aW1lIHN0YW1wcwotJWEgICAgICBBIGxpbmssIGZyb20g PGd1aWQ+IGlmIHRoYXQgaXMgYSBwZXJtYWxpbmssIGVsc2UgZnJvbSA8bGluaz4iCislaCAgICAg IFRoZSB0aXRsZSwgb3IgdGhlIGZpcnN0IGxpbmUgb2YgdGhlIGRlc2NyaXB0aW9uCisldCAgICAg IFRoZSBkYXRlIGFzIGEgc3RhbXAsIGVpdGhlciBmcm9tIDxwdWJEYXRlPiAoaWYgcHJlc2VudCks IG9yCisgICAgICAgIHRoZSBjdXJyZW50IGRhdGUKKyVUICAgICAgRGF0ZSBhbmQgdGltZQorJXUs JVUgICBMaWtlICV0LCVULCBidXQgaW5hY3RpdmUgdGltZSBzdGFtcHMKKyVhICAgICAgQSBsaW5r LCBmcm9tIDxndWlkPiBpZiB0aGF0IGlzIGEgcGVybWFsaW5rLCBlbHNlIGZyb20gPGxpbms+Cisl KHNleHApIEV2YWx1YXRlIGVsaXNwIGAoc2V4cCknIGFuZCByZXBsYWNlIHdpdGggdGhlIHJlc3Vs dCwgdGhlIHNpbXBsZQorICAgICAgICAlLWVzY2FwZXMgYWJvdmUgY2FuIGJlIHVzZWQgYXMgYXJn dW1lbnRzLCBlLmcuICUoY2FwaXRhbGl6ZSBcXFwiJWhcXFwiKSIKICAgOmdyb3VwICdvcmctZmVl ZAogICA6dHlwZSAnKHN0cmluZyA6dGFnICJUZW1wbGF0ZSIpKQogCkBAIC01MDYsOSArNTA4LDEw IEBAIFRoaXMgd2lsbCBmaW5kIERSQVdFUiBhbmQgZXh0cmFjdCB0aGUgYWxpc3QuIgogRU5UUlkg aXMgYSBwcm9wZXJ0eSBsaXN0LiAgVGhpcyBmdW5jdGlvbiBhZGRzIGEgYDpmb3JtYXR0ZWQtZm9y LW9yZycgcHJvcGVydHkKIGFuZCByZXR1cm5zIHRoZSBmdWxsIHByb3BlcnR5IGxpc3QuCiBJZiB0 aGF0IHByb3BlcnR5IGlzIGFscmVhZHkgcHJlc2VudCwgbm90aGluZyBjaGFuZ2VzLiIKKyAgKHJl cXVpcmUgJ29yZy1jYXB0dXJlKQogICAoaWYgZm9ybWF0dGVyCiAgICAgICAoZnVuY2FsbCBmb3Jt YXR0ZXIgZW50cnkpCi0gICAgKGxldCAoZGxpbmVzIGZtdCB0bXAgaW5kZW50IHRpbWUgbmFtZQor ICAgIChsZXQgKGRsaW5lcyB0aW1lIGVzY2FwZSBuYW1lIHRtcAogCQkgdi1oIHYtdCB2LVQgdi11 IHYtVSB2LWEpCiAgICAgICAoc2V0cSBkbGluZXMgKG9yZy1zcGxpdC1zdHJpbmcgKG9yIChwbGlz dC1nZXQgZW50cnkgOmRlc2NyaXB0aW9uKSAiPz8/IikKIAkJCQkgICAgICJcbiIpCkBAIC01Mjcs MjAgKzUzMCwzNSBAQCBJZiB0aGF0IHByb3BlcnR5IGlzIGFscmVhZHkgcHJlc2VudCwgbm90aGlu ZyBjaGFuZ2VzLiIKIAkJICAiIikpCiAgICAgICAod2l0aC10ZW1wLWJ1ZmZlcgogCShpbnNlcnQg dGVtcGxhdGUpCisKKwk7OyBTaW1wbGUgJS1lc2NhcGVzCisJOzsgYmVmb3JlIGVtYmVkZGVkIGVs aXNwIHRvIHN1cHBvcnQgc2ltcGxlICUtZXNjYXBlcyBhcworCTs7IGFyZ3VtZW50cyBmb3IgZW1i ZWRkZWQgZWxpc3AKIAkoZ290by1jaGFyIChwb2ludC1taW4pKQogCSh3aGlsZSAocmUtc2VhcmNo LWZvcndhcmQgIiVcXChbYS16QS1aXStcXCkiIG5pbCB0KQotCSAgKHNldHEgbmFtZSAobWF0Y2gt c3RyaW5nIDEpKQotCSAgKGNvbmQKLQkgICAoKG1lbWJlciBuYW1lICcoImgiICJ0IiAiVCIgInUi ICJVIiAiYSIpKQotCSAgICAocmVwbGFjZS1tYXRjaCAoc3ltYm9sLXZhbHVlIChpbnRlcm4gKGNv bmNhdCAidi0iIG5hbWUpKSkgdCB0KSkKLQkgICAoKHNldHEgdG1wIChwbGlzdC1nZXQgZW50cnkg KGludGVybiAoY29uY2F0ICI6IiBuYW1lKSkpKQotCSAgICAoc2F2ZS1leGN1cnNpb24KLQkgICAg ICAoc2F2ZS1tYXRjaC1kYXRhCi0JCShiZWdpbm5pbmctb2YtbGluZSAxKQotCQkod2hlbiAobG9v a2luZy1hdCAoY29uY2F0ICJeXFwoWyBcdF0qXFwpJSIgbmFtZSAiWyBcdF0qJCIpKQotCQkgIChz ZXRxIHRtcCAob3JnLWZlZWQtbWFrZS1pbmRlbnRlZC1ibG9jawotCQkJICAgICB0bXAgKG9yZy1n ZXQtaW5kZW50YXRpb24pKSkpKSkKLQkgICAgKHJlcGxhY2UtbWF0Y2ggdG1wIHQgdCkpKSkKKwkg ICh1bmxlc3MgKG9yZy1jYXB0dXJlLWVzY2FwZWQtJSkKKwkgICAgKHNldHEgbmFtZSAobWF0Y2gt c3RyaW5nIDEpCisJCSAgZXNjYXBlIChvcmctY2FwdHVyZS1pbnNpZGUtZW1iZWRkZWQtZWxpc3At cCkpCisJICAgIChjb25kCisJICAgICAoKG1lbWJlciBuYW1lICcoImgiICJ0IiAiVCIgInUiICJV IiAiYSIpKQorCSAgICAgIChzZXRxIHRtcCAoc3ltYm9sLXZhbHVlIChpbnRlcm4gKGNvbmNhdCAi di0iIG5hbWUpKSkpKQorCSAgICAgKChzZXRxIHRtcCAocGxpc3QtZ2V0IGVudHJ5IChpbnRlcm4g KGNvbmNhdCAiOiIgbmFtZSkpKSkKKwkgICAgICAoc2F2ZS1leGN1cnNpb24KKwkJKHNhdmUtbWF0 Y2gtZGF0YQorCQkgIChiZWdpbm5pbmctb2YtbGluZSAxKQorCQkgICh3aGVuIChsb29raW5nLWF0 CisJCQkgKGNvbmNhdCAiXlxcKFsgXHRdKlxcKSUiIG5hbWUgIlsgXHRdKiQiKSkKKwkJICAgIChz ZXRxIHRtcCAob3JnLWZlZWQtbWFrZS1pbmRlbnRlZC1ibG9jaworCQkJICAgICAgIHRtcCAob3Jn LWdldC1pbmRlbnRhdGlvbikpKSkpKSkpCisJICAgICh3aGVuIHRtcAorCSAgICAgIDs7IGVzY2Fw ZSBzdHJpbmcgZGVsaW1pdGVycyBgIicgd2hlbiBpbnNpZGUgJSgpIGVtYmVkZGVkIGxpc3AKKwkg ICAgICAod2hlbiBlc2NhcGUKKwkJKHNldHEgdG1wIChyZXBsYWNlLXJlZ2V4cC1pbi1zdHJpbmcg IlwiIiAiXFxcXFwiIiB0bXApKSkKKwkgICAgICAocmVwbGFjZS1tYXRjaCB0bXAgdCB0KSkpKQor CisJOzsgJSgpIGVtYmVkZGVkIGVsaXNwCisJKG9yZy1jYXB0dXJlLWV4cGFuZC1lbWJlZGRlZC1l bGlzcCkKKwogCShkZWNvZGUtY29kaW5nLXN0cmluZwogCSAoYnVmZmVyLXN0cmluZykgKGRldGVj dC1jb2RpbmctcmVnaW9uIChwb2ludC1taW4pIChwb2ludC1tYXgpIHQpKSkpKSkKIAotLSAKMS43 LjQuMgoK --f46d0444ec19d5fa1f04c6ff25d6--