From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Morgan Subject: Bug: Consistency graph redisplay with links in filtered headings [7.8.03] Date: Thu, 23 Feb 2012 12:04:21 +0100 Message-ID: <87wr7dyfnu.fsf@ziiuu.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([140.186.70.92]:56703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0eAu-0007d8-2t for emacs-orgmode@gnu.org; Thu, 23 Feb 2012 14:18:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0eAp-0004e9-IQ for emacs-orgmode@gnu.org; Thu, 23 Feb 2012 14:17:56 -0500 Received: from mail-we0-f169.google.com ([74.125.82.169]:38327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0eAp-0004dv-65 for emacs-orgmode@gnu.org; Thu, 23 Feb 2012 14:17:51 -0500 Received: by wera13 with SMTP id a13so1273425wer.0 for ; Thu, 23 Feb 2012 11:17:49 -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 Habit lines containing links get mangled on redisplay when they are filtered out of the agenda view. Here's how to reproduce it: 1. Run `emacs -Q -l setup.el'. 2. Type `M-x org-agenda', then `a' for weekly agenda. 3. Type `C-u \ TAB random' to filter out items tagged `random'. 4. Move point to `Another item'. 5. Press `I' to clock in (which calls `org-habit-insert-consistency-graphs'). 6. Type `/ /' to remove the filter. Now there is a misaligned consistency graph on the first TODO item, partly obscuring the link and the original consistency graph. Here is `test-case.org': ------------------------------------------------------------------------ * TODO [[file:setup.el][A link]] :random: SCHEDULED: <2012-02-16 Thu .+1d> :PROPERTIES: :STYLE: habit :END: * TODO Another item SCHEDULED: <2012-02-16 Thu .+1d> :PROPERTIES: :STYLE: habit :END: ------------------------------------------------------------------------ And here is `setup.el': ------------------------------------------------------------------------ (add-to-list 'load-path "/src/org-mode/lisp") (require 'org) (setq org-modules (cons 'org-habit org-modules)) (setq org-agenda-files '("./test-case.org")) ------------------------------------------------------------------------ I'm not sure if this is the best way to go about it but this patch solves the problem: ------------------------------------------------------------------------ >From c7d5abcd886c17c25f2dab1a658e0c0accc9f211 Mon Sep 17 00:00:00 2001 From: Thomas Morgan Date: Wed, 22 Feb 2012 10:12:19 +0100 Subject: [PATCH] * org-habit.el (org-habit-insert-consistency-graphs): Disable filters temporarily; this helps with alignment if there are links. --- lisp/org-habit.el | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lisp/org-habit.el b/lisp/org-habit.el index 4274aae..6b47766 100644 --- a/lisp/org-habit.el +++ b/lisp/org-habit.el @@ -336,7 +336,14 @@ current time." (let ((inhibit-read-only t) l c (buffer-invisibility-spec '(org-link)) (moment (time-subtract (current-time) - (list 0 (* 3600 org-extend-today-until) 0)))) + (list 0 (* 3600 org-extend-today-until) 0))) + disabled-overlays) + ;; Disable filters; this helps with alignment if there are links. + (mapc (lambda (ol) + (when (overlay-get ol 'invisible) + (overlay-put ol 'invisible nil) + (setq disabled-overlays (cons ol disabled-overlays)))) + (overlays-in (point-min) (point-max))) (save-excursion (goto-char (if line (point-at-bol) (point-min))) (while (not (eobp)) @@ -352,7 +359,9 @@ current time." (time-subtract moment (days-to-time org-habit-preceding-days)) moment (time-add moment (days-to-time org-habit-following-days)))))) - (forward-line))))) + (forward-line))) + (mapc (lambda (ol) (overlay-put ol 'invisible t)) + disabled-overlays))) (defun org-habit-toggle-habits () "Toggle display of habits in an agenda buffer." -- 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 current state: ============== (setq org-export-blocks '((src org-babel-exp-src-block nil) (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-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 '((lob org-babel-exp-lob-one-liners) (src org-babel-exp-inline-src-blocks)) 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-blank-before-new-entry nil 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] 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 )