From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Morgan Subject: Bug: Habit consistency graph redisplay bug involving filters [7.8.03 (release_7.4.2711.gc2c5.dirty)] Date: Fri, 17 Feb 2012 04:28:59 +0100 Message-ID: <87fwea9lz8.fsf@ziiuu.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([140.186.70.92]:42595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyEVX-0004Yo-SG for emacs-orgmode@gnu.org; Thu, 16 Feb 2012 22:29:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RyEVW-0000AZ-4S for emacs-orgmode@gnu.org; Thu, 16 Feb 2012 22:29:15 -0500 Received: from mail-ee0-f41.google.com ([74.125.83.41]:50820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyEVV-00006g-Pt for emacs-orgmode@gnu.org; Thu, 16 Feb 2012 22:29:14 -0500 Received: by eekc13 with SMTP id c13so1308453eek.0 for ; Thu, 16 Feb 2012 19:29:12 -0800 (PST) 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 I've been noticing that some habit consistency graphs get wiped out by clocking in; I'd like to offer this minimal test case and patch. To reproduce the bug, save this Org file as `test-case.org': ------------------------------------------------------------------------ * TODO Item One :random: SCHEDULED: <2012-02-16 Thu .+1d> :PROPERTIES: :STYLE: habit :END: * TODO Item Two SCHEDULED: <2012-02-16 Thu .+1d> :PROPERTIES: :STYLE: habit :END: * TODO Item Three :random: SCHEDULED: <2012-02-16 Fri .+1d> :PROPERTIES: :STYLE: habit :END: ------------------------------------------------------------------------ And save this file as `setup.el': ------------------------------------------------------------------------ (add-to-list 'load-path "/src/org-mode/lisp") (require 'org-install) (setq org-modules (cons 'org-habit org-modules)) (setq org-habit-graph-column 51) (setq org-agenda-files '("./test-case.org")) ------------------------------------------------------------------------ Then start Emacs with `emacs -Q -l setup.el'. Type `M-x org-agenda' and press `a' to make the agenda view. Type `/ TAB random RET' to show only the tagged TODO items (1 and 3). Move point to Item Three and press `I' to clock in. Now Item One's consistency graph disappears. The following patch fixes the problem, at least for me: ------------------------------------------------------------------------ >From 93f16bc95a32f4bee2c07ca6da6f0b89c2bb6e4b Mon Sep 17 00:00:00 2001 From: Thomas Morgan Date: Tue, 7 Feb 2012 19:10:09 -0500 Subject: [PATCH] * org-habit.el (org-habit-insert-consistency-graphs): Don't let an overlay on the next line make the current line's consistency graph invisible. --- lisp/org-habit.el | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lisp/org-habit.el b/lisp/org-habit.el index 67f8779..be0efff 100644 --- a/lisp/org-habit.el +++ b/lisp/org-habit.el @@ -344,13 +344,12 @@ current time." (delete-char (min (+ 1 org-habit-preceding-days org-habit-following-days) (- (line-end-position) (point)))) - (insert (org-habit-build-graph - habit - (time-subtract moment - (days-to-time org-habit-preceding-days)) - moment - (time-add moment - (days-to-time org-habit-following-days)))))) + (insert-before-markers + (org-habit-build-graph + habit + (time-subtract moment (days-to-time org-habit-preceding-days)) + moment + (time-add moment (days-to-time org-habit-following-days)))))) (forward-line))))) (defun org-habit-toggle-habits () -- 1.7.5.4 ------------------------------------------------------------------------ Emacs : GNU Emacs 24.0.93.1 (i686-pc-linux-gnu, X toolkit, Xaw3d scroll bars) of 2012-02-09 on tyl Package: Org-mode version 7.8.03 (release_7.4.2711.gc2c5.dirty) current state: ============== (setq org-export-blocks '((src org-babel-exp-src-block nil) (export-comment org-export-blocks-format-comment t) (ditaa org-export-blocks-format-ditaa nil) (dot org-export-blocks-format-dot nil)) org-ctrl-c-ctrl-c-hook '(org-babel-hash-at-point org-babel-execute-safely-maybe) org-export-preprocess-before-selecting-backend-code-hook '(org-beamer-select-beamer-code) org-tab-first-hook '(org-hide-block-toggle-maybe org-src-native-tab-command-maybe org-babel-hide-result-toggle-maybe) org-modules '(org-habit org-bbdb org-bibtex org-docview org-gnus org-info org-jsinfo org-irc org-mew org-mhe org-rmail org-vm org-w3m org-wl) org-cycle-hook '(org-cycle-hide-archived-subtrees org-cycle-hide-drawers org-cycle-show-empty-lines org-optimize-window-after-visibility-change) org-agenda-before-write-hook '(org-agenda-add-entry-text) org-speed-command-hook '(org-speed-command-default-hook org-babel-speed-command-hook) org-babel-pre-tangle-hook '(save-buffer) org-occur-hook '(org-first-headline-recenter) org-export-interblocks '((src org-babel-exp-non-block-elements)) org-habit-graph-column 51 org-metaup-hook '(org-babel-load-in-session-maybe) org-confirm-elisp-link-function 'yes-or-no-p org-export-latex-format-toc-function 'org-export-latex-format-toc-default org-export-preprocess-before-normalizing-links-hook '(org-remove-file-link-modifiers) org-clock-out-hook '(org-clock-remove-empty-clock-drawer) org-export-first-hook '(org-beamer-initialize-open-trackers) org-mode-hook '(#[nil "\300\301\302\303\304$\207" [org-add-hook change-major-mode-hook org-show-block-all append local] 5] #[nil "\300\301\302\303\304$\207" [org-add-hook change-major-mode-hook org-babel-show-result-all append local] 5] org-babel-result-hide-spec org-babel-hide-all-hashes) org-export-latex-final-hook '(org-beamer-amend-header org-beamer-fix-toc org-beamer-auto-fragile-frames org-beamer-place-default-actions-for-lists) org-export-latex-after-initial-vars-hook '(org-beamer-after-initial-vars) org-metadown-hook '(org-babel-pop-to-session-maybe) org-agenda-files '("./test-case.org") org-src-mode-hook '(org-src-babel-configure-edit-buffer org-src-mode-configure-edit-buffer) org-after-todo-state-change-hook '(org-clock-out-if-current) org-confirm-shell-link-function 'yes-or-no-p )