From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Lee Subject: Re: [PATCH 1/3] org-habit: Add org-habit-scheduled-past-days Date: Sun, 03 Feb 2019 16:14:32 +0000 Message-ID: <1549210472.1796324.1649843960.19CE714C@webmail.messagingengine.com> References: <1549209786.1793881.1649841288.1CE09665@webmail.messagingengine.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="_----------=_154921047217963240" Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([209.51.188.92]:57203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqKPr-0008Rj-Lq for emacs-orgmode@gnu.org; Sun, 03 Feb 2019 11:14:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqKPp-0007FL-Nj for emacs-orgmode@gnu.org; Sun, 03 Feb 2019 11:14:43 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:53967) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gqKPl-0007Ak-P1 for emacs-orgmode@gnu.org; Sun, 03 Feb 2019 11:14:39 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 7C07516A5 for ; Sun, 3 Feb 2019 11:14:33 -0500 (EST) In-Reply-To: <1549209786.1793881.1649841288.1CE09665@webmail.messagingengine.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" To: emacs-orgmode@gnu.org This is a multi-part message in MIME format. --_----------=_154921047217963240 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" OK I guess in fact I'm 1. supposed to attach the patches (?) and 2. they contain hashes so I guess I should reattach them all together, having changed the first. Here they are. Sorry, I'm new to this email workflow. The new thing here since Nicolas reviewed this last year (apart from applying changes in response to review feedback) is "greying out" habits that you just did, by applying face 'org-agenda-done when a habit is scheduled for the future. On Sun, 3 Feb 2019, at 16:03, John Lee wrote: > * lisp/org-habit.el (org-habit-scheduled-past-days): New variable > > * lisp/org-agenda.el (org-agenda-get-scheduled): override > `org-scheduled-past-days' for habits if > `org-habit-scheduled-past-days` is not nil > > TINYCHANGE > --- > lisp/org-agenda.el | 4 +++- > lisp/org-habit.el | 15 +++++++++++++++ > 2 files changed, 18 insertions(+), 1 deletion(-) > > diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el > index 489ecec95..784a555a9 100644 > --- a/lisp/org-agenda.el > +++ b/lisp/org-agenda.el > @@ -90,6 +90,7 @@ > (defvar org-habit-show-habits) > (defvar org-habit-show-habits-only-for-today) > (defvar org-habit-show-all-today) > +(defvar org-habit-scheduled-past-days) > > ;; Defined somewhere in this file, but used before definition. > (defvar org-agenda-buffer-name "*Org Agenda*") > @@ -6201,7 +6202,8 @@ scheduled items with an hour specification like [h]h:mm." > habitp > (bound-and-true-p org-habit-show-all-today)) > (when (or (and (> ddays 0) (< diff ddays)) > - (> diff org-scheduled-past-days) > + (> diff (or (and habitp org-habit-scheduled-past-days) > + org-scheduled-past-days)) > (> schedule current) > (and (/= current schedule) > (/= current today) > diff --git a/lisp/org-habit.el b/lisp/org-habit.el > index af4520729..88df38ce0 100644 > --- a/lisp/org-habit.el > +++ b/lisp/org-habit.el > @@ -89,6 +89,21 @@ It will be green even if it was done after the deadline." > :group 'org-habit > :type 'boolean) > > +(defcustom org-habit-scheduled-past-days nil > +"Value to use instead of `org-scheduled-past-days', for habits only. > + > +If nil, `org-scheduled-past-days' is used. > + > +Setting this to say 10000 is a way to make habits always show up > +as a reminder, even if you set `org-scheduled-past-days' to a > +small value because you regard scheduled items as a way of > +\"turning on\" TODO items on a particular date, rather than as a > +means of creating calendar-based reminders." > + :group 'org-habit > + :type '(choice integer (const nil)) > + :package-version '(Org . "9.3") > + :safe (lambda (v) (or (integerp v) (null v)))) > + > (defface org-habit-clear-face > '((((background light)) (:background "#8270f9")) > (((background dark)) (:background "blue"))) > -- > 2.17.1 > > --_----------=_154921047217963240 Content-Disposition: attachment; filename="0001-org-habit-Add-org-habit-scheduled-past-days.patch" Content-Id: <1549210384.1796099.1736137cdfbeae48ff51ddeaf0e560bc3da06c37.36DCCD5F@content.messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-org-habit-Add-org-habit-scheduled-past-days.patch" RnJvbSA4MWE1NmI0YjJmZDhiZmE5MjY5NWE4Mzg2MTU4ZjZlMDM1ODRmOTQ4 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIExlZSA8amps QHBvYm94LmNvbT4KRGF0ZTogU3VuLCAzIEZlYiAyMDE5IDEyOjM1OjM5ICsw MDAwClN1YmplY3Q6IFtQQVRDSCAxLzNdIG9yZy1oYWJpdDogQWRkIG9yZy1o YWJpdC1zY2hlZHVsZWQtcGFzdC1kYXlzCgoqIGxpc3Avb3JnLWhhYml0LmVs IChvcmctaGFiaXQtc2NoZWR1bGVkLXBhc3QtZGF5cyk6IE5ldyB2YXJpYWJs ZQoKKiBsaXNwL29yZy1hZ2VuZGEuZWwgKG9yZy1hZ2VuZGEtZ2V0LXNjaGVk dWxlZCk6IG92ZXJyaWRlCiAgYG9yZy1zY2hlZHVsZWQtcGFzdC1kYXlzJyBm b3IgaGFiaXRzIGlmCiAgYG9yZy1oYWJpdC1zY2hlZHVsZWQtcGFzdC1kYXlz YCBpcyBub3QgbmlsCgpUSU5ZQ0hBTkdFCi0tLQogbGlzcC9vcmctYWdlbmRh LmVsIHwgIDQgKysrLQogbGlzcC9vcmctaGFiaXQuZWwgIHwgMTUgKysrKysr KysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyks IDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9saXNwL29yZy1hZ2VuZGEu ZWwgYi9saXNwL29yZy1hZ2VuZGEuZWwKaW5kZXggNDg5ZWNlYzk1Li43ODRh NTU1YTkgMTAwNjQ0Ci0tLSBhL2xpc3Avb3JnLWFnZW5kYS5lbAorKysgYi9s aXNwL29yZy1hZ2VuZGEuZWwKQEAgLTkwLDYgKzkwLDcgQEAKIChkZWZ2YXIg b3JnLWhhYml0LXNob3ctaGFiaXRzKQogKGRlZnZhciBvcmctaGFiaXQtc2hv dy1oYWJpdHMtb25seS1mb3ItdG9kYXkpCiAoZGVmdmFyIG9yZy1oYWJpdC1z aG93LWFsbC10b2RheSkKKyhkZWZ2YXIgb3JnLWhhYml0LXNjaGVkdWxlZC1w YXN0LWRheXMpCiAKIDs7IERlZmluZWQgc29tZXdoZXJlIGluIHRoaXMgZmls ZSwgYnV0IHVzZWQgYmVmb3JlIGRlZmluaXRpb24uCiAoZGVmdmFyIG9yZy1h Z2VuZGEtYnVmZmVyLW5hbWUgIipPcmcgQWdlbmRhKiIpCkBAIC02MjAxLDcg KzYyMDIsOCBAQCBzY2hlZHVsZWQgaXRlbXMgd2l0aCBhbiBob3VyIHNwZWNp ZmljYXRpb24gbGlrZSBbaF1oOm1tLiIKIAkJICAgICAgIGhhYml0cAogCQkg ICAgICAgKGJvdW5kLWFuZC10cnVlLXAgb3JnLWhhYml0LXNob3ctYWxsLXRv ZGF5KSkKIAkgICAgKHdoZW4gKG9yIChhbmQgKD4gZGRheXMgMCkgKDwgZGlm ZiBkZGF5cykpCi0JCSAgICAgICg+IGRpZmYgb3JnLXNjaGVkdWxlZC1wYXN0 LWRheXMpCisJCSAgICAgICg+IGRpZmYgKG9yIChhbmQgaGFiaXRwIG9yZy1o YWJpdC1zY2hlZHVsZWQtcGFzdC1kYXlzKQorCQkJCSAgb3JnLXNjaGVkdWxl ZC1wYXN0LWRheXMpKQogCQkgICAgICAoPiBzY2hlZHVsZSBjdXJyZW50KQog CQkgICAgICAoYW5kICgvPSBjdXJyZW50IHNjaGVkdWxlKQogCQkJICAgKC89 IGN1cnJlbnQgdG9kYXkpCmRpZmYgLS1naXQgYS9saXNwL29yZy1oYWJpdC5l bCBiL2xpc3Avb3JnLWhhYml0LmVsCmluZGV4IGFmNDUyMDcyOS4uODhkZjM4 Y2UwIDEwMDY0NAotLS0gYS9saXNwL29yZy1oYWJpdC5lbAorKysgYi9saXNw L29yZy1oYWJpdC5lbApAQCAtODksNiArODksMjEgQEAgSXQgd2lsbCBiZSBn cmVlbiBldmVuIGlmIGl0IHdhcyBkb25lIGFmdGVyIHRoZSBkZWFkbGluZS4i CiAgIDpncm91cCAnb3JnLWhhYml0CiAgIDp0eXBlICdib29sZWFuKQogCiso ZGVmY3VzdG9tIG9yZy1oYWJpdC1zY2hlZHVsZWQtcGFzdC1kYXlzIG5pbAor IlZhbHVlIHRvIHVzZSBpbnN0ZWFkIG9mIGBvcmctc2NoZWR1bGVkLXBhc3Qt ZGF5cycsIGZvciBoYWJpdHMgb25seS4KKworSWYgbmlsLCBgb3JnLXNjaGVk dWxlZC1wYXN0LWRheXMnIGlzIHVzZWQuCisKK1NldHRpbmcgdGhpcyB0byBz YXkgMTAwMDAgaXMgYSB3YXkgdG8gbWFrZSBoYWJpdHMgYWx3YXlzIHNob3cg dXAKK2FzIGEgcmVtaW5kZXIsIGV2ZW4gaWYgeW91IHNldCBgb3JnLXNjaGVk dWxlZC1wYXN0LWRheXMnIHRvIGEKK3NtYWxsIHZhbHVlIGJlY2F1c2UgeW91 IHJlZ2FyZCBzY2hlZHVsZWQgaXRlbXMgYXMgYSB3YXkgb2YKK1widHVybmlu ZyBvblwiIFRPRE8gaXRlbXMgb24gYSBwYXJ0aWN1bGFyIGRhdGUsIHJhdGhl ciB0aGFuIGFzIGEKK21lYW5zIG9mIGNyZWF0aW5nIGNhbGVuZGFyLWJhc2Vk IHJlbWluZGVycy4iCisgIDpncm91cCAnb3JnLWhhYml0CisgIDp0eXBlICco Y2hvaWNlIGludGVnZXIgKGNvbnN0IG5pbCkpCisgIDpwYWNrYWdlLXZlcnNp b24gJyhPcmcgLiAiOS4zIikKKyAgOnNhZmUgKGxhbWJkYSAodikgKG9yIChp bnRlZ2VycCB2KSAobnVsbCB2KSkpKQorCiAoZGVmZmFjZSBvcmctaGFiaXQt Y2xlYXItZmFjZQogICAnKCgoKGJhY2tncm91bmQgbGlnaHQpKSAoOmJhY2tn cm91bmQgIiM4MjcwZjkiKSkKICAgICAoKChiYWNrZ3JvdW5kIGRhcmspKSAo OmJhY2tncm91bmQgImJsdWUiKSkpCi0tIAoyLjE3LjEKCg== --_----------=_154921047217963240 Content-Disposition: attachment; filename="0002-org-habit-Always-show-time-of-day-designation-for-ha.patch" Content-Id: <1549210401.1796154.5bb81816c0975c0b899468654d15af9e52cc3878.17B68982@content.messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0002-org-habit-Always-show-time-of-day-designation-for-ha.patch" RnJvbSA1YTBjYTdiMjc5ODVhYWZkMTA0NDdhYTI0MDg5YjdmNTc4MmU0Yzlj IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIExlZSA8amps QHBvYm94LmNvbT4KRGF0ZTogU3VuLCAzIEZlYiAyMDE5IDEyOjM2OjAzICsw MDAwClN1YmplY3Q6IFtQQVRDSCAyLzNdIG9yZy1oYWJpdDogQWx3YXlzIHNo b3cgdGltZSBvZiBkYXkgZGVzaWduYXRpb24gZm9yIGhhYml0cwoKKiBvcmct YWdlbmRhLmVsIChvcmctYWdlbmRhLWdldC1zY2hlZHVsZWQpOiBBbHdheXMg c2hvdyB0aGUgdGltZSBvZgogIGRheSBkZXNpZ25hdGlvbiBmb3IgaGFiaXRz CgpUSU5ZQ0hBTkdFCi0tLQogbGlzcC9vcmctYWdlbmRhLmVsIHwgMTQgKysr KysrKysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCsp LCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3Avb3JnLWFnZW5k YS5lbCBiL2xpc3Avb3JnLWFnZW5kYS5lbAppbmRleCA3ODRhNTU1YTkuLjIw M2MxZTlkNCAxMDA2NDQKLS0tIGEvbGlzcC9vcmctYWdlbmRhLmVsCisrKyBi L2xpc3Avb3JnLWFnZW5kYS5lbApAQCAtNjI1Nyw5ICs2MjU3LDE3IEBAIHNj aGVkdWxlZCBpdGVtcyB3aXRoIGFuIGhvdXIgc3BlY2lmaWNhdGlvbiBsaWtl IFtoXWg6bW0uIgogCQkgICAoaGVhZCAoYnVmZmVyLXN1YnN0cmluZyAocG9p bnQpIChsaW5lLWVuZC1wb3NpdGlvbikpKQogCQkgICAodGltZQogCQkgICAg KGNvbmQKLQkJICAgICA7OyBObyB0aW1lIG9mIGRheSBkZXNpZ25hdGlvbiBp ZiBpdCBpcyBvbmx5Ci0JCSAgICAgOzsgYSByZW1pbmRlci4KLQkJICAgICAo KGFuZCAoLz0gY3VycmVudCBzY2hlZHVsZSkgKC89IGN1cnJlbnQgcmVwZWF0 KSkgbmlsKQorCQkgICAgIDs7IE5vIHRpbWUgb2YgZGF5IGRlc2lnbmF0aW9u IGlmIGl0IGlzIG9ubHkgYQorCQkgICAgIDs7IHJlbWluZGVyLCBleGNlcHQg Zm9yIGhhYml0cywgd2hpY2ggYWx3YXlzIHNob3cKKwkJICAgICA7OyB0aGUg dGltZSBvZiBkYXkuICBIYWJpdHMgYXJlIGFuIGV4Y2VwdGlvbgorCQkgICAg IDs7IGJlY2F1c2UgaWYgdGhlcmUgaXMgYSB0aW1lIG9mIGRheSwgdGhhdCBp cworCQkgICAgIDs7IGludGVycHJldGVkIHRvIG1lYW4gdGhleSBzaG91bGQg dXN1YWxseSBoYXBwZW4KKwkJICAgICA7OyB0aGVuLCBldmVuIGlmIGRvaW5n IHRoZSBoYWJpdCB3YXMgbWlzc2VkLgorCQkgICAgICgoYW5kCisJCSAgICAg ICAobm90IGhhYml0cCkKKwkJICAgICAgICgvPSBjdXJyZW50IHNjaGVkdWxl KQorCQkgICAgICAgKC89IGN1cnJlbnQgcmVwZWF0KSkKKwkJICAgICAgbmls KQogCQkgICAgICgoc3RyaW5nLW1hdGNoICIgXFwoWzAxMl0/WzAtOV06WzAt OV1bMC05XVxcKSIgcykKIAkJICAgICAgKGNvbmNhdCAoc3Vic3RyaW5nIHMg KG1hdGNoLWJlZ2lubmluZyAxKSkgIiAiKSkKIAkJICAgICAodCAndGltZSkp KQotLSAKMi4xNy4xCgo= --_----------=_154921047217963240 Content-Disposition: attachment; filename="0003-org-habit-Use-face-org-agenda-done-for-habits-schedu.patch" Content-Id: <1549210406.1796123.f285cef478ec1e35cd7f9f033537c0eac7cdbb58.01DCD8A1@content.messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0003-org-habit-Use-face-org-agenda-done-for-habits-schedu.patch" RnJvbSBjMmQ0YjY2ODc2ZjAyNWU5YjJjZjQ2ZjllOTVlNThkN2YyYjUzNzNh IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIExlZSA8amps QHBvYm94LmNvbT4KRGF0ZTogTW9uLCAyNiBOb3YgMjAxOCAxMzowODoyMCAr MDAwMApTdWJqZWN0OiBbUEFUQ0ggMy8zXSBvcmctaGFiaXQ6IFVzZSBmYWNl ICdvcmctYWdlbmRhLWRvbmUgZm9yIGhhYml0cyBzY2hlZHVsZWQKIGZvciBm dXR1cmUKCiogbGlzcC9vcmctYWdlbmRhLmVsIChvcmctYWdlbmRhLWdldC1z Y2hlZHVsZWQpOiBVc2UgdGhlIGZhY2UuCgpUaGlzIGhhcyB0aGUgZWZmZWN0 IHRoYXQgaWYgeW91IGp1c3QgZGlkIHRoZSBoYWJpdCwgaXQgaXMgImdyZXll ZCBvdXQiCmluIHRoZSBhZ2VuZGEuCgpUSU5ZQ0hBTkdFCi0tLQogbGlzcC9v cmctYWdlbmRhLmVsIHwgMyArKysKIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2Vy dGlvbnMoKykKCmRpZmYgLS1naXQgYS9saXNwL29yZy1hZ2VuZGEuZWwgYi9s aXNwL29yZy1hZ2VuZGEuZWwKaW5kZXggMjAzYzFlOWQ0Li4yNzY1NzE4YWMg MTAwNjQ0Ci0tLSBhL2xpc3Avb3JnLWFnZW5kYS5lbAorKysgYi9saXNwL29y Zy1hZ2VuZGEuZWwKQEAgLTYxNjUsNiArNjE2NSw3IEBAIHNjaGVkdWxlZCBp dGVtcyB3aXRoIGFuIGhvdXIgc3BlY2lmaWNhdGlvbiBsaWtlIFtoXWg6bW0u IgogCSAgICAgICAoZGlmZiAoLSBjdXJyZW50IHNjaGVkdWxlKSkKIAkgICAg ICAgKHdhcm50aW1lIChnZXQtdGV4dC1wcm9wZXJ0eSAocG9pbnQpICdvcmct YXBwdC13YXJudGltZSkpCiAJICAgICAgIChwYXN0c2NoZWRwICg8IHNjaGVk dWxlIHRvZGF5KSkKKwkgICAgICAgKGZ1dHVyZXNjaGVkcCAoPiBzY2hlZHVs ZSB0b2RheSkpCiAJICAgICAgIChoYWJpdHAgKGFuZCAoZmJvdW5kcCAnb3Jn LWlzLWhhYml0LXApIChvcmctaXMtaGFiaXQtcCkpKQogCSAgICAgICAoc3Vw cHJlc3MtZGVsYXkKIAkJKGxldCAoKGRlYWRsaW5lIChhbmQgb3JnLWFnZW5k YS1za2lwLXNjaGVkdWxlZC1kZWxheS1pZi1kZWFkbGluZQpAQCAtNjI4MSw2 ICs2MjgyLDggQEAgc2NoZWR1bGVkIGl0ZW1zIHdpdGggYW4gaG91ciBzcGVj aWZpY2F0aW9uIGxpa2UgW2hdaDptbS4iCiAJCSAgICAgaGVhZCBsZXZlbCBj YXRlZ29yeSB0YWdzIHRpbWUgbmlsIGhhYml0cCkpCiAJCSAgIChmYWNlIChj b25kICgoYW5kIChub3QgaGFiaXRwKSBwYXN0c2NoZWRwKQogCQkJCSdvcmct c2NoZWR1bGVkLXByZXZpb3VzbHkpCisJCQkgICAgICAgKChhbmQgaGFiaXRw IGZ1dHVyZXNjaGVkcCkKKwkJCQknb3JnLWFnZW5kYS1kb25lKQogCQkJICAg ICAgICh0b2RheXAgJ29yZy1zY2hlZHVsZWQtdG9kYXkpCiAJCQkgICAgICAg KHQgJ29yZy1zY2hlZHVsZWQpKSkKIAkJICAgKGhhYml0cCAoYW5kIGhhYml0 cCAob3JnLWhhYml0LXBhcnNlLXRvZG8pKSkpCi0tIAoyLjE3LjEKCg== --_----------=_154921047217963240--