From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Brand Subject: [PATCH] Agenda: Simplify old fix of face for deadline warning 0 day Date: Mon, 1 Aug 2011 10:57:13 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=0016e6d58f7641194704a96dd153 Return-path: Received: from eggs.gnu.org ([140.186.70.92]:36941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QnoJM-0004OW-Ki for emacs-orgmode@gnu.org; Mon, 01 Aug 2011 04:57:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QnoJH-0008EZ-Ji for emacs-orgmode@gnu.org; Mon, 01 Aug 2011 04:57:20 -0400 Received: from mail-wy0-f169.google.com ([74.125.82.169]:63272) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QnoJH-0008EV-8o for emacs-orgmode@gnu.org; Mon, 01 Aug 2011 04:57:15 -0400 Received: by wyg36 with SMTP id 36so1651239wyg.0 for ; Mon, 01 Aug 2011 01:57:14 -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: Org Mode Cc: Bernt Hansen --0016e6d58f7641194704a96dd153 Content-Type: text/plain; charset=ISO-8859-1 Agenda: Simplify old fix of face for deadline warning 0 day * lisp/org-agenda.el (org-agenda-get-deadlines): Fix dfrac for the case of wdays being 0. Don't pass wdays to org-agenda-deadline-face, like before the old fix. (org-agenda-deadline-face): Revert to old state that was without wdays. This allows a deadline warning period of "-0d" to work also with a custom configuration like: (setq org-agenda-deadline-faces '((1.0001 . org-warning) ; due yesterday or before (0.0 . org-upcoming-deadline))) ; due today or later For org-agenda-deadline-faces left at default and all other settings not exceeding 1.0, the face for a deadline warning of any length remains untouched by this patch. references to history: * commit of the old fix - http://orgmode.org/w/?p=org-mode.git;a=commitdiff;h=d0d6325 - git show d0d6325 * mailing list old thread - http://thread.gmane.org/gmane.emacs.orgmode/5753 - http://lists.gnu.org/archive/html/emacs-orgmode/2008-02/msg00395.html --0016e6d58f7641194704a96dd153 Content-Type: application/octet-stream; name="0001-Agenda-Simplify-old-fix-of-face-for-deadline-warning.patch" Content-Disposition: attachment; filename="0001-Agenda-Simplify-old-fix-of-face-for-deadline-warning.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gqt7ftjz0 RnJvbSA3YjJkZTQ2ZmI0ODA2OWRiYzExYmI5ZDQ2MTk3NzZhOWZjMzBiNmI5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIEJyYW5kIDxtaWNoYWVsLmNoLmJyYW5kQGdtYWls LmNvbT4KRGF0ZTogTW9uLCAxIEF1ZyAyMDExIDEwOjUzOjMzICswMjAwClN1YmplY3Q6IFtQQVRD SF0gQWdlbmRhOiBTaW1wbGlmeSBvbGQgZml4IG9mIGZhY2UgZm9yIGRlYWRsaW5lIHdhcm5pbmcg MCBkYXkKCiogbGlzcC9vcmctYWdlbmRhLmVsIChvcmctYWdlbmRhLWdldC1kZWFkbGluZXMpOiBG aXggZGZyYWMgZm9yIHRoZQpjYXNlIG9mIHdkYXlzIGJlaW5nIDAuICBEb24ndCBwYXNzIHdkYXlz IHRvIG9yZy1hZ2VuZGEtZGVhZGxpbmUtZmFjZSwKbGlrZSBiZWZvcmUgdGhlIG9sZCBmaXguCihv cmctYWdlbmRhLWRlYWRsaW5lLWZhY2UpOiBSZXZlcnQgdG8gb2xkIHN0YXRlIHRoYXQgd2FzIHdp dGhvdXQKd2RheXMuCgpUaGlzIGFsbG93cyBhIGRlYWRsaW5lIHdhcm5pbmcgcGVyaW9kIG9mICIt MGQiIHRvIHdvcmsgYWxzbyB3aXRoIGEKY3VzdG9tIGNvbmZpZ3VyYXRpb24gbGlrZToKKHNldHEg b3JnLWFnZW5kYS1kZWFkbGluZS1mYWNlcwogICAgICAnKCgxLjAwMDEgLiBvcmctd2FybmluZykg ICAgICAgICAgICAgIDsgZHVlIHllc3RlcmRheSBvciBiZWZvcmUKICAgICAgICAoMC4wICAgIC4g b3JnLXVwY29taW5nLWRlYWRsaW5lKSkpICA7IGR1ZSB0b2RheSBvciBsYXRlcgpGb3Igb3JnLWFn ZW5kYS1kZWFkbGluZS1mYWNlcyBsZWZ0IGF0IGRlZmF1bHQgYW5kIGFsbCBvdGhlciBzZXR0aW5n cwpub3QgZXhjZWVkaW5nIDEuMCwgdGhlIGZhY2UgZm9yIGEgZGVhZGxpbmUgd2FybmluZyBvZiBh bnkgbGVuZ3RoCnJlbWFpbnMgdW50b3VjaGVkIGJ5IHRoaXMgcGF0Y2guCgpyZWZlcmVuY2VzIHRv IGhpc3Rvcnk6CiogY29tbWl0IG9mIHRoZSBvbGQgZml4CiAgLSBodHRwOi8vb3JnbW9kZS5vcmcv dy8/cD1vcmctbW9kZS5naXQ7YT1jb21taXRkaWZmO2g9ZDBkNjMyNQogIC0gZ2l0IHNob3cgZDBk NjMyNQoqIG1haWxpbmcgbGlzdCBvbGQgdGhyZWFkCiAgLSBodHRwOi8vdGhyZWFkLmdtYW5lLm9y Zy9nbWFuZS5lbWFjcy5vcmdtb2RlLzU3NTMKICAtIGh0dHA6Ly9saXN0cy5nbnUub3JnL2FyY2hp dmUvaHRtbC9lbWFjcy1vcmdtb2RlLzIwMDgtMDIvbXNnMDAzOTUuaHRtbAotLS0KIGxpc3Avb3Jn LWFnZW5kYS5lbCB8ICAgIDcgKysrLS0tLQogMSBmaWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMo KyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9vcmctYWdlbmRhLmVsIGIvbGlz cC9vcmctYWdlbmRhLmVsCmluZGV4IGQ0NzAxM2IuLjNjN2E0MTkgMTAwNjQ0Ci0tLSBhL2xpc3Av b3JnLWFnZW5kYS5lbAorKysgYi9saXNwL29yZy1hZ2VuZGEuZWwKQEAgLTUxNTYsNyArNTE1Niw3 IEBAIChkZWZ1biBvcmctYWdlbmRhLWdldC1kZWFkbGluZXMgKCkKIAkJCShsZXQgKChvcmctZGVh ZGxpbmUtd2FybmluZy1kYXlzIHN1cHByZXNzLXByZXdhcm5pbmcpKQogCQkJICAob3JnLWdldC13 ZGF5cyBzKSkKIAkJICAgICAgKG9yZy1nZXQtd2RheXMgcykpCi0JICAgICAgZGZyYWMgKC8gKCog MS4wICgtIHdkYXlzIGRpZmYpKSAobWF4IHdkYXlzIDEpKQorCSAgICAgIGRmcmFjICgtIDEgKC8g KCogMS4wIGRpZmYpIChtYXggd2RheXMgMSkpKQogCSAgICAgIHVwY29taW5ncCAoYW5kIHRvZGF5 cCAoPiBkaWZmIDApKSkKIAk7OyBXaGVuIHRvIHNob3cgYSBkZWFkbGluZSBpbiB0aGUgY2FsZW5k YXI6CiAJOzsgSWYgdGhlIGV4cGlyYXRpb24gaXMgd2l0aGluIHdkYXlzIHdhcm5pbmcgdGltZS4K QEAgLTUxOTgsNyArNTE5OCw3IEBAIChkZWZ1biBvcmctYWdlbmRhLWdldC1kZWFkbGluZXMgKCkK IAkJCSAgICAgaGVhZCBjYXRlZ29yeSB0YWdzCiAJCQkgICAgIChpZiAobm90ICg9IGRpZmYgMCkp IG5pbCB0aW1lc3RyKSkpKSkKIAkgICAgICAod2hlbiB0eHQKLQkJKHNldHEgZmFjZSAob3JnLWFn ZW5kYS1kZWFkbGluZS1mYWNlIGRmcmFjIHdkYXlzKSkKKwkJKHNldHEgZmFjZSAob3JnLWFnZW5k YS1kZWFkbGluZS1mYWNlIGRmcmFjKSkKIAkJKG9yZy1hZGQtcHJvcHMgdHh0IHByb3BzCiAJCSAg J29yZy1tYXJrZXIgKG9yZy1hZ2VuZGEtbmV3LW1hcmtlciBwb3MpCiAJCSAgJ29yZy1oZC1tYXJr ZXIgKG9yZy1hZ2VuZGEtbmV3LW1hcmtlciBwb3MxKQpAQCAtNTIxMywxMCArNTIxMyw5IEBAIChk ZWZ1biBvcmctYWdlbmRhLWdldC1kZWFkbGluZXMgKCkKIAkJKHB1c2ggdHh0IGVlKSkpKSkpCiAg ICAgKG5yZXZlcnNlIGVlKSkpCiAKLShkZWZ1biBvcmctYWdlbmRhLWRlYWRsaW5lLWZhY2UgKGZy YWN0aW9uICZvcHRpb25hbCB3ZGF5cykKKyhkZWZ1biBvcmctYWdlbmRhLWRlYWRsaW5lLWZhY2Ug KGZyYWN0aW9uKQogICAiUmV0dXJuIHRoZSBmYWNlIHRvIGRpc3BsYXlpbmcgYSBkZWFkbGluZSBp dGVtLgogRlJBQ1RJT04gaXMgd2hhdCBmcmFjdGlvbiBvZiB0aGUgaGVhZC13YXJuaW5nIHRpbWUg aGFzIHBhc3NlZC4iCi0gIChpZiAoZXF1YWwgd2RheXMgMCkgKHNldHEgZnJhY3Rpb24gMS4pKQog ICAobGV0ICgoZmFjZXMgb3JnLWFnZW5kYS1kZWFkbGluZS1mYWNlcykgZikKICAgICAoY2F0Y2gg J2V4aXQKICAgICAgICh3aGlsZSAoc2V0cSBmIChwb3AgZmFjZXMpKQotLSAKMS43LjQuMgoK --0016e6d58f7641194704a96dd153--