From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Holm Subject: [PATCH v1 3/4] contrib/lisp/org-annotate-file.el improvements Date: Sat, 15 Mar 2014 19:18:55 +0100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a11c1266225a2db04f4a938eb Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOtAe-0005EK-Qa for emacs-orgmode@gnu.org; Sat, 15 Mar 2014 14:18:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOtAe-0000k3-0K for emacs-orgmode@gnu.org; Sat, 15 Mar 2014 14:18:56 -0400 Received: from mail-qc0-x22e.google.com ([2607:f8b0:400d:c01::22e]:61194) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOtAd-0000jk-Q5 for emacs-orgmode@gnu.org; Sat, 15 Mar 2014 14:18:55 -0400 Received: by mail-qc0-f174.google.com with SMTP id x13so4254283qcv.19 for ; Sat, 15 Mar 2014 11:18:55 -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 --001a11c1266225a2db04f4a938eb Content-Type: multipart/alternative; boundary=001a11c1266225a2d804f4a938e9 --001a11c1266225a2d804f4a938e9 Content-Type: text/plain; charset=ISO-8859-1 The third patch provides the bulk of the change. It extracts most of the functionality of `org-annotate-file-show-section` into `org-annotate-file-annotate` and now just acts as a wrapper around it for setting up and returning the buffer to the caller. --001a11c1266225a2d804f4a938e9 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
The third patch provides the bulk of the change. =A0It ext= racts most of the functionality of `org-annotate-file-show-section` into `o= rg-annotate-file-annotate` and now just acts as a wrapper around it for set= ting up and returning the buffer to the caller.
--001a11c1266225a2d804f4a938e9-- --001a11c1266225a2db04f4a938eb Content-Type: application/octet-stream; name="0003-Allow-the-user-to-control-the-annotation-buffer.patch" Content-Disposition: attachment; filename="0003-Allow-the-user-to-control-the-annotation-buffer.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hst7we4h0 RnJvbSBhNDk2NjZjMGZjNzk4MGVlMzM1YWQ3OGE1OTg3ZmViNTMyMzkwODY5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBIb2xtIDxkaG9sbXN0ZXJAZ21haWwuY29tPgpEYXRl OiBTYXQsIDE1IE1hciAyMDE0IDE3OjIxOjUwICswMTAwClN1YmplY3Q6IFtQQVRDSCAzLzRdIEFs bG93IHRoZSB1c2VyIHRvIGNvbnRyb2wgdGhlIGFubm90YXRpb24gYnVmZmVyCgoqIGNvbnRyaWIv bGlzcC9vcmctYW5ub3RhdGUtZmlsZS5lbCAob3JnLWFubm90YXRlLWZpbGUsCm9yZy1hbm5vdGF0 ZS1maWxlLXNob3ctc2VjdGlvbik6IFJldHVybiB0aGUgYW5ub3RhdGlvbiBidWZmZXIgZnJvbQpg b3JnLWFubm90YXRlLWZpbGUtc2hvdy1zZWN0aW9uYCBzbyB0aGF0IHRoZSB1c2VyIGNhbiBkZWNp ZGUgaG93IHRvCmRpc3BsYXkgaXQuCgpXaGVuIGFkZGluZyBhbiBhbm5vdGF0aW9uIHVzaW5nIG9y Zy1maWxlLWFubm90YXRlLCB0aGUgYnVmZmVyIHdvdWxkCmFsd2F5cyBiZSBvcGVuZWQgaW4gdGhl IGN1cnJlbnQgd2luZG93LiAgQnkgbm90IG1ha2luZyB0aGUgYnVmZmVyCmN1cnJlbnQgYW5kIGlu c3RlYWQgcmV0dXJuaW5nIGl0IGZyb20gYG9yZy1hbm5vdGF0ZS1maWxlLXNob3ctc2VjdGlvbmAK dGhlIHVzZXIgY2FuIGNvbnRyb2wgaG93IHRvIGRpc3BsYXkgaXQuCgpGb3IgaW5zdGFuY2UsIGl0 IGNhbiBiZSBvcGVuZWQgaW4gYSBwb3B1cCB3aW5kb3cgdXNpbmcgcG9wd2luOgoKICAgIChwb3B3 aW46ZGlzcGxheS1idWZmZXItMSAob3JnLWFubm90YXRlLWZpbGUtc2hvdy1zZWN0aW9uIHN0b3Jh Z2UtZmlsZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6ZGVmYXVsdC1jb25maWcta2V5 d29yZHMgJyg6cG9zaXRpb24gOmJvdHRvbSkpCgpUaGUgZnVuY3Rpb24gYG9yZy1hbm5vdGF0ZS1m aWxlYCB3aWxsIHN0aWxsIHdvcmsgYXMgYmVmb3JlIGFuZCBvcGVuCnRoZSBidWZmZXIgaW4gdGhl IGN1cnJlbnQgd2luZG93LgotLS0KIGNvbnRyaWIvbGlzcC9vcmctYW5ub3RhdGUtZmlsZS5lbCB8 IDY1ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDM3IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2NvbnRy aWIvbGlzcC9vcmctYW5ub3RhdGUtZmlsZS5lbCBiL2NvbnRyaWIvbGlzcC9vcmctYW5ub3RhdGUt ZmlsZS5lbAppbmRleCBiNWMxZjVkLi42YmVhN2VmIDEwMDY0NAotLS0gYS9jb250cmliL2xpc3Av b3JnLWFubm90YXRlLWZpbGUuZWwKKysrIGIvY29udHJpYi9saXNwL29yZy1hbm5vdGF0ZS1maWxl LmVsCkBAIC04NCw0MCArODQsNDkgQEAgVHJpbSB3aGl0ZXNwYWNlIGF0IGJlZ2lubmluZyBhbmQg ZW5kIG9mIFNUUklORyBhbmQgcmVwbGFjZSBhbnkKICAgICBzdHJpbmcpKQogCiAoZGVmdW4gb3Jn LWFubm90YXRlLWZpbGUgKCkKLSAgIlB1dCBhIHNlY3Rpb24gZm9yIHRoZSBjdXJyZW50IGZpbGUg aW50byB5b3VyIGFubm90YXRpb24gZmlsZS4iCisgICJWaXNpdCBgb3JnLWFubm90YXRlLWZpbGUt c3RvcmFnZS1maWxlYCBhbmQgYWRkIGEgbmV3IGFubm90YXRpb24gc2VjdGlvbi4KK1RoZSBhbm5v dGF0aW9uIGlzIG9wZW5lZCBhdCB0aGUgbmV3IHNlY3Rpb24gd2hpY2ggd2lsbCBiZSByZWZlcmVu Y2luZwordGhlIHBvaW50IGluIHRoZSBjdXJyZW50IGZpbGUuIgogICAoaW50ZXJhY3RpdmUpCiAg ICh1bmxlc3MgKGJ1ZmZlci1maWxlLW5hbWUpCiAgICAgKGVycm9yICJUaGlzIGJ1ZmZlciBoYXMg bm8gYXNzb2NpYXRlZCBmaWxlISIpKQotICAob3JnLWFubm90YXRlLWZpbGUtc2hvdy1zZWN0aW9u IG9yZy1hbm5vdGF0ZS1maWxlLXN0b3JhZ2UtZmlsZSkpCi0KLShkZWZ1biBvcmctYW5ub3RhdGUt ZmlsZS1zaG93LXNlY3Rpb24gKHN0b3JhZ2UtZmlsZSAmb3B0aW9uYWwgYnVmZmVyKQotICAiVmlz aXQgdGhlIGJ1ZmZlciBuYW1lZCBTVE9SQUdFLUZJTEUuCi1UaGUgY3Vyc29yIHdpbGwgYmUgcGxh Y2VkIGF0IHRoZSByZWxldmFudCBzZWN0aW9uLiAgSWYgQlVGRkVSIGlzCi0gIHNwZWNpZmllZCB0 aGUgYW5ub3RhdGlvbiB3aWxsIGJlIHJlZmVyZW5jaW5nIGl0LCBvdGhlcndpc2UgdGhlCi0gIGN1 cnJlbnQgYnVmZmVyIGlzIHVzZWQuIgotICAobGV0KiAoKGZpbGVuYW1lIChhYmJyZXZpYXRlLWZp bGUtbmFtZSAob3IgYnVmZmVyIChidWZmZXItZmlsZS1uYW1lKSkpKQotICAgICAgICAgKGxpbmUg KGJ1ZmZlci1zdWJzdHJpbmctbm8tcHJvcGVydGllcyAocG9pbnQtYXQtYm9sKSAocG9pbnQtYXQt ZW9sKSkpCi0gICAgICAgICAobGluayAob3JnLW1ha2UtbGluay1zdHJpbmcgKGNvbmNhdCAiZmls ZToiIGZpbGVuYW1lKSBmaWxlbmFtZSkpCisgIChzd2l0Y2gtdG8tYnVmZmVyCisgICAob3JnLWFu bm90YXRlLWZpbGUtc2hvdy1zZWN0aW9uIG9yZy1hbm5vdGF0ZS1maWxlLXN0b3JhZ2UtZmlsZSkp KQorCisoZGVmdW4gb3JnLWFubm90YXRlLWZpbGUtc2hvdy1zZWN0aW9uIChzdG9yYWdlLWZpbGUg Jm9wdGlvbmFsIGFubm90YXRlZC1idWZmZXIpCisgICJBZGQgb3Igc2hvdyBhbm5vdGF0aW9uIGVu dHJ5IGluIFNUT1JBR0UtRklMRSBhbmQgcmV0dXJuIHRoZSBidWZmZXIuCitUaGUgYW5ub3RhdGlv biB3aWxsIGxpbmsgdG8gQU5OT1RBVEVELUJVRkZFUiBpZiBzcGVjaWZpZWQsCisgIG90aGVyd2lz ZSB0aGUgY3VycmVudCBidWZmZXIgaXMgdXNlZC4iCisgIChsZXQgKChmaWxlbmFtZSAoYWJicmV2 aWF0ZS1maWxlLW5hbWUgKG9yIGFubm90YXRlZC1idWZmZXIKKwkJCQkJICAgIChidWZmZXItZmls ZS1uYW1lKSkpKQorICAgICAgICAobGluZSAoYnVmZmVyLXN1YnN0cmluZy1uby1wcm9wZXJ0aWVz IChwb2ludC1hdC1ib2wpIChwb2ludC1hdC1lb2wpKSkKKyAgICAgICAgKGFubm90YXRpb24tYnVm ZmVyIChmaW5kLWZpbGUtbm9zZWxlY3Qgc3RvcmFnZS1maWxlKSkpCisgICAgKHdpdGgtY3VycmVu dC1idWZmZXIgYW5ub3RhdGlvbi1idWZmZXIKKyAgICAgIChvcmctYW5ub3RhdGUtZmlsZS1hbm5v dGF0ZSBmaWxlbmFtZSBsaW5lKSkKKyAgICBhbm5vdGF0aW9uLWJ1ZmZlcikpCisKKyhkZWZ1biBv cmctYW5ub3RhdGUtZmlsZS1hbm5vdGF0ZSAoZmlsZW5hbWUgbGluZSkKKyAgIkFkZCBhbm5vdGF0 aW9uIGZvciBGSUxFTkFNRSBhdCBMSU5FIHVzaW5nIGN1cnJlbnQgYnVmZmVyLiIKKyAgKGxldCog KChsaW5rIChvcmctbWFrZS1saW5rLXN0cmluZyAoY29uY2F0ICJmaWxlOiIgZmlsZW5hbWUpIGZp bGVuYW1lKSkKICAgICAgICAgIChzZWFyY2gtbGluayAob3JnLW1ha2UtbGluay1zdHJpbmcKICAg ICAgICAgICAgICAgICAgICAgICAgKGNvbmNhdCAiZmlsZToiIGZpbGVuYW1lICI6OiIgbGluZSkK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAob3JnLWFubm90YXRlLWZpbGUtZWxsaXBz aWZ5LWRlc2MgbGluZSkpKSkKLSAgICAod2l0aC1jdXJyZW50LWJ1ZmZlciAoZmluZC1maWxlIHN0 b3JhZ2UtZmlsZSkKLSAgICAgICh1bmxlc3MgKGVxIG1ham9yLW1vZGUgJ29yZy1tb2RlKQotICAg ICAgICAob3JnLW1vZGUpKQotICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKLSAgICAgICh3 aWRlbikKLSAgICAgICh3aGVuIG9yZy1hbm5vdGF0ZS1maWxlLWFsd2F5cy1vcGVuCi0gICAgICAg IChzaG93LWFsbCkpCisJCSAgICAgICAob3JnLWFubm90YXRlLWZpbGUtZWxsaXBzaWZ5LWRlc2Mg bGluZSkpKSkKKyAgICAodW5sZXNzIChlcSBtYWpvci1tb2RlICdvcmctbW9kZSkKKyAgICAgIChv cmctbW9kZSkpCisgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKKyAgICAod2lkZW4pCisgICAg KHdoZW4gb3JnLWFubm90YXRlLWZpbGUtYWx3YXlzLW9wZW4KKyAgICAgIChzaG93LWFsbCkpCisg ICAgKHVubGVzcyAoc2VhcmNoLWZvcndhcmQtcmVnZXhwCisJICAgICAoY29uY2F0ICJeKiAiIChy ZWdleHAtcXVvdGUgbGluaykpIG5pbCB0KQorICAgICAgKG9yZy1hbm5vdGF0ZS1maWxlLWFkZC11 cHBlci1sZXZlbCBsaW5rKSkKKyAgICAoYmVnaW5uaW5nLW9mLWxpbmUpCisgICAgKG9yZy1uYXJy b3ctdG8tc3VidHJlZSkKKyAgICA7OyBkZWFsIHdpdGggYSAnOjonIHNlYXJjaCBpZiBuZWVkIGJl CisgICAgKHdoZW4gb3JnLWFubm90YXRlLWZpbGUtYWRkLXNlYXJjaAogICAgICAgKHVubGVzcyAo c2VhcmNoLWZvcndhcmQtcmVnZXhwCi0gICAgICAgICAgICAgICAoY29uY2F0ICJeKiAiIChyZWdl eHAtcXVvdGUgbGluaykpIG5pbCB0KQotICAgICAgICAob3JnLWFubm90YXRlLWZpbGUtYWRkLXVw cGVyLWxldmVsIGxpbmspKQotICAgICAgKGJlZ2lubmluZy1vZi1saW5lKQotICAgICAgKG9yZy1u YXJyb3ctdG8tc3VidHJlZSkKLSAgICAgIDs7IGRlYWwgd2l0aCBhICc6Oicgc2VhcmNoIGlmIG5l ZWQgYmUKLSAgICAgICh3aGVuIG9yZy1hbm5vdGF0ZS1maWxlLWFkZC1zZWFyY2gKLSAgICAgICAg KHVubGVzcyAoc2VhcmNoLWZvcndhcmQtcmVnZXhwCi0gICAgICAgICAgICAgICAgIChjb25jYXQg Il4qKiAiIChyZWdleHAtcXVvdGUgc2VhcmNoLWxpbmspKSBuaWwgdCkKLSAgICAgICAgICAob3Jn LWFubm90YXRlLWZpbGUtYWRkLXNlY29uZC1sZXZlbCBzZWFyY2gtbGluaykpKSkpKQorCSAgICAg ICAoY29uY2F0ICJeKiogIiAocmVnZXhwLXF1b3RlIHNlYXJjaC1saW5rKSkgbmlsIHQpCisJKG9y Zy1hbm5vdGF0ZS1maWxlLWFkZC1zZWNvbmQtbGV2ZWwgc2VhcmNoLWxpbmspKSkpKQogCiAoZGVm dW4gb3JnLWFubm90YXRlLWZpbGUtYWRkLXVwcGVyLWxldmVsIChsaW5rKQogICAiQWRkIGFuZCBs aW5rIGhlYWRpbmcgdG8gTElOSy4iCi0tIAoxLjkuMAoK --001a11c1266225a2db04f4a938eb--