From unknown Mon Jun 23 06:03:21 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6999: 23.2; [PATCH] appt ignores included diary files Resent-From: Leo Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 08 Sep 2010 12:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 6999 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 6999@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.12839489958574 (code B ref -1); Wed, 08 Sep 2010 12:30:03 +0000 Received: (at submit) by debbugs.gnu.org; 8 Sep 2010 12:29:55 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtJmk-0002EF-Lc for submit@debbugs.gnu.org; Wed, 08 Sep 2010 08:29:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtJmi-0002E9-So for submit@debbugs.gnu.org; Wed, 08 Sep 2010 08:29:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OtJoZ-0003Lg-Pu for submit@debbugs.gnu.org; Wed, 08 Sep 2010 08:31:51 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED,T_RP_MATCHES_RCVD,T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([199.232.76.165]:35718) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtJoZ-0003Lc-Mz for submit@debbugs.gnu.org; Wed, 08 Sep 2010 08:31:47 -0400 Received: from [140.186.70.92] (port=34999 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtJoY-0003vn-B7 for bug-gnu-emacs@gnu.org; Wed, 08 Sep 2010 08:31:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OtJoX-0003LM-Cu for bug-gnu-emacs@gnu.org; Wed, 08 Sep 2010 08:31:46 -0400 Received: from ppsw-30.csi.cam.ac.uk ([131.111.8.130]:39071) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtJoX-0003LA-94 for bug-gnu-emacs@gnu.org; Wed, 08 Sep 2010 08:31:45 -0400 X-Cam-AntiVirus: no malware found X-Cam-SpamDetails: not scanned X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Received: from cpc1-cmbg13-0-0-cust596.5-4.cable.virginmedia.com ([86.9.122.85]:50893 helo=Victoria.local) by ppsw-30.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.156]:587) with esmtpsa (PLAIN:sl392) (TLSv1:DHE-RSA-AES128-SHA:128) id 1OtJoV-0003KB-f0 (Exim 4.72) for bug-gnu-emacs@gnu.org (return-path ); Wed, 08 Sep 2010 13:31:43 +0100 From: Leo Date: Wed, 08 Sep 2010 13:31:42 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -6.3 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) When the main diary file includes other diary files. File saving in the included does no appt-check, which means if one adds appointments directly into the included file, they will not be added by appt-update-list. One simple solution is to make appt-update-list do appt-check if major mode is diary-mode. Then users can open included files in diary mode and add appointments. diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index 3573c95..818fee4 100644 --- a/lisp/calendar/appt.el +++ b/lisp/calendar/appt.el @@ -660,7 +660,8 @@ hour and minute parts." (defun appt-update-list () "If the current buffer is visiting the diary, update appointments. This function is intended for use with `write-file-functions'." - (and (string-equal buffer-file-name (expand-file-name diary-file)) + (and (or (string-equal buffer-file-name (expand-file-name diary-file)) + (eq major-mode 'diary-mode)) appt-timer (let ((appt-display-diary nil)) (appt-check t))) From unknown Mon Jun 23 06:03:21 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6999: 23.2; [PATCH] appt ignores included diary files Resent-From: Leo Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 08 Sep 2010 12:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6999 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 6999@debbugs.gnu.org Received: via spool by 6999-submit@debbugs.gnu.org id=B6999.12839498329025 (code B ref 6999); Wed, 08 Sep 2010 12:44:02 +0000 Received: (at 6999) by debbugs.gnu.org; 8 Sep 2010 12:43:52 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtK0F-0002LW-Td for submit@debbugs.gnu.org; Wed, 08 Sep 2010 08:43:52 -0400 Received: from ppsw-30.csi.cam.ac.uk ([131.111.8.130]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtK0D-0002LQ-Fr for 6999@debbugs.gnu.org; Wed, 08 Sep 2010 08:43:50 -0400 X-Cam-AntiVirus: no malware found X-Cam-SpamDetails: not scanned X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Received: from cpc1-cmbg13-0-0-cust596.5-4.cable.virginmedia.com ([86.9.122.85]:50896 helo=Victoria.local) by ppsw-30.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.156]:587) with esmtpsa (PLAIN:sl392) (TLSv1:DHE-RSA-AES128-SHA:128) id 1OtK27-0000BV-f5 (Exim 4.72) for 6999@debbugs.gnu.org (return-path ); Wed, 08 Sep 2010 13:45:47 +0100 From: Leo References: Date: Wed, 08 Sep 2010 13:45:46 +0100 In-Reply-To: (Leo's message of "Wed, 08 Sep 2010 13:31:42 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (Mac OS X 10.6.4) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.3 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) On 2010-09-08 13:31 +0100, Leo wrote: > When the main diary file includes other diary files. File saving in the > included does no appt-check, which means if one adds appointments > directly into the included file, they will not be added by > appt-update-list. > > One simple solution is to make appt-update-list do appt-check if major > mode is diary-mode. Then users can open included files in diary mode and > add appointments. [...] Annoyingly appt-check pops up the main diary buffer. So maybe do this instead: diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index 3573c95..32563ab 100644 --- a/lisp/calendar/appt.el +++ b/lisp/calendar/appt.el @@ -660,10 +660,11 @@ hour and minute parts." (defun appt-update-list () "If the current buffer is visiting the diary, update appointments. This function is intended for use with `write-file-functions'." - (and (string-equal buffer-file-name (expand-file-name diary-file)) + (and (or (string-equal buffer-file-name (expand-file-name diary-file)) + (eq major-mode 'diary-mode)) appt-timer (let ((appt-display-diary nil)) - (appt-check t))) + (save-window-excursion (appt-check t)))) nil) ;; In Emacs-21.3, the manual documented the following procedure to From unknown Mon Jun 23 06:03:21 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6999: 23.2; [PATCH] appt ignores included diary files Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 08 Sep 2010 14:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6999 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Leo Cc: 6999@debbugs.gnu.org Received: via spool by 6999-submit@debbugs.gnu.org id=B6999.128395660811997 (code B ref 6999); Wed, 08 Sep 2010 14:37:02 +0000 Received: (at 6999) by debbugs.gnu.org; 8 Sep 2010 14:36:48 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtLlX-00037S-P8 for submit@debbugs.gnu.org; Wed, 08 Sep 2010 10:36:47 -0400 Received: from impaqm3.telefonica.net ([213.4.138.3]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtLlV-00037M-8S for 6999@debbugs.gnu.org; Wed, 08 Sep 2010 10:36:46 -0400 Received: from IMPmailhost3.adm.correo ([10.20.102.124]) by IMPaqm3.telefonica.net with bizsmtp id 46GM1f00B2h2L9m3PEejM4; Wed, 08 Sep 2010 16:38:43 +0200 Received: from ceviche.home ([83.61.36.43]) by IMPmailhost3.adm.correo with BIZ IMP id 4Eei1f00R0vquEj1jEejtt; Wed, 08 Sep 2010 16:38:43 +0200 X-Brightmail-Tracker: AAAAAA== X-TE-authinfo: authemail="monnier$movistar.es" |auth_email="monnier@movistar.es" X-TE-AcuTerraCos: auth_cuTerraCos="cosuitnetc01" Received: by ceviche.home (Postfix, from userid 20848) id B4246660D2; Wed, 8 Sep 2010 16:38:42 +0200 (CEST) From: Stefan Monnier Message-ID: References: Date: Wed, 08 Sep 2010 16:38:42 +0200 In-Reply-To: (Leo's message of "Wed, 08 Sep 2010 13:45:46 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.0 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.0 (--) > Annoyingly appt-check pops up the main diary buffer. So maybe do this > instead: [...] > - (appt-check t))) > + (save-window-excursion (appt-check t)))) Not good enough: the buffer might have popped up in a new frame, in which case save-window-excursion won't be of any help. Basically, you can't undo a "pop up a buffer", so the code should be written in such a way that it's only done when it's *really* necessary. Stefan From unknown Mon Jun 23 06:03:21 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6999: 23.2; [PATCH] appt ignores included diary files Resent-From: Leo Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 08 Sep 2010 15:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6999 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Stefan Monnier Cc: 6999@debbugs.gnu.org Received: via spool by 6999-submit@debbugs.gnu.org id=B6999.128395833612692 (code B ref 6999); Wed, 08 Sep 2010 15:06:01 +0000 Received: (at 6999) by debbugs.gnu.org; 8 Sep 2010 15:05:36 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtMDQ-0003If-1v for submit@debbugs.gnu.org; Wed, 08 Sep 2010 11:05:36 -0400 Received: from ppsw-33.csi.cam.ac.uk ([131.111.8.133]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtMDN-0003Ia-OR for 6999@debbugs.gnu.org; Wed, 08 Sep 2010 11:05:34 -0400 X-Cam-AntiVirus: no malware found X-Cam-SpamDetails: not scanned X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Received: from cpc1-cmbg13-0-0-cust596.5-4.cable.virginmedia.com ([86.9.122.85]:53235 helo=Victoria.local) by ppsw-33.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.159]:587) with esmtpsa (PLAIN:sl392) (TLSv1:DHE-RSA-AES128-SHA:128) id 1OtMFH-0006ui-j8 (Exim 4.72) (return-path ); Wed, 08 Sep 2010 16:07:32 +0100 From: Leo References: Date: Wed, 08 Sep 2010 16:07:31 +0100 In-Reply-To: (Stefan Monnier's message of "Wed, 08 Sep 2010 16:38:42 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (Mac OS X 10.6.4) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.3 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) On 2010-09-08 15:38 +0100, Stefan Monnier wrote: > Not good enough: the buffer might have popped up in a new frame, in > which case save-window-excursion won't be of any help. > > Basically, you can't undo a "pop up a buffer", so the code should be > written in such a way that it's only done when it's *really* necessary. This form (or selective (diary-show-all-entries)) in `appt-check' displays diary buffer. I don't know how best to fix it. Leo From unknown Mon Jun 23 06:03:21 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6999: 23.2; [PATCH] appt ignores included diary files In-Reply-To: Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 14 Sep 2010 00:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6999 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Leo Cc: 6999@debbugs.gnu.org Received: via spool by 6999-submit@debbugs.gnu.org id=B6999.128442371132730 (code B ref 6999); Tue, 14 Sep 2010 00:22:02 +0000 Received: (at 6999) by debbugs.gnu.org; 14 Sep 2010 00:21:51 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvJHS-0008Vr-CV for submit@debbugs.gnu.org; Mon, 13 Sep 2010 20:21:50 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvJHQ-0008Vk-1C for 6999@debbugs.gnu.org; Mon, 13 Sep 2010 20:21:48 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1OvJJl-0006Y4-CW; Mon, 13 Sep 2010 20:24:13 -0400 References: From: Glenn Morris X-Spook: AIMSX ISEC 9/11 FSF Uzbekistan freedom underground PET X-Ran: cx7me&{dRwk:%W@X.g1D5--L2DI_2'gV2;u:(=8t.Fv$>[i|Q@uR!4X`B=.BKS12g+,\MD X-Hue: white X-Attribution: GM Date: Mon, 13 Sep 2010 20:24:13 -0400 Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.2 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.2 (------) Leo wrote: > - (and (string-equal buffer-file-name (expand-file-name diary-file)) > + (and (or (string-equal buffer-file-name (expand-file-name diary-file)) > + (eq major-mode 'diary-mode)) There's no particular reason that the included diary files should be being visited in diary-mode. I'll try to find a different fix (I'm thinking maybe running diary-list-entries should store a list of any include files that were found). From unknown Mon Jun 23 06:03:21 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6999: 23.2; [PATCH] appt ignores included diary files Resent-From: Leo Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 14 Sep 2010 06:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6999 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Glenn Morris Cc: 6999@debbugs.gnu.org Received: via spool by 6999-submit@debbugs.gnu.org id=B6999.128444505710009 (code B ref 6999); Tue, 14 Sep 2010 06:18:01 +0000 Received: (at 6999) by debbugs.gnu.org; 14 Sep 2010 06:17:37 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvOpk-0002bO-Sl for submit@debbugs.gnu.org; Tue, 14 Sep 2010 02:17:37 -0400 Received: from ppsw-31.csi.cam.ac.uk ([131.111.8.131]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvOpj-0002bG-2G for 6999@debbugs.gnu.org; Tue, 14 Sep 2010 02:17:35 -0400 X-Cam-AntiVirus: no malware found X-Cam-SpamDetails: not scanned X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Received: from cpc1-cmbg13-0-0-cust596.5-4.cable.virginmedia.com ([86.9.122.85]:60201 helo=Victoria.local) by ppsw-31.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.157]:587) with esmtpsa (PLAIN:sl392) (TLSv1:DHE-RSA-AES128-SHA:128) id 1OvOrs-0001VO-Kb (Exim 4.72) (return-path ); Tue, 14 Sep 2010 07:19:48 +0100 From: Leo References: Date: Tue, 14 Sep 2010 07:19:46 +0100 In-Reply-To: (Glenn Morris's message of "Mon, 13 Sep 2010 20:24:13 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (Mac OS X 10.6.4) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.3 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) On 2010-09-14 01:24 +0100, Glenn Morris wrote: > Leo wrote: > >> - (and (string-equal buffer-file-name (expand-file-name diary-file)) >> + (and (or (string-equal buffer-file-name (expand-file-name diary-file)) >> + (eq major-mode 'diary-mode)) > > There's no particular reason that the included diary files should be > being visited in diary-mode. I'll try to find a different fix (I'm > thinking maybe running diary-list-entries should store a list of any > include files that were found). But the point of that is to decide whether to call appt-check (hence diary-list-entries, which is expensive). Looks like somehow diary-lib needs a function to return all included files without doing list entries. Thanks for looking into this. Leo From unknown Mon Jun 23 06:03:21 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6999: 23.2; [PATCH] appt ignores included diary files Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 14 Sep 2010 07:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6999 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Leo Cc: 6999@debbugs.gnu.org Received: via spool by 6999-submit@debbugs.gnu.org id=B6999.128444865911595 (code B ref 6999); Tue, 14 Sep 2010 07:18:01 +0000 Received: (at 6999) by debbugs.gnu.org; 14 Sep 2010 07:17:39 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvPlq-00030y-Pq for submit@debbugs.gnu.org; Tue, 14 Sep 2010 03:17:39 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvPlo-00030s-Pa for 6999@debbugs.gnu.org; Tue, 14 Sep 2010 03:17:37 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1OvPoA-0006oe-T3; Tue, 14 Sep 2010 03:20:02 -0400 References: From: Glenn Morris X-Spook: Centro Syria Legion of Doom military industrial espionage X-Ran: S (Leo's message of "Tue\, 14 Sep 2010 07\:19\:46 +0100") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.2 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.2 (------) emacs-23 branch: 2010-09-14 Glenn Morris * calendar/diary-lib.el (diary-included-files): New variable. (diary-list-entries): Maybe initialize diary-included-files. (diary-include-other-diary-files): Append to diary-included-files. * calendar/appt.el (appt-update-list): Also check the members of diary-included-files. From unknown Mon Jun 23 06:03:21 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6999: 23.2; [PATCH] appt ignores included diary files Resent-From: Leo Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 14 Sep 2010 07:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6999 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Glenn Morris Cc: 6999@debbugs.gnu.org Received: via spool by 6999-submit@debbugs.gnu.org id=B6999.128444975212047 (code B ref 6999); Tue, 14 Sep 2010 07:36:01 +0000 Received: (at 6999) by debbugs.gnu.org; 14 Sep 2010 07:35:52 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvQ3U-00038G-4n for submit@debbugs.gnu.org; Tue, 14 Sep 2010 03:35:52 -0400 Received: from ppsw-31.csi.cam.ac.uk ([131.111.8.131]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvQ3S-00038B-69 for 6999@debbugs.gnu.org; Tue, 14 Sep 2010 03:35:50 -0400 X-Cam-AntiVirus: no malware found X-Cam-SpamDetails: not scanned X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Received: from cpc1-cmbg13-0-0-cust596.5-4.cable.virginmedia.com ([86.9.122.85]:60242 helo=Victoria.local) by ppsw-31.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.157]:587) with esmtpsa (PLAIN:sl392) (TLSv1:DHE-RSA-AES128-SHA:128) id 1OvQ5b-0001vi-LR (Exim 4.72) (return-path ); Tue, 14 Sep 2010 08:38:03 +0100 From: Leo References: Date: Tue, 14 Sep 2010 08:38:02 +0100 In-Reply-To: (Glenn Morris's message of "Tue, 14 Sep 2010 03:20:02 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (Mac OS X 10.6.4) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.3 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) On 2010-09-14 08:20 +0100, Glenn Morris wrote: > emacs-23 branch: > > 2010-09-14 Glenn Morris > > * calendar/diary-lib.el (diary-included-files): New variable. > (diary-list-entries): Maybe initialize diary-included-files. > (diary-include-other-diary-files): Append to diary-included-files. > * calendar/appt.el (appt-update-list): Also check the > members of diary-included-files. > Thanks. I like your solution. The only remaining issue is the main diary file buffer pops up when saving in included files. Leo From unknown Mon Jun 23 06:03:21 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6999: 23.2; [PATCH] appt ignores included diary files Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 14 Sep 2010 08:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6999 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Leo Cc: 6999@debbugs.gnu.org Received: via spool by 6999-submit@debbugs.gnu.org id=B6999.128445142212714 (code B ref 6999); Tue, 14 Sep 2010 08:04:01 +0000 Received: (at 6999) by debbugs.gnu.org; 14 Sep 2010 08:03:42 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvQUQ-0003J1-8R for submit@debbugs.gnu.org; Tue, 14 Sep 2010 04:03:42 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvQUO-0003Iw-47 for 6999@debbugs.gnu.org; Tue, 14 Sep 2010 04:03:40 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1OvQWl-0005kg-8E; Tue, 14 Sep 2010 04:06:07 -0400 References: From: Glenn Morris X-Spook: bank White House underground undercover threat Aldergrove X-Ran: |Yx(%%%q9*vVsc%W3h/fpCISr|9*>'8Qs X-Hue: cyan X-Attribution: GM Date: Tue, 14 Sep 2010 04:06:07 -0400 In-Reply-To: (Leo's message of "Tue\, 14 Sep 2010 08\:38\:02 +0100") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -4.6 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -4.6 (----) Leo wrote: > The only remaining issue is the main diary file buffer pops up when > saving in included files. I know; see the FIXME comment in appt-check. It is only displayed if it was being visited beforehand. It is because (diary) turns on "selective" display and we need to turn it off again. This whole thing is a mess. From unknown Mon Jun 23 06:03:21 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.427 (Entity 5.427) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Leo Subject: bug#6999: closed (Re: bug#6999: 23.2; [PATCH] appt ignores included diary files) Message-ID: References: X-Gnu-PR-Message: they-closed 6999 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 6999@debbugs.gnu.org Date: Wed, 15 Sep 2010 02:48:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1284518882-22953-1" This is a multi-part message in MIME format... ------------=_1284518882-22953-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #6999: saving included diary files does not regenerate the appointment list which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 6999@debbugs.gnu.org. --=20 6999: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D6999 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1284518882-22953-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 6999-done) by debbugs.gnu.org; 15 Sep 2010 02:47:23 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ovi1q-0005y2-Uv for submit@debbugs.gnu.org; Tue, 14 Sep 2010 22:47:23 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ovi1o-0005xx-JU for 6999-done@debbugs.gnu.org; Tue, 14 Sep 2010 22:47:21 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1Ovi4F-0002aT-LA; Tue, 14 Sep 2010 22:49:51 -0400 To: 6999-done@debbugs.gnu.org Subject: Re: bug#6999: 23.2; [PATCH] appt ignores included diary files References: From: Glenn Morris X-Spook: Jiang Zemin Hugo Chavez Pine Gap SSL afsatcom TWA threat X-Ran: N('|+7OJ(i(2(5/Azgnw53q~1`;QwR:d=73(?,u,t@^QW]x(nDNIe~`cvet,=@,Me|<#{^ X-Hue: green X-Debbugs-No-Ack: yes X-Attribution: GM Date: Tue, 14 Sep 2010 22:49:51 -0400 Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.2 (------) X-Debbugs-Envelope-To: 6999-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.2 (------) Fixed in emacs-23. ------------=_1284518882-22953-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 8 Sep 2010 12:29:55 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtJmk-0002EF-Lc for submit@debbugs.gnu.org; Wed, 08 Sep 2010 08:29:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtJmi-0002E9-So for submit@debbugs.gnu.org; Wed, 08 Sep 2010 08:29:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OtJoZ-0003Lg-Pu for submit@debbugs.gnu.org; Wed, 08 Sep 2010 08:31:51 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED,T_RP_MATCHES_RCVD,T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([199.232.76.165]:35718) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtJoZ-0003Lc-Mz for submit@debbugs.gnu.org; Wed, 08 Sep 2010 08:31:47 -0400 Received: from [140.186.70.92] (port=34999 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtJoY-0003vn-B7 for bug-gnu-emacs@gnu.org; Wed, 08 Sep 2010 08:31:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OtJoX-0003LM-Cu for bug-gnu-emacs@gnu.org; Wed, 08 Sep 2010 08:31:46 -0400 Received: from ppsw-30.csi.cam.ac.uk ([131.111.8.130]:39071) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtJoX-0003LA-94 for bug-gnu-emacs@gnu.org; Wed, 08 Sep 2010 08:31:45 -0400 X-Cam-AntiVirus: no malware found X-Cam-SpamDetails: not scanned X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Received: from cpc1-cmbg13-0-0-cust596.5-4.cable.virginmedia.com ([86.9.122.85]:50893 helo=Victoria.local) by ppsw-30.csi.cam.ac.uk (smtp.hermes.cam.ac.uk [131.111.8.156]:587) with esmtpsa (PLAIN:sl392) (TLSv1:DHE-RSA-AES128-SHA:128) id 1OtJoV-0003KB-f0 (Exim 4.72) for bug-gnu-emacs@gnu.org (return-path ); Wed, 08 Sep 2010 13:31:43 +0100 From: Leo To: bug-gnu-emacs@gnu.org Subject: 23.2; [PATCH] appt ignores included diary files Date: Wed, 08 Sep 2010 13:31:42 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -6.3 (------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) When the main diary file includes other diary files. File saving in the included does no appt-check, which means if one adds appointments directly into the included file, they will not be added by appt-update-list. One simple solution is to make appt-update-list do appt-check if major mode is diary-mode. Then users can open included files in diary mode and add appointments. diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index 3573c95..818fee4 100644 --- a/lisp/calendar/appt.el +++ b/lisp/calendar/appt.el @@ -660,7 +660,8 @@ hour and minute parts." (defun appt-update-list () "If the current buffer is visiting the diary, update appointments. This function is intended for use with `write-file-functions'." - (and (string-equal buffer-file-name (expand-file-name diary-file)) + (and (or (string-equal buffer-file-name (expand-file-name diary-file)) + (eq major-mode 'diary-mode)) appt-timer (let ((appt-display-diary nil)) (appt-check t))) ------------=_1284518882-22953-1--