From mboxrd@z Thu Jan 1 00:00:00 1970 From: Litvinov Sergey Subject: Re: [PATCH] narrowing in agenda file Date: Wed, 01 Feb 2012 16:18:55 +0100 Message-ID: <5r8vkmshsw.fsf@kana.aer.mw.tum.de> References: <5r1uqq4h2u.fsf@kana.aer.mw.tum.de> <8739b6jnx7.fsf@norang.ca> <878vkmhccw.fsf@norang.ca> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([140.186.70.92]:43311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rsbxn-00084r-JI for emacs-orgmode@gnu.org; Wed, 01 Feb 2012 10:19:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rsbxj-0007Za-0F for emacs-orgmode@gnu.org; Wed, 01 Feb 2012 10:19:11 -0500 Received: from plane.gmane.org ([80.91.229.3]:41244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rsbxi-0007ZT-MV for emacs-orgmode@gnu.org; Wed, 01 Feb 2012 10:19:06 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Rsbxh-0001BO-JY for emacs-orgmode@gnu.org; Wed, 01 Feb 2012 16:19:05 +0100 Received: from kana.aer.mw.tum.de ([129.187.68.65]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Feb 2012 16:19:05 +0100 Received: from slitvinov by kana.aer.mw.tum.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Feb 2012 16:19:05 +0100 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 --=-=-= Content-Type: text/plain Bernt Hansen writes: > - org agenda clock reports are correct > - You don't have the LOGBOOK drawer aligned with tags when clocking in > from the agenda (this was with emacs -q (no org-indent-mode) > - Column view in the agenda shows correct clocking amounts for each > task > - Visiting a task with RET or SPC goes to the task when outside the > narrowed region > - Remote editing of a task outside the narrowed region changes the > target task and not something in your narrowed region instead > I tried this patch today and clock reports in the agenda no longer > display for me. Could you take a look at it please? Hi Bernt, thank you for the recommendations and for testing the patch. I am working on ERT tests for the items you listed above. Also I found that =org-agenda-add-note= does not work with narrowed agenda file. Meanwhile I can share another patch to fix the problem with clock reports (please see the second code block in testing/examples/org-agenda-test.org ) --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-Fix-clock-reports-in-the-agenda-add-a-test-example-f.patch >From 8824692191990c7ec4294b20c0c966bfc3e89de6 Mon Sep 17 00:00:00 2001 From: Litvinov Sergey Date: Wed, 1 Feb 2012 16:04:12 +0100 Subject: [PATCH 3/3] Fix clock reports in the agenda, add a test example for agenda --- lisp/org.el | 4 +++- testing/examples/org-agenda-test.org | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 9e23c18..e1abbda 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -16498,6 +16498,8 @@ When a buffer is unmodified, it is just killed. When modified, it is saved (inhibit-read-only t) (rea (concat ":" org-archive-tag ":")) bmp file re) + (save-excursion + (save-restriction (while (setq file (pop files)) (catch 'nextfile (if (bufferp file) @@ -16532,7 +16534,7 @@ When a buffer is unmodified, it is just killed. When modified, it is saved (while (re-search-forward re nil t) (add-text-properties (match-beginning 0) (org-end-of-subtree t) pc))) - (set-buffer-modified-p bmp))))) + (set-buffer-modified-p bmp))))))) (setq org-todo-keywords-for-agenda (org-uniquify org-todo-keywords-for-agenda)) (setq org-todo-keyword-alist-for-agenda diff --git a/testing/examples/org-agenda-test.org b/testing/examples/org-agenda-test.org index ecd00e5..b16badb 100644 --- a/testing/examples/org-agenda-test.org +++ b/testing/examples/org-agenda-test.org @@ -1,10 +1,21 @@ #+Title: a collection of examples for org-agenda tests * TODO should be visible + CLOCK: [2010-01-01 Fri 10:00]--[2010-01-01 Fri 10:05] => 0:05 ob-agenda-test.org buffer should be narrowed after execution of this block #+BEGIN_SRC elisp :results silent - (let ((org-agenda-files (list buffer-file-name))) - (narrow-to-region 1 (- (buffer-size) 23)) - (org-agenda nil "t") - (org-agenda-redo)) +(let ((org-agenda-files (list buffer-file-name))) + (org-narrow-to-subtree) + (org-agenda nil "t") + (org-agenda-redo)) +#+END_SRC + +#+BEGIN_SRC elisp :results silent +(let ((org-agenda-files (list buffer-file-name))) + (org-agenda nil "a") + (org-agenda-clockreport-mode 1) + (org-agenda-change-time-span 'year 2010) + (org-agenda-day-view 1) +) #+END_SRC * TODO should be hidden + CLOCK: [2010-02-01 Mon 10:00]--[2010-02-01 Mon 10:05] => 0:05 -- 1.7.3.4 --=-=-=--