From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Irelan Subject: Re: Does :block field of clocktable respect org-extend-today-until? Date: Tue, 26 Jun 2018 18:48:49 -0700 Message-ID: References: <87lgdmj8ma.fsf@nicolasgoaziou.fr> <87o9hzhk2x.fsf@gnu.org> <87h8njuys0.fsf@nicolasgoaziou.fr> <8736z3urp0.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000937311056f95d14d" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXzZx-0001wQ-Cy for emacs-orgmode@gnu.org; Tue, 26 Jun 2018 21:49:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXzZw-0003Yt-2H for emacs-orgmode@gnu.org; Tue, 26 Jun 2018 21:49:05 -0400 In-Reply-To: <8736z3urp0.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: bzg@gnu.org, Org-mode --000000000000937311056f95d14d Content-Type: text/plain; charset="UTF-8" I've attached a patch on top of my first patch, containing tests. On Mon, May 7, 2018 at 1:38 PM Nicolas Goaziou wrote: > > Hello, > > Robert Irelan writes: > > > I've rebased against latest master and attached the patch. > > It looks good, thank you. > > Would you mind proving a couple of regression tests, e.g., in > "test-org-clock.el"? > > Regards, > > -- > Nicolas Goaziou -- Robert Irelan rirelan@gmail.com --000000000000937311056f95d14d Content-Type: text/x-patch; charset="US-ASCII"; name="0002-Add-tests-for-clocktable-behavior-under-org-extend-t.patch" Content-Disposition: attachment; filename="0002-Add-tests-for-clocktable-behavior-under-org-extend-t.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jiwgo6hh0 RnJvbSBhN2IxYTMxNjNkMzZhN2Q3MTVhYmNjZTA5NmM2MGVjNTBiYjQwNjU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2JlcnQgSXJlbGFuIDxybWlyZWxhbkBnb29nbGUuY29tPgpE YXRlOiBUdWUsIDI2IEp1biAyMDE4IDE4OjMzOjM5IC0wNzAwClN1YmplY3Q6IFtQQVRDSCAyLzJd IEFkZCB0ZXN0cyBmb3IgY2xvY2t0YWJsZSBiZWhhdmlvciB1bmRlcgogb3JnLWV4dGVuZC10b2Rh eS11bnRpbAoKLS0tCiB0ZXN0aW5nL2xpc3AvdGVzdC1vcmctY2xvY2suZWwgfCA1MCArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgNTAgaW5zZXJ0aW9u cygrKQoKZGlmZiAtLWdpdCBhL3Rlc3RpbmcvbGlzcC90ZXN0LW9yZy1jbG9jay5lbCBiL3Rlc3Rp bmcvbGlzcC90ZXN0LW9yZy1jbG9jay5lbAppbmRleCBlODUzMjVjMTQuLmFiYjM2MzdiZCAxMDA2 NDQKLS0tIGEvdGVzdGluZy9saXNwL3Rlc3Qtb3JnLWNsb2NrLmVsCisrKyBiL3Rlc3RpbmcvbGlz cC90ZXN0LW9yZy1jbG9jay5lbApAQCAtOTc5LDUgKzk3OSw1NSBAQCBDTE9DSzogWzIwMTctMTIt MjcgV2VkIDA4OjAwXS0tWzIwMTctMTItMjcgV2VkIDE2OjAwXSA9PiAgODowMCIKIAkJICAoY29u Y2F0ICI6c3RlcCBkYXkgOnRzdGFydCBcIjwyMDE3LTEyLTI1IE1vbj5cIiAiCiAJCQkgICI6dGVu ZCBcIjwyMDE3LTEyLTI3IFdlZCAyMzo1OT5cIiA6c3RlcHNraXAwIHQiKSkpKSkpKQogCisoZXJ0 LWRlZnRlc3QgdGVzdC1vcmctY2xvY2svY2xvY2t0YWJsZS9leHRlbmQtdG9kYXktdW50aWwgKCkK KyAgIlRlc3QgYXNzaWdubWVudCBvZiBjbG9jayB0aW1lIHRvIGRheXMgaW4gcHJlc2VuY2Ugb2Yg XCJvcmctZXh0ZW5kLXRvZGF5LXVudGlsXCIuIgorICA7OyBCYXNpYyB0ZXN0IG9mIDpibG9jayB3 aXRoIG9yZy1leHRlbmQtdG9kYXktdW50aWwgLSB0aGUgcmVwb3J0IGZvcgorICA7OyAyMDE3LTA5 LTMwIHNob3VsZCBpbmNsdWRlIHRoZSB0aW1lIGNsb2NrZWQgb24gMjAxNy0xMC0wMSBiZWZvcmUK KyAgOzsgMDQ6MDAuCisgIChzaG91bGQKKyAgIChlcXVhbCAifCBIZWFkbGluZSAgICAgfCBUaW1l ICAgfAorfC0tLS0tLS0tLS0tLS0tKy0tLS0tLS0tfAorfCAqVG90YWwgdGltZSogfCAqMjowMCog fAorfC0tLS0tLS0tLS0tLS0tKy0tLS0tLS0tfAorfCBGb28gICAgICAgICAgfCAyOjAwICAgfCIK KwkgIChvcmctdGVzdC13aXRoLXRlbXAtdGV4dAorCSAgICIqIEZvbworQ0xPQ0s6IFsyMDE3LTA5 LTMwIFNhdCAxMjowMF0tLVsyMDE3LTA5LTMwIFNhdCAxMzowMF0gPT4gIDE6MDAKK0NMT0NLOiBb MjAxNy0xMC0wMSBTdW4gMDI6MDBdLS1bMjAxNy0xMC0wMSBTdW4gMDM6MDBdID0+ICAxOjAwCitD TE9DSzogWzIwMTctMTAtMDEgU3VuIDExOjAwXS0tWzIwMTctMTAtMDEgU3VuIDEzOjAwXSA9PiAg MjowMCIKKwkgICAoc2V0cS1sb2NhbCBvcmctZXh0ZW5kLXRvZGF5LXVudGlsIDQpCisJICAgKGxl dCAoKHN5c3RlbS10aW1lLWxvY2FsZSAiZW5fVVMiKSkKKwkgICAgICh0ZXN0LW9yZy1jbG9jay1j bG9ja3RhYmxlLWNvbnRlbnRzCisJICAgICAgIjpibG9jayAyMDE3LTA5LTMwIikpKSkpCisKKyAg OzsgV2Vlay1sZW5ndGggYmxvY2sgLSB0aW1lIG9uIE1vbmRheSBiZWZvcmUgMDQ6MDAgc2hvdWxk IGJlCisgIDs7IGFzc2lnbmVkIHRvIHByZXZpb3VzIHdlZWsuCisgIChzaG91bGQKKyAgIChlcXVh bCAiCitXZWVrbHkgcmVwb3J0IHN0YXJ0aW5nIG9uOiBbMjAxNy0xMC0wMSBTdW5dCit8IEhlYWRs aW5lICAgICB8IFRpbWUgICB8Cit8LS0tLS0tLS0tLS0tLS0rLS0tLS0tLS18Cit8ICpUb3RhbCB0 aW1lKiB8ICoyOjAwKiB8Cit8LS0tLS0tLS0tLS0tLS0rLS0tLS0tLS18Cit8IEZvbyAgICAgICAg ICB8IDI6MDAgICB8CisKK1dlZWtseSByZXBvcnQgc3RhcnRpbmcgb246IFsyMDE3LTEwLTAyIE1v bl0KK3wgSGVhZGxpbmUgICAgIHwgVGltZSAgIHwKK3wtLS0tLS0tLS0tLS0tLSstLS0tLS0tLXwK K3wgKlRvdGFsIHRpbWUqIHwgKjI6MDAqIHwKK3wtLS0tLS0tLS0tLS0tLSstLS0tLS0tLXwKK3wg Rm9vICAgICAgICAgIHwgMjowMCAgIHwKKyIKKwkgIChvcmctdGVzdC13aXRoLXRlbXAtdGV4dAor CSAgICIqIEZvbworQ0xPQ0s6IFsyMDE3LTEwLTAxIFN1biAxMjowMF0tLVsyMDE3LTEwLTAxIFN1 biAxMzowMF0gPT4gIDE6MDAKK0NMT0NLOiBbMjAxNy0xMC0wMiBNb24gMDI6MDBdLS1bMjAxNy0x MC0wMiBNb24gMDM6MDBdID0+ICAxOjAwCitDTE9DSzogWzIwMTctMTAtMDIgTW9uIDExOjAwXS0t WzIwMTctMTAtMDIgTW9uIDEzOjAwXSA9PiAgMjowMCIKKwkgICAoc2V0cS1sb2NhbCBvcmctZXh0 ZW5kLXRvZGF5LXVudGlsIDQpCisJICAgKGxldCAoKHN5c3RlbS10aW1lLWxvY2FsZSAiZW5fVVMi KSkKKwkgICAgICh0ZXN0LW9yZy1jbG9jay1jbG9ja3RhYmxlLWNvbnRlbnRzCisJICAgICAgIjpz dGVwIHdlZWsgOmJsb2NrIDIwMTctMTAgOnN0ZXBza2lwMCB0IikpKSkpKQorCisKIChwcm92aWRl ICd0ZXN0LW9yZy1jbG9jaykKIDs7OyB0ZXN0LW9yZy1jbG9jay5lbCBlbmQgaGVyZQotLSAKMi4x OC4wLnJjMi4zNDYuZzAxM2FhNjkxMmUtZ29vZwoK --000000000000937311056f95d14d Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Make-org-extend-today-until-work-for-clocktable-bloc.patch" Content-Disposition: attachment; filename="0001-Make-org-extend-today-until-work-for-clocktable-bloc.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jiwgo6ho1 RnJvbSBkY2ViYTBkMDk2NGJjZTc1Y2Y3ODI0NmYzM2JlY2QwZmJlNTQzYjdkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2JlcnQgSXJlbGFuIDxybWlyZWxhbkBnb29nbGUuY29tPgpE YXRlOiBNb24sIDMwIEFwciAyMDE4IDE3OjE4OjE2IC0wNzAwClN1YmplY3Q6IFtQQVRDSCAxLzJd IE1ha2Ugb3JnLWV4dGVuZC10b2RheS11bnRpbCB3b3JrIGZvciBjbG9ja3RhYmxlIGJsb2NrCgpv cmctY2xvY2s6IFByb3Blcmx5IGhhbmRsZSBgb3JnLWV4dGVuZC10b2RheS11bnRpbCcgaW4gY2xv Y2sgdGFibGVzCgogKiBsaXNwL29yZy1jbG9jay5lbCAob3JnLWNsb2NrLXNwZWNpYWwtcmFuZ2Up OiBIYW5kbGUgbm9uLWRlZmF1bHQKICAgYG9yZy1leHRlbmQtdG9kYXktdW50aWwnIHdoZW4gZ2Vu ZXJhdGluZyBhIGNsb2NrIHRhYmxlIHdpdGggdGhlCiAgIGA6YmxvY2tgIGRpcmVjdGl2ZS4KCiBS ZXBvcnRlZC1ieTogUm9iZXJ0IElyZWxhbiA8cmlyZWxhbkBnbWFpbC5jb20+CiA8aHR0cDovL2xp c3RzLmdudS5vcmcvYXJjaGl2ZS9odG1sL2VtYWNzLW9yZ21vZGUvMjAxOC0wNC9tc2cwMDI5NC5o dG1sPgotLS0KIGxpc3Avb3JnLWNsb2NrLmVsIHwgMTggKysrKysrKysrKysrLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9saXNwL29yZy1jbG9jay5lbCBiL2xpc3Avb3JnLWNsb2NrLmVsCmluZGV4IGI3NjlhNGZlZC4u ZjI1NjJmYjZkIDEwMDY0NAotLS0gYS9saXNwL29yZy1jbG9jay5lbAorKysgYi9saXNwL29yZy1j bG9jay5lbApAQCAtMjIwMCwxMyArMjIwMCwxNyBAQCBoYXZlIHByaW9yaXR5LiIKIAkoYGxhc3Rx ICAgICAoc2V0cSBrZXkgJ3F1YXJ0ZXIgc2hpZnQgLTEpKSkpCiAgICAgOzsgUHJlcGFyZSBzdGFy dCBhbmQgZW5kIHRpbWVzIGRlcGVuZGluZyBvbiBLRVkncyB0eXBlLgogICAgIChwY2FzZSBrZXkK LSAgICAgICgob3IgYGRheSBgdG9kYXkpIChzZXRxIG0gMCBoIDAgaDEgMjQgZCAoKyBkIHNoaWZ0 KSkpCisgICAgICAoKG9yIGBkYXkgYHRvZGF5KSAoc2V0cSBtIDAKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGggb3JnLWV4dGVuZC10b2RheS11bnRpbAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgaDEgKCsgMjQgb3JnLWV4dGVuZC10b2RheS11bnRpbCkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGQgKCsgZCBzaGlmdCkpKQogICAgICAgKChvciBgd2VlayBgdGhp c3dlZWspCiAgICAgICAgKGxldCogKCh3cyAob3Igd3N0YXJ0IDEpKQogCSAgICAgIChkaWZmICgr ICgqIC03IHNoaWZ0KSAoaWYgKD0gZG93IDApICgtIDcgd3MpICgtIGRvdyB3cykpKSkpCi0JIChz ZXRxIG0gMCBoIDAgZCAoLSBkIGRpZmYpIGQxICgrIDcgZCkpKSkKKwkgKHNldHEgbSAwIGggb3Jn LWV4dGVuZC10b2RheS11bnRpbCBkICgtIGQgZGlmZikgZDEgKCsgNyBkKSkpKQogICAgICAgKChv ciBgbW9udGggYHRoaXNtb250aCkKLSAgICAgICAoc2V0cSBoIDAgbSAwIGQgKG9yIG1zdGFydCAx KSBtb250aCAoKyBtb250aCBzaGlmdCkgbW9udGgxICgxKyBtb250aCkpKQorICAgICAgIChzZXRx IGggb3JnLWV4dGVuZC10b2RheS11bnRpbCBtIDAgZCAob3IgbXN0YXJ0IDEpCisgICAgICAgICAg ICAgbW9udGggKCsgbW9udGggc2hpZnQpIG1vbnRoMSAoMSsgbW9udGgpKSkKICAgICAgICgob3Ig YHF1YXJ0ZXIgYHRoaXNxKQogICAgICAgIDs7IENvbXB1dGUgaWYgdGhpcyBzaGlmdCByZW1haW5z IGluIHRoaXMgeWVhci4gIElmIG5vdCwgY29tcHV0ZQogICAgICAgIDs7IGhvdyBtYW55IHllYXJz IGFuZCBxdWFydGVycyB3ZSBoYXZlIHRvIHNoaWZ0ICh2aWEgZmxvb3IqKSBhbmQKQEAgLTIyMjQs MTQgKzIyMjgsMTYgQEAgaGF2ZSBwcmlvcml0eS4iCiAJICAgICAoc2V0cSBzaGlmdGVkeSAoLSB5 ICgrIDEgKG50aCAwIHRtcCkpKQogCQkgICBzaGlmdGVkbSAoLSAxMyAoKiAzIChudGggMSB0bXAp KSkKIAkJICAgc2hpZnRlZHEgKC0gNSAobnRoIDEgdG1wKSkpKSkKLQkgKHNldHEgbSAwIGggMCBk IDEgbW9udGggc2hpZnRlZG0gbW9udGgxICgrIDMgc2hpZnRlZG0pIHkgc2hpZnRlZHkpKQorCSAo c2V0cSBtIDAgaCBvcmctZXh0ZW5kLXRvZGF5LXVudGlsIGQgMQorICAgICAgICAgICAgICAgbW9u dGggc2hpZnRlZG0gbW9udGgxICgrIDMgc2hpZnRlZG0pIHkgc2hpZnRlZHkpKQogCSgoPiAoKyBx IHNoaWZ0KSAwKQkJOyBTaGlmdCBpcyB3aXRoaW4gdGhpcyB5ZWFyLgogCSAoc2V0cSBzaGlmdGVk cSAoKyBxIHNoaWZ0KSkKIAkgKHNldHEgc2hpZnRlZHkgeSkKIAkgKGxldCAoKHFzaGlmdCAoKiAz ICgxLSAoKyBxIHNoaWZ0KSkpKSkKLQkgICAoc2V0cSBtIDAgaCAwIGQgMSBtb250aCAoKyAxIHFz aGlmdCkgbW9udGgxICgrIDQgcXNoaWZ0KSkpKSkpCisJICAgKHNldHEgbSAwIGggb3JnLWV4dGVu ZC10b2RheS11bnRpbCBkIDEKKyAgICAgICAgICAgICAgICAgbW9udGggKCsgMSBxc2hpZnQpIG1v bnRoMSAoKyA0IHFzaGlmdCkpKSkpKQogICAgICAgKChvciBgeWVhciBgdGhpc3llYXIpCi0gICAg ICAgKHNldHEgbSAwIGggMCBkIDEgbW9udGggMSB5ICgrIHkgc2hpZnQpIHkxICgxKyB5KSkpCisg ICAgICAgKHNldHEgbSAwIGggb3JnLWV4dGVuZC10b2RheS11bnRpbCBkIDEgbW9udGggMSB5ICgr IHkgc2hpZnQpIHkxICgxKyB5KSkpCiAgICAgICAoKG9yIGBpbnRlcmFjdGl2ZSBgdW50aWxub3cp KQk7IFNwZWNpYWwgY2FzZXMsIGlnbm9yZSB0aGVtLgogICAgICAgKF8gKHVzZXItZXJyb3IgIk5v IHN1Y2ggdGltZSBibG9jayAlcyIga2V5KSkpCiAgICAgOzsgRm9ybWF0IHN0YXJ0IGFuZCBlbmQg dGltZXMgYWNjb3JkaW5nIHRvIEFTLVNUUklOR1MuCi0tIAoyLjE4LjAucmMyLjM0Ni5nMDEzYWE2 OTEyZS1nb29nCgo= --000000000000937311056f95d14d--