From debbugs-submit-bounces@debbugs.gnu.org Wed May 08 23:32:47 2019 Received: (at submit) by debbugs.gnu.org; 9 May 2019 03:32:47 +0000 Received: from localhost ([127.0.0.1]:34475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hOZna-0002iW-L0 for submit@debbugs.gnu.org; Wed, 08 May 2019 23:32:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hOZnZ-0002iI-9k for submit@debbugs.gnu.org; Wed, 08 May 2019 23:32:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:54535) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hOZnT-0000Ij-Q8 for submit@debbugs.gnu.org; Wed, 08 May 2019 23:32:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOZnS-0003MS-DF for bug-gnu-emacs@gnu.org; Wed, 08 May 2019 23:32:39 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOZnR-0000Gb-3J for bug-gnu-emacs@gnu.org; Wed, 08 May 2019 23:32:38 -0400 Received: from mail-it1-x12d.google.com ([2607:f8b0:4864:20::12d]:54248) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOZnQ-0000Fx-Kv for bug-gnu-emacs@gnu.org; Wed, 08 May 2019 23:32:37 -0400 Received: by mail-it1-x12d.google.com with SMTP id l10so1227576iti.3 for ; Wed, 08 May 2019 20:32:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fitzsim-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=PjaQQS2qu4fnk5Yf1seBVh3V/aFwGI9jCrZ8EfYbhyM=; b=rVN+7xGkkqXmZBY+BHFkDNat+Mq2uTXx7X/gsxNCkRcMO8x7o6v+AVn7zjwYYAX9yA K7pYwBfDrs5dBSiIMxwrDKRp6HccYdtPcpUbv9WVda/0b8H8En8iSFhRMXCKs1fWXBu9 g20dkfE2W0OrKGHqk9JD3w3D+8XMb7pEmby5S7nUtS4+NYCpWME7GHY8p1gLRGja8QSw OPZ3irvc4/bsZfBxDmrdCOJXya2pvlJgKqPkY4+N/gUXlqZ2I4glaDXCy3bIOxdEFURH ox5TQ/hHhMrNio1aviRNj4ezE1iLgHMT2lSVsLfYyYVE/6zjp8jwsvC496c//nANEhgg /gDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=PjaQQS2qu4fnk5Yf1seBVh3V/aFwGI9jCrZ8EfYbhyM=; b=cLVbAEJyTT0IYhNXa1LJTe2NKkn9XLYsXbm8nCDnwzCsrIXKYipiB1mfL/sGfwmxWR leNaXhQH8lzXK3B16iWpoYoiteISuoFw/Puj8eOUz3CjQB14TEcqTx7tk9mJzI481ZGL C9YE6PCCgw6yHoCxKFrqbBz6Xy7x9eyu2fSWEkq/vCzXMkNwqctuHOTGdqQnkCC0lqXx Dc2zUB9yUsVqmJsTGijqu2ZVpKg6y14jjt0qlAYWnatPm9Aj40uOhbbfQG/zjXHp3O4r 12gyCGIm9We6BXvO6Ngawdj7Og0kR+N2nhrtWIF6KCHoJolosS0vikkouiPa0XSDO46A UOtA== X-Gm-Message-State: APjAAAX/EoyIgCGL+UeZiu1lFtj7/EaZAt0NU1gxs55XDL58Djf9hZup Dhcd0s3PHgisDkCLrnYYZX8TsfLvfMk= X-Google-Smtp-Source: APXvYqxiMurPBchZuzcAcxWDC648Gj7K0Kf/P/kjpUyB6hVbT4113G7MKZ2zofNelEqcEPVOU6FC3w== X-Received: by 2002:a24:6416:: with SMTP id t22mr1135417itc.176.1557372754650; Wed, 08 May 2019 20:32:34 -0700 (PDT) Received: from localhost.localdomain (69-165-165-189.dsl.teksavvy.com. [69.165.165.189]) by smtp.gmail.com with ESMTPSA id y4sm432256iof.58.2019.05.08.20.32.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 20:32:33 -0700 (PDT) From: Thomas Fitzsimmons To: bug-gnu-emacs@gnu.org Subject: Fix icalendar--add-diary-entry/diary-make-entry interaction Date: Wed, 08 May 2019 23:40:30 -0400 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::12d X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain For Excorporate's diary integration I had to add some advice to work around the side effects of a diary-make-entry workaround in icalendar--add-diary-entry, and side effects of diary-make-entry itself. I'm filing this bug report to try to eliminate the need for any of these workarounds. diary-make-entry adds a trailing space to its entry. icalendar--add-diary-entry works around this by deleting the trailing space. It saves the window excursion, but diary-make-entry still leaves the diary file where (other-buffer (current-buffer)) will return it, which is a usability bug. The attached patch, icalendar-diary-make-entry-fix-1.patch, adds omit-trailing-space and do-not-show parameters to diary-make-entry to allow it to operate more like a library function and less like an interactive function. To keep the code mostly the same (so that I don't need to factor out another function), I've changed the original logic by adding a with-current-buffer wrapper, as shown in simplified form in diary-make-entry-with-current-buffer.patch. I'm hoping this keeps the default diary-make-entry logic exactly the same, but I'd like confirmation from someone more familiar with the subtleties of window and buffer manipulation. Thanks, Thomas --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=icalendar-diary-make-entry-fix-1.patch Content-Transfer-Encoding: quoted-printable diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 1be2a05eee..848ac224fb 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -2062,27 +2062,34 @@ diary-remind ;;; Diary insertion functions. =20 ;;;###cal-autoload -(defun diary-make-entry (string &optional nonmarking file) +(defun diary-make-entry (string &optional nonmarking file omit-trailing-sp= ace + do-not-show) "Insert a diary entry STRING which may be NONMARKING in FILE. If omitted, NONMARKING defaults to nil and FILE defaults to -`diary-file'." - (let ((pop-up-frames (or pop-up-frames (window-dedicated-p)))) - (find-file-other-window (or file diary-file))) - (when (eq major-mode (default-value 'major-mode)) (diary-mode)) - (widen) - (diary-unhide-everything) - (goto-char (point-max)) - (when (let ((case-fold-search t)) - (search-backward "Local Variables:" - (max (- (point-max) 3000) (point-min)) - t)) - (beginning-of-line) - (insert "\n") - (forward-line -1)) - (insert - (if (bolp) "" "\n") - (if nonmarking diary-nonmarking-symbol "") - string " ")) +`diary-file'. If OMIT-TRAILING-SPACE is non-nil, then do not add +a trailing space to the entry. If DO-NOT-SHOW is non-nil, do not +show the diary buffer." + (with-current-buffer + (let ((diary-file-name (or file diary-file))) + (if do-not-show + (find-file-noselect diary-file-name) + (let ((pop-up-frames (or pop-up-frames (window-dedicated-p)))) + (find-file-other-window diary-file-name)))) + (when (eq major-mode (default-value 'major-mode)) (diary-mode)) + (widen) + (diary-unhide-everything) + (goto-char (point-max)) + (when (let ((case-fold-search t)) + (search-backward "Local Variables:" + (max (- (point-max) 3000) (point-min)) + t)) + (beginning-of-line) + (insert "\n") + (forward-line -1)) + (insert + (if (bolp) "" "\n") + (if nonmarking diary-nonmarking-symbol "") + string (if omit-trailing-space "" " ")))) =20 ;;;###cal-autoload (defun diary-insert-entry (arg &optional event) diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index a8fd765129..17316ddbbd 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el @@ -2502,20 +2502,10 @@ icalendar--add-diary-entry (when summary (setq non-marking (y-or-n-p (format "Make appointment non-marking? ")))) - (save-window-excursion - (unless diary-filename - (setq diary-filename - (read-file-name "Add appointment to this diary file: "))) - ;; Note: diary-make-entry will add a trailing blank char.... :( - (funcall (if (fboundp 'diary-make-entry) - 'diary-make-entry - 'make-diary-entry) - string non-marking diary-filename))) - ;; W=C3=BCrgaround to remove the trailing blank char - (with-current-buffer (find-file diary-filename) - (goto-char (point-max)) - (if (=3D (char-before) ? ) - (delete-char -1))) + (unless diary-filename + (setq diary-filename + (read-file-name "Add appointment to this diary file: "))) + (diary-make-entry string non-marking diary-filename t t)) ;; return diary-filename in case it has been changed interactively diary-filename) =20 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=diary-make-entry-with-current-buffer.patch diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 1be2a05eee..c88d04ab21 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -2066,8 +2066,9 @@ diary-make-entry "Insert a diary entry STRING which may be NONMARKING in FILE. If omitted, NONMARKING defaults to nil and FILE defaults to `diary-file'." - (let ((pop-up-frames (or pop-up-frames (window-dedicated-p)))) - (find-file-other-window (or file diary-file))) + (with-current-buffer + (let ((pop-up-frames (or pop-up-frames (window-dedicated-p)))) + (find-file-other-window (or file diary-file))) (when (eq major-mode (default-value 'major-mode)) (diary-mode)) (widen) (diary-unhide-everything) @@ -2082,7 +2083,7 @@ diary-make-entry (insert (if (bolp) "" "\n") (if nonmarking diary-nonmarking-symbol "") - string " ")) + string " "))) ;;;###cal-autoload (defun diary-insert-entry (arg &optional event) --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon May 13 13:53:42 2019 Received: (at 35645) by debbugs.gnu.org; 13 May 2019 17:53:42 +0000 Received: from localhost ([127.0.0.1]:46064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hQF8w-0002TP-EB for submit@debbugs.gnu.org; Mon, 13 May 2019 13:53:42 -0400 Received: from mout.web.de ([212.227.15.3]:49991) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hQF8t-0002T9-Ez for 35645@debbugs.gnu.org; Mon, 13 May 2019 13:53:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1557770012; bh=GX2zrvCz2IMEaaJiPO2sG/OuZCX607Dn9Ke9S7chqJo=; h=X-UI-Sender-Class:From:To:Cc:Subject:References:Date:In-Reply-To; b=G029mQm/U8ai5J+77+ZrS09SbRUWdNgWSHLaweIpPMdXDs5RhheeCLn+kRYro8FKd +dkZiVuLKLHa5g8Zq4pGamf3S+1Tk89PcttY7251ZxQAZg4Vk5ObUsdExBc2o4NQiS lDHMQUeJ5gaV0vd2DfnemCPfRh9inQKK8Cd43sQU= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from udesktop ([217.226.75.182]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MUEoU-1hI1hG0DkA-00R1UT; Mon, 13 May 2019 19:53:32 +0200 From: Ulf Jasper To: Thomas Fitzsimmons Subject: Re: bug#35645: Fix icalendar--add-diary-entry/diary-make-entry interaction References: Date: Mon, 13 May 2019 19:53:25 +0200 In-Reply-To: (Thomas Fitzsimmons's message of "Wed, 08 May 2019 23:40:30 -0400") Message-ID: <87mujqdywa.fsf@panama> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:+mRqvYWY9bCSIUK8XJKknXJBsY+Vg7JGzdrVuGkAIGMwNe46dHP WQFK/KfL2CitMybW6CzeH++/G3FXnH6Oz6fggieBxBjXcL4o6kZI8u/SdfSZRK9YkvH7tps utbUuz+vspn9BXGgQamDWUjGD+/sxk5PNACc6QjIxg50fjOb/5C7ZCD6jKgrTG6naWbaZAk wlwWFpPj/xtySYsk1vtmw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:N8l6pnPB4Cw=:1o+z9HvSw8Xnyl2gNqa/GA 2dlRnoC0S1MMXA5gaXRapxYFBLZwpu8FPgILQohAeIAvo5rSmCQ8Y2PSYcyvtgXowe78sTCyP 1Zc0zNgqsuNJLGEgVg1Fgrr7DOoQACe4trKcL1hvR0DkdDnEgWg4s2iTWzPvni+78CJYoVA4K 3FMxdQQisJiRL9ZBvZia4CxPO2du0QSnHhtZmRXATG0ileET/MtwZ7p2zHooBOyBc/InwPEct 5PT1/k10fDRkf0MA9jPFvOova81OzuBO+XTjDX7gjK+NfTu/Z4xz3kNSmaFMvvdrUT4OfgnjK S4gIs0a0L6USqXg+5m4OWohaAb8hzku+uzMH+BDJjn8lQCMQHHcNeKd0UknPzH5daDVF+0UXv V2poPZAEAPefBtFYrI66ZsXSEQmwjeJ8iOIKWIzsN2/1bm6jYcPi2BiOTy/rA+IP8CnY74Py7 j23F7za7rT1yib05hgffcBALVatsaFlVdffMSP485R24fZYXRnQXNx/rmyfkA/YvCdnFuyphL WbBRZvnKtxuUzAaFb3pIQ5BPil9tFj1K3W/BF8cHjabI88nDhTEXtlRgskyb2eqkm5ZjQzahf dMgFSslkmqpBKZrL9jQI6/90l6yRaDQHBJI7laEubkfNQy7ZXkX32TAD00oJDdMdtpDdTp8Sg b+EKiwFDK6pBteNmu6AVKN8evNioXeWy1UMp4rivhd6iywtdTG2cayVWtxJi0BQ4H08SYBbP9 njSM44I9XJZ5Drm4d2PcYW+KHRGCB3VL/ub8buaggfGuly/nhhc7GZPca2k2IIyLrVxf1oJSn U3qq5wWCcezPcDXyb4UtnBObbynwVEGYYSdVaePH7zpIIQ5AQGCIx6EJzJ0nt7NP1+olaRzRU Q6FHOjgT/v13Eq8mJy3c0GLh2B3SkVXbBSwlTQL2pg/ofI2ifQLdMkrltVx1TiEDBkZnOnImb 8YnqYgj6Yaw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35645 Cc: 35645@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Thomas, thanks for the patch(es)! Am 08.05.2019 um 23:40 (-0400) schrieb Thomas Fitzsimmons: > The attached patch, icalendar-diary-make-entry-fix-1.patch, adds > omit-trailing-space and do-not-show parameters to diary-make-entry to > allow it to operate more like a library function and less like an > interactive function. This patch (icalendar-diary-make-entry-fix-1.patch) looks good to me, particulary from icalendar's point of view. Unit tests are not affected. > To keep the code mostly the same (so that I don't need to factor out > another function), I've changed the original logic by adding a > with-current-buffer wrapper, as shown in simplified form in > diary-make-entry-with-current-buffer.patch. I'm hoping this keeps the > default diary-make-entry logic exactly the same, but I'd like > confirmation from someone more familiar with the subtleties of window > and buffer manipulation. The other patch file (diary-make-entry-with-current-buffer.patch) need not be applied. Maybe someone could confirm that the diary and the window/buffer things are ok. I could then apply the patch. From debbugs-submit-bounces@debbugs.gnu.org Mon May 13 20:13:31 2019 Received: (at 35645) by debbugs.gnu.org; 14 May 2019 00:13:31 +0000 Received: from localhost ([127.0.0.1]:46638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hQL4U-0005Nk-Rk for submit@debbugs.gnu.org; Mon, 13 May 2019 20:13:31 -0400 Received: from mail-it1-f170.google.com ([209.85.166.170]:52694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hQL4S-0005NU-Ja for 35645@debbugs.gnu.org; Mon, 13 May 2019 20:13:30 -0400 Received: by mail-it1-f170.google.com with SMTP id q65so2114884itg.2 for <35645@debbugs.gnu.org>; Mon, 13 May 2019 17:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=drp/HRB2l61z99HaJdmOrdscAGHyBTvVz8RYNJHb2E4=; b=MQljH2ItwmUFYFVqEQy51zVHVXuw9CxcIvUAvzyg3+0izOkMu0eEYQ7nvJ9iDJMPwV 9U+SRBtFyCUWJRKI8rmGKQFIMnqLuMKeUh8JtkmTbcb7sIjSvTDRfk78D/uT36haTRO3 DGW5vkb0a5/bUzo503T+yPnvYJxlJc7AqI5rs8X7XkOpRwvDphCERVYPDhatTvrEaq35 9BOUC74/cu8sL52hd3DWOg3PhGOKm1xaRhGLy5XbOcQ4aWOEWgBJdLU/LIT+5kPXQkNo lwM3Z+mR11+cKn57eJ37AvrIJQQSyNHs33B/WOodW3fxx4HK5K2mhu/S5KZnxXIaB8aL RvBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=drp/HRB2l61z99HaJdmOrdscAGHyBTvVz8RYNJHb2E4=; b=o7seRnZOcV6fu0TVooHM+RnI0RhHzKhvfTpXgt5yLi5QbUg75kDCq2CBXpfc/YWUln bp7O2IIXNOm4GvTkQlDAEKUZ9x5vKUWfAe+acp/ljGNW8znBRpzllA15/aOTGhiqrlad cD8dtw/aDhmmTTiWA3jpdToQ6e48heZn+XEwU43+d8SiJnvKwHAA61ZGpIBDNPTwqi7I zY2Pkm8K/FaDw6X63b5kR8jaGAqkkEehNwil1gHRmWbS7Xg4RCkL5Ku2dPRFwlyXADx0 yipAizUwkCHlDsJ0QEZhgXcJcEn5bUR0JXYPwhsdJDbuAuuh0CHkojrECeNCGkEHz0kX uCUA== X-Gm-Message-State: APjAAAVdgCoc4lTbCL5xLSU0ogj1KaKXtOpCJCZ39UI/fUEgzgqQ9kNK 7Oij4U93PPZPzCxMDgS0ETqovEYY X-Google-Smtp-Source: APXvYqwC33HeJvzYht18W0pQpvF7Aw3+c1X1+QsQ7XhkWqvzWIWUvzJ7hZlBeu3q1GfmbwqfDKYbCw== X-Received: by 2002:a24:d613:: with SMTP id o19mr1474593itg.8.1557792802818; Mon, 13 May 2019 17:13:22 -0700 (PDT) Received: from minid (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.gmail.com with ESMTPSA id h191sm645129ith.5.2019.05.13.17.13.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 May 2019 17:13:22 -0700 (PDT) From: Noam Postavsky To: Thomas Fitzsimmons Subject: Re: bug#35645: Fix icalendar--add-diary-entry/diary-make-entry interaction References: Date: Mon, 13 May 2019 20:13:21 -0400 In-Reply-To: (Thomas Fitzsimmons's message of "Wed, 08 May 2019 23:40:30 -0400") Message-ID: <874l5xhp0e.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 35645 Cc: 35645@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thomas Fitzsimmons writes: > To keep the code mostly the same (so that I don't need to factor out > another function), I've changed the original logic by adding a > with-current-buffer wrapper, as shown in simplified form in > diary-make-entry-with-current-buffer.patch. I'm hoping this keeps the > default diary-make-entry logic exactly the same, but I'd like > confirmation from someone more familiar with the subtleties of window > and buffer manipulation. > - (let ((pop-up-frames (or pop-up-frames (window-dedicated-p)))) > - (find-file-other-window (or file diary-file))) > + (with-current-buffer > + (let ((pop-up-frames (or pop-up-frames (window-dedicated-p)))) > + (find-file-other-window (or file diary-file))) If you're asking whether (progn (find-file-other-window (or file diary-file)) BODY) is the same as (with-current-buffer (find-file-other-window (or file diary-file)) BODY) Then yes, I'd say you're fine (assuming BODY doesn't change buffers, which I believe is the case here). From debbugs-submit-bounces@debbugs.gnu.org Thu May 23 22:49:56 2019 Received: (at 35645) by debbugs.gnu.org; 24 May 2019 02:49:57 +0000 Received: from localhost ([127.0.0.1]:45788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hU0HM-0006TJ-KR for submit@debbugs.gnu.org; Thu, 23 May 2019 22:49:56 -0400 Received: from mail-it1-f169.google.com ([209.85.166.169]:54969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hU0HK-0006T5-J5 for 35645@debbugs.gnu.org; Thu, 23 May 2019 22:49:55 -0400 Received: by mail-it1-f169.google.com with SMTP id h20so13374423itk.4 for <35645@debbugs.gnu.org>; Thu, 23 May 2019 19:49:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fitzsim-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=+ZTeKA0r50j9gNoSX+Y26aYRDq5pFFgGvM2fxnsbg3o=; b=f8Pi248PVV1wR7lq0C7KiT4JFhjwS5JSZbpPEIo0g2Q7ei05tce/Zix2j1eEtahBgM t+t1AZtkAnI7tj25C8iTmEy5lCD7wrrJP9Fs9g3YYe0Uhh3rDuWP0ATXYecCl3oCHfq8 uBhY+ve3ppJo4sk1nsN/essClY4taCBWwc8Y0Ebl59Dhj4n8XjlEBYFYxylwpzPp5fjA 0VmvauUlPK0hwA34ghHGjcvdafjnISMCn6fgdBtSUSZCmpToS3dPIkUU5sGtdTBoJ+ic QQwK7vZkxSUD8yJNJpoeyXstF6GIXcAukCruDolV4mjH6Oo2y5mOmSM0Uh6B/Z3jxDNW oonQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=+ZTeKA0r50j9gNoSX+Y26aYRDq5pFFgGvM2fxnsbg3o=; b=KpKzKZ6BX3rJSAK5iUyHKG0zMV7an2SCzfZAKKyPrJSvoV/vOmc7U/5zKBbGnKSM9s gJSzab6dATYfoGeYcuwNJDKG43u3D5oYZj9079F88ja0uCLWXT7r92t6M/48+MGVdiyp aBuScK6P/0whWC25BWQQBxuBZHC49LPRKxGdNWkLcQ5hUid41jPlfyvhuGjUspqjgCVF 6Rs1QAXmgeDYO/3gZts+XsP9L91FpvQfdEI1wkjYpvgvrjOIJyV5h+vB7rZr4AqzIkKN g9xueCNF+36QzgNYef6ThRKRqtULk1RNDFJVT22Tz9lUNL49ztDP2vvIBRNCIkl3K+u7 QSGw== X-Gm-Message-State: APjAAAVkRK4y81Bf/UtLQi7zOvDp1S+m2wP2SVo78T1TooDkZMjdKFg6 LiR2x9sgDweAMCGtGurjWmQz7Q== X-Google-Smtp-Source: APXvYqyrCzXszwK6AmWZKVc0y53HU17pAjApxKeAdWXSx5hw5TWqGZAKsGmsQ3Sr52JZ3PE+UUFnPg== X-Received: by 2002:a05:660c:352:: with SMTP id b18mr6151308itl.20.1558666188885; Thu, 23 May 2019 19:49:48 -0700 (PDT) Received: from localhost.localdomain (69-165-165-189.dsl.teksavvy.com. [69.165.165.189]) by smtp.gmail.com with ESMTPSA id d22sm525842ioc.51.2019.05.23.19.49.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 May 2019 19:49:48 -0700 (PDT) From: Thomas Fitzsimmons To: Noam Postavsky Subject: Re: bug#35645: Fix icalendar--add-diary-entry/diary-make-entry interaction References: <874l5xhp0e.fsf@gmail.com> Date: Thu, 23 May 2019 22:49:46 -0400 In-Reply-To: <874l5xhp0e.fsf@gmail.com> (Noam Postavsky's message of "Mon, 13 May 2019 20:13:21 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 35645 Cc: Ulf Jasper , 35645@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Noam Postavsky writes: > Thomas Fitzsimmons writes: > >> To keep the code mostly the same (so that I don't need to factor out >> another function), I've changed the original logic by adding a >> with-current-buffer wrapper, as shown in simplified form in >> diary-make-entry-with-current-buffer.patch. I'm hoping this keeps the >> default diary-make-entry logic exactly the same, but I'd like >> confirmation from someone more familiar with the subtleties of window >> and buffer manipulation. > >> - (let ((pop-up-frames (or pop-up-frames (window-dedicated-p)))) >> - (find-file-other-window (or file diary-file))) >> + (with-current-buffer >> + (let ((pop-up-frames (or pop-up-frames (window-dedicated-p)))) >> + (find-file-other-window (or file diary-file))) > > If you're asking whether > > (progn (find-file-other-window (or file diary-file)) > BODY) > > is the same as > > (with-current-buffer (find-file-other-window (or file diary-file)) > BODY) > > Then yes, I'd say you're fine (assuming BODY doesn't change buffers, > which I believe is the case here). Yes, that's what I was asking, thanks. Ulf, the only other feedback I have for icalendar is that icalendar--add-diary-entry is useful to/used by other packages (e.g., Excorporate) despite it being a private function. What if we added a public alias, icalendar-add-diary-entry, within this same patch? Then I could check for that alias's existence and only enable the workaround advice for older Emacs versions. Thomas From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 03 14:35:35 2019 Received: (at 35645) by debbugs.gnu.org; 3 Jun 2019 18:35:35 +0000 Received: from localhost ([127.0.0.1]:43076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hXrny-0004Ox-Sv for submit@debbugs.gnu.org; Mon, 03 Jun 2019 14:35:35 -0400 Received: from mout.web.de ([212.227.17.11]:34477) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hXrnw-0004Oi-DZ for 35645@debbugs.gnu.org; Mon, 03 Jun 2019 14:35:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1559586923; bh=DcYe0e+/UDnqG0P9OKEwirKw+y3071RlmG2kKCInA5s=; h=X-UI-Sender-Class:From:To:Cc:Subject:References:Date:In-Reply-To; b=sjDHXprF90NiQIND5OfqncwoDhg8U4R4rXoEQ9F+UaFuOZ2QwktacoYKCFYKx98E4 Nq/9AK+TryB4v44ym5BfhJvB5DPncevS3sHj6zhnP+4A/cIxKWfoe7aH1DrdPoRhi8 3WabciXzUP7ahQoCUh41NoggVXVekbFalzVTHQqw= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from udesktop ([217.226.74.33]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MZDTE-1hHIo90Umq-00Kyet; Mon, 03 Jun 2019 20:30:17 +0200 From: Ulf Jasper To: Thomas Fitzsimmons Subject: Re: bug#35645: Fix icalendar--add-diary-entry/diary-make-entry interaction References: <874l5xhp0e.fsf@gmail.com> Date: Mon, 03 Jun 2019 20:30:13 +0200 In-Reply-To: (Thomas Fitzsimmons's message of "Thu, 23 May 2019 22:49:46 -0400") Message-ID: <87r28a4j4a.fsf@panama> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:w8VAjk/gtlUjYVfeNfDYhTtY9vE8uQoTElT7HrqVXADNC6G0WGq MdjaaCFBWpX8kYtAof9eBZUrtKhvbzPHbKfhLkh6tZTa1NwcULN9JrUxFFeue1R4hkQyi/O JbzyiJqrKj2FwQCcxvxtfo/Rvq6CL73tyxrernXw8eyErFDwgIU1Ta16RjxCeQAunkmfsxy 4e8g+D8ZleWYLIRG8zjDw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:iYVJ37kCjaM=:bkYXfri8JvOrTR+GOqmNRF p+1KfiohxAwT3u1pG5kKfZBYOvrI9YCBcVibvwR5TJq7tGPQRO/4/ndME0OECAZ9sSyIUT7Zq 1H5KeeX33bvqLgo49UPGGU1FvEjWcjEtQ2lpjX/graE9YjhcwRjASAmZWfkWrAzBomglon44a bGSDaRYWY79idJlBLGE3rP4ILtyyO1EzwRfzDWk1/Mno4z4lK4udl2KMXG6AiuWx49cHygV/L fD99K5SgAq9+pdeIQk1RREgmjS3ApPK5dUnKECqs5vaJlfjXs9TW7BBDAeFHAl8GbBaeDzgJp b0/3toieltjeMz06F6RxiKZ1VX+q/pNPdXVgK1Q3FBqq7oFrxLOBPWBIdEihhFVDoYROw2v+U GeW5FwywuHafLkEy7ghybM+oYwPuFR/MUA6QRS6zABPYtgYseY1DdhxXhr0Du3ANz11lZWQLd aim6IFheadRtD9P0skIWb5XyCwnyaMpZcbCw8UJB8hOyA+VTr7Rj4AjxGXjMrOBRDAvF/6NzN Iq/41WUdQrgOEAYqXq+O4BpYr605qwZ3ZNhMn17WRiPuBQvs8c/W8g6VzG0OgvOYqatGuo59S XQ/g70x2s8hacOKMWoA5kTcuD3F0/IEw1CUaqm2vEE0oTIXt9s1OX2b5D8SMUWKhDKZB7P9Qi wPRADp6jQpWc7TRj81v2Mtx6FpH2taNwlZGY4MdyO3cDPRtNFn9R83sGn+FxO9J0Fnqyb1OLN R/4oC4gISkfy7XWFweDuL39o68cvNHokZNepHofGMc1nI02Tkcnh9Pu+/l20JyutsFSXKZyyP tUnButj4CWcNZc5nn2HKqR6kVCU1PyvEiIjt4WVQi4lobFI2xOJbXg8aSQtEYFT8GFLS486V9 ur51438b3nF1oI6KrM2bBdRjtvJPOzcMI7UFhRgpK3r+ETRsWZl4aCYdYokVfgxmcX5StMmkA OdoH76hII4/mWWBBy/MtJw6aU7WxjtV9Xh2I1njRZi2gq2eHURix0 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 35645 Cc: 35645@debbugs.gnu.org, Noam Postavsky X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Am 23.05.2019 um 22:49 (-0400) schrieb Thomas Fitzsimmons: > > Ulf, the only other feedback I have for icalendar is that > icalendar--add-diary-entry is useful to/used by other packages (e.g., > Excorporate) despite it being a private function. What if we added a > public alias, icalendar-add-diary-entry, within this same patch? Then I > could check for that alias's existence and only enable the workaround > advice for older Emacs versions. > Could you please provide a patch with all the changes we want to make? Thanks, Ulf From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 07 05:21:42 2019 Received: (at 35645) by debbugs.gnu.org; 7 Jun 2019 09:21:42 +0000 Received: from localhost ([127.0.0.1]:51379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZB48-00005N-Gn for submit@debbugs.gnu.org; Fri, 07 Jun 2019 05:21:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41173) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZB46-000057-Fj for 35645@debbugs.gnu.org; Fri, 07 Jun 2019 05:21:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hZB3t-00046U-Ow; Fri, 07 Jun 2019 05:21:27 -0400 Received: from [176.228.60.248] (port=4082 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hZB3n-0000Ux-8u; Fri, 07 Jun 2019 05:21:21 -0400 Date: Fri, 07 Jun 2019 12:21:08 +0300 Message-Id: <83a7etrbsr.fsf@gnu.org> From: Eli Zaretskii To: Ulf Jasper In-reply-to: <87r28a4j4a.fsf@panama> (message from Ulf Jasper on Mon, 03 Jun 2019 20:30:13 +0200) Subject: Re: bug#35645: Fix icalendar--add-diary-entry/diary-make-entry interaction References: <874l5xhp0e.fsf@gmail.com> <87r28a4j4a.fsf@panama> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 35645 Cc: fitzsim@fitzsim.org, 35645@debbugs.gnu.org, npostavs@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Ulf Jasper > Date: Mon, 03 Jun 2019 20:30:13 +0200 > Cc: 35645@debbugs.gnu.org, Noam Postavsky > > Am 23.05.2019 um 22:49 (-0400) schrieb Thomas Fitzsimmons: > > > > Ulf, the only other feedback I have for icalendar is that > > icalendar--add-diary-entry is useful to/used by other packages (e.g., > > Excorporate) despite it being a private function. What if we added a > > public alias, icalendar-add-diary-entry, within this same patch? Then I > > could check for that alias's existence and only enable the workaround > > advice for older Emacs versions. > > > > Could you please provide a patch with all the changes we want to make? Ping! Thomas, could you please provide a patch as Ulf requested? We would like to proceed with fixing this issue. TIA From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 07 08:37:32 2019 Received: (at 35645) by debbugs.gnu.org; 7 Jun 2019 12:37:32 +0000 Received: from localhost ([127.0.0.1]:51499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZE7g-0002wl-1G for submit@debbugs.gnu.org; Fri, 07 Jun 2019 08:37:32 -0400 Received: from mail-io1-f42.google.com ([209.85.166.42]:39905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZE7d-0002wV-RO for 35645@debbugs.gnu.org; Fri, 07 Jun 2019 08:37:31 -0400 Received: by mail-io1-f42.google.com with SMTP id r185so1266103iod.6 for <35645@debbugs.gnu.org>; Fri, 07 Jun 2019 05:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fitzsim-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=ywAxNDfC07+Yju9pHTUgT+q38/5tCClRFNVbvmOnZU4=; b=DIjIb1Q6P16mMK5OHvtAOTL4AGyZ89so8bmZCvgm82Tp7yOsnk+P2/iQ1yLuK1Wens +NTrBVh0ZrO5E4EOOz3Jaiy7VZDKcIyN6gyb5bUzXVY7wEfki5KE9AtePRpR4U/5Tw+j brG5Imr4K6dQAZSiiUytj+t69qlfhgq9dgktqUTYuW948jiHagKNCE2ZJZ/iuojbfhY5 JznZjjjc1ePozwTHKmSyFrgF/xvhx1u1Gl8iOIOpyzogo/l4rmhG4+68fxrdHx3Wyaoa 5m9DB2Sb+OyGz/oZUooe6yeMREuBQ2X/q571nY/riZkM2hvTlrndQ1Jv3git/2S3zqKL hjlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=ywAxNDfC07+Yju9pHTUgT+q38/5tCClRFNVbvmOnZU4=; b=Q0qtWsHnSFqbbP5vdiUfXRx/zefFIRcTjxdNW9HJg7eUXN/5W4a53aJ/p6uqDEOcjn Grtbc1ttAsOvNoM/IKtPM64dbVcQRWHMGrDKFB0c8Yr+yvRpXQxxcLfuIQJpbWRqM56Z +OdvQlVGP/28keAQv3A+qwLo8wK0sYZsk4gRsfo13IXULgJ0Wx+v87Ciu3B4kFU43VAt IS0p2CjNtsOU3KpLdfRyn4ZdLjRUnyLqOMwyXX4KQonr4iEadDbJLoacCmIvXcgmjFtB 7aDqVpb9uPvd+ty4aoPAFb9HDHYfpWn1c6zutll0JHkDa/QzCFU4/EPBpXhJgQ4mjs1C wXFg== X-Gm-Message-State: APjAAAX3ok8kkAC0pCU9kyLL69SaRxaByd/7Ln4R6+tUCTXQawt4INR7 lyx5lIJJUefFhh/5hhwk6e/28Q== X-Google-Smtp-Source: APXvYqygdZumexGH3Ai7TpD8ODrtY6oCmQvfifrJUUgdU7KJBvnYt5RAASibtjEhcNQIbKPQYvqPYg== X-Received: by 2002:a5d:9d97:: with SMTP id 23mr32660844ion.204.1559911040178; Fri, 07 Jun 2019 05:37:20 -0700 (PDT) Received: from localhost.localdomain (69-165-165-189.dsl.teksavvy.com. [69.165.165.189]) by smtp.gmail.com with ESMTPSA id d75sm802220itd.10.2019.06.07.05.37.18 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jun 2019 05:37:19 -0700 (PDT) From: Thomas Fitzsimmons To: Eli Zaretskii Subject: Re: bug#35645: Fix icalendar--add-diary-entry/diary-make-entry interaction References: <874l5xhp0e.fsf@gmail.com> <87r28a4j4a.fsf@panama> <83a7etrbsr.fsf@gnu.org> Date: Fri, 07 Jun 2019 08:37:18 -0400 In-Reply-To: <83a7etrbsr.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 07 Jun 2019 12:21:08 +0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 35645 Cc: Ulf Jasper , 35645@debbugs.gnu.org, npostavs@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Eli Zaretskii writes: >> From: Ulf Jasper >> Date: Mon, 03 Jun 2019 20:30:13 +0200 >> Cc: 35645@debbugs.gnu.org, Noam Postavsky >> >> Am 23.05.2019 um 22:49 (-0400) schrieb Thomas Fitzsimmons: >> > >> > Ulf, the only other feedback I have for icalendar is that >> > icalendar--add-diary-entry is useful to/used by other packages (e.g., >> > Excorporate) despite it being a private function. What if we added a >> > public alias, icalendar-add-diary-entry, within this same patch? Then I >> > could check for that alias's existence and only enable the workaround >> > advice for older Emacs versions. >> > >> >> Could you please provide a patch with all the changes we want to make? > > Ping! Thomas, could you please provide a patch as Ulf requested? We > would like to proceed with fixing this issue. I tried out this approach, mostly to try to preserve icalendar--add-diary-entry's current default behaviour of showing the resulting diary buffer. However, I was wrong about icalendar-add-diary-entry being called directly; the icalendar entry point Excorporate calls is icalendar-import-buffer. So I think the original patch is fine as-is, as long as Ulf is OK with the change to icalendar--add-diary-entry's default behaviour, such that it does not show the modified diary file's buffer (which some third party packages might rely on). To determine whether or not to apply the workarounds I'll check the "arity" of diary-make-entry. I'll write the change log and push the patch this evening unless I hear otherwise. Thanks, Thomas From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 07 21:36:20 2019 Received: (at 35645-done) by debbugs.gnu.org; 8 Jun 2019 01:36:20 +0000 Received: from localhost ([127.0.0.1]:52640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZQHL-0000Ep-Ou for submit@debbugs.gnu.org; Fri, 07 Jun 2019 21:36:20 -0400 Received: from mail-it1-f174.google.com ([209.85.166.174]:56005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZQHJ-0000Ed-Ul for 35645-done@debbugs.gnu.org; Fri, 07 Jun 2019 21:36:18 -0400 Received: by mail-it1-f174.google.com with SMTP id i21so5452598ita.5 for <35645-done@debbugs.gnu.org>; Fri, 07 Jun 2019 18:36:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fitzsim-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=k8eGsYYimDl4+z/t33iF9LByAWu+8RLeqoJezdiCf/E=; b=bPSgc+6nIrbT9DhcmdWhah3n+AtIf/6UTKT0zWg6L3wIyNHrWXE18CP0/p6h/v2vQw PywRDtX4sf9xbk4pTHzLMtprY4bVpZREU9ono0iMLPKm46fFcOZ2dbNTZkOdIX+dZPlA m8wkPnrwavQQfXd2QY8ra9aMZZLj7f3TCoLDjE6JQJ5bhZNL6i4VntePW/5CfKrcvvE2 TQ0wlbV5c+h9d7YVfY4kV9vxW/h2PbmKDrL6ig0euCKKWpB0F4rQhD67/k7J+0pFHugl nScYHBn72Qjyxg0uyO3QBuJvH5pvSDbgbfFgAbnOX2vuSxm9cv9kMFSnKEPHFyI7n5X3 WGhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=k8eGsYYimDl4+z/t33iF9LByAWu+8RLeqoJezdiCf/E=; b=Vh6bes/5gR9Klda37S4fBQHZu7Jw+nLG3KOnTJzKm017ZMLDzyCvuXxEe6IS9hh2aN QSp5M4OBsDj2nROn/MCnxFhqCCjuhT/hRgnkFC/Jp16+CK7s+7gw0ju2eipoQvNNMlqQ VwwOSjdEvJaN2+VqBdX+bBe8l0mxlyLH1ATzG8ZJhKg/oalkDCgv5vsjitorEDqQLllD sbDkQh9OWJUnN3fRtC8mkqRpG7HPOAGqATiD/nlr2scjVLMnkyBKuVZCWOpARLhz/b81 HxuQ/FxijYWRL0KLUYq1Yg2j8HYAlDyEK5mWan5GXMoLdItqkkIUVq3YZ/M09vGq+8hN ySYg== X-Gm-Message-State: APjAAAXuydxTyubUg2QQlCqpS3OnjNxG8HmdIxciAXFp/qjvL7dn2k9P 1UvcdhL4TQtmmrCThVQpKZosoA== X-Google-Smtp-Source: APXvYqxDfwpZ9kIpQzmqkppJGGhp7b8L3MrLpWAthWySCeaWy9Z+2+tPOaBdBWmLJuAl4I+/cp+XGA== X-Received: by 2002:a24:9b83:: with SMTP id o125mr5255200itd.127.1559957772184; Fri, 07 Jun 2019 18:36:12 -0700 (PDT) Received: from localhost.localdomain (69-165-165-189.dsl.teksavvy.com. [69.165.165.189]) by smtp.gmail.com with ESMTPSA id j13sm1266456ioa.76.2019.06.07.18.36.11 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jun 2019 18:36:11 -0700 (PDT) From: Thomas Fitzsimmons To: Eli Zaretskii Subject: Re: bug#35645: Fix icalendar--add-diary-entry/diary-make-entry interaction References: <874l5xhp0e.fsf@gmail.com> <87r28a4j4a.fsf@panama> <83a7etrbsr.fsf@gnu.org> Date: Fri, 07 Jun 2019 21:36:10 -0400 In-Reply-To: (Thomas Fitzsimmons's message of "Fri, 07 Jun 2019 08:37:18 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 35645-done Cc: Ulf Jasper , 35645-done@debbugs.gnu.org, npostavs@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thomas Fitzsimmons writes: > Eli Zaretskii writes: > >>> From: Ulf Jasper >>> Date: Mon, 03 Jun 2019 20:30:13 +0200 >>> Cc: 35645@debbugs.gnu.org, Noam Postavsky >>> >>> Am 23.05.2019 um 22:49 (-0400) schrieb Thomas Fitzsimmons: >>> > >>> > Ulf, the only other feedback I have for icalendar is that >>> > icalendar--add-diary-entry is useful to/used by other packages (e.g., >>> > Excorporate) despite it being a private function. What if we added a >>> > public alias, icalendar-add-diary-entry, within this same patch? Then I >>> > could check for that alias's existence and only enable the workaround >>> > advice for older Emacs versions. >>> > >>> >>> Could you please provide a patch with all the changes we want to make? >> >> Ping! Thomas, could you please provide a patch as Ulf requested? We >> would like to proceed with fixing this issue. > > I tried out this approach, mostly to try to preserve > icalendar--add-diary-entry's current default behaviour of showing the > resulting diary buffer. However, I was wrong about > icalendar-add-diary-entry being called directly; the icalendar entry > point Excorporate calls is icalendar-import-buffer. So I think the > original patch is fine as-is, as long as Ulf is OK with the change to > icalendar--add-diary-entry's default behaviour, such that it does not > show the modified diary file's buffer (which some third party packages > might rely on). To determine whether or not to apply the workarounds > I'll check the "arity" of diary-make-entry. > > I'll write the change log and push the patch this evening unless I hear > otherwise. I pushed the fix to master. Thomas From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 08 02:35:41 2019 Received: (at 35645) by debbugs.gnu.org; 8 Jun 2019 06:35:41 +0000 Received: from localhost ([127.0.0.1]:52749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZUx3-0003QZ-Jm for submit@debbugs.gnu.org; Sat, 08 Jun 2019 02:35:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hZUx1-0003QM-S7 for 35645@debbugs.gnu.org; Sat, 08 Jun 2019 02:35:40 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:37429) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hZUwt-0005AZ-NZ; Sat, 08 Jun 2019 02:35:32 -0400 Received: from [176.228.60.248] (port=2921 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hZUwl-0001Ua-Hr; Sat, 08 Jun 2019 02:35:26 -0400 Date: Sat, 08 Jun 2019 09:35:16 +0300 Message-Id: <83a7espot7.fsf@gnu.org> From: Eli Zaretskii To: Thomas Fitzsimmons In-reply-to: (message from Thomas Fitzsimmons on Fri, 07 Jun 2019 21:36:10 -0400) Subject: Re: bug#35645: Fix icalendar--add-diary-entry/diary-make-entry interaction References: <874l5xhp0e.fsf@gmail.com> <87r28a4j4a.fsf@panama> <83a7etrbsr.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 35645 Cc: ulf.jasper@web.de, 35645@debbugs.gnu.org, npostavs@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Thomas Fitzsimmons > Cc: Ulf Jasper , 35645-done@debbugs.gnu.org, npostavs@gmail.com > Date: Fri, 07 Jun 2019 21:36:10 -0400 > > > I'll write the change log and push the patch this evening unless I hear > > otherwise. > > I pushed the fix to master. Thanks. From unknown Fri Aug 22 01:33:48 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 06 Jul 2019 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator