From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UF5yFqoLBGGVJwAAgWs5BA (envelope-from ) for ; Fri, 30 Jul 2021 16:24:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id GQgzEqoLBGGfYQAA1q6Kng (envelope-from ) for ; Fri, 30 Jul 2021 14:24:42 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B483AFACF for ; Fri, 30 Jul 2021 16:24:41 +0200 (CEST) Received: from localhost ([::1]:49770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9TRI-0008Uj-Q1 for larch@yhetil.org; Fri, 30 Jul 2021 10:24:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9TQk-0008UK-Tw for emacs-orgmode@gnu.org; Fri, 30 Jul 2021 10:24:07 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:40700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9TQj-0006sx-1n for emacs-orgmode@gnu.org; Fri, 30 Jul 2021 10:24:06 -0400 Received: by mail-ej1-x62d.google.com with SMTP id oz16so17093243ejc.7 for ; Fri, 30 Jul 2021 07:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=4kltfVqE4ehGubrhf6IpFr6Noo1iM2ymSsiFk6y0y1s=; b=gFMfNvNzy4XSdDFAzMxeebT/qVHZghrLKygoUGaVAgNBfmfYaN/8AzGML6Co/KHjmg /OaOtRO6zAcic/eVASPOmCVk5bDpjr1skZDgHnXjFwR18nsYFVd9JvbUMCVZOF0SFYVM AtBJnbqY9eb4Z8nFstPyAfnb2Ko5jDlAeRrbaEUKNyI5lNwGIdfoNVPfoRYI/5S1JOCZ tqeoKVsyoPp+HtoogPwK1ld/mKbJe73qZeazzoj31wUD/DIG4S1TIA2jD9WXZ+xQc2Ad erAAFI5/1DdEaZp6UeL+BE/lgpvm6zzfNwg70pSdI3Guy+bguj5BGSBw5LL0q+RuqM1j ALTw== 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:in-reply-to:references:date :message-id:mime-version; bh=4kltfVqE4ehGubrhf6IpFr6Noo1iM2ymSsiFk6y0y1s=; b=hFvfNAGNJomZ/3P6V/8R43T63Tjf5MUoI8i0ix8at2wZRzO+cppylL16fST1KslqIY iAE9Y98okdvLHfMlabvpKn1214x6N2hczGQ5+gb24mH3HF9nnmL1R+0tjOhmzW7bgEDO wY7f7QSvCmRnG1Qv9rGlLxcBmuNZXRNCpwj6qQMP6DnVfYB2Obdy6cEjDDseam3NMHe2 CE3gEBCFf85EL0VJMHmPmf/MB58h9eeOiR5p5F2KLieTPBtPvhpLAH/FdK0unt+u2UgS 3WGBIOMzp+Z2P8KBT78abzF0VsjJRuISMy6w3ENdMibaP1tw6tyM0pv07oHSkdZ7dsEE vw1Q== X-Gm-Message-State: AOAM53161fztyLOGfRcP/mNX9eaXuZI8RoT+iaUAoLkOA+lT9AloTYyn +gHVy5LiHM6h/gJGLzEdUIc= X-Google-Smtp-Source: ABdhPJxZqnqrcoueuqSkQlYNDQDii+I854Ds3kk3gMvQpsJqieUgnePntEXpTlmYFTwzAvomUoVfdw== X-Received: by 2002:a17:907:2674:: with SMTP id ci20mr2901306ejc.84.1627655042979; Fri, 30 Jul 2021 07:24:02 -0700 (PDT) Received: from localhost ([141.105.67.194]) by smtp.gmail.com with ESMTPSA id de49sm611064ejc.34.2021.07.30.07.24.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 07:24:02 -0700 (PDT) From: Ihor Radchenko To: Eddie Drury Subject: [PATCH] Re: Subject: Bug: Org-Clock-Out in indirect buffer error after refile [9.3 (release_9.3 @ /usr/share/emacs/27.1/lisp/org/)] In-Reply-To: References: X-Woof-Patch: yes Date: Fri, 30 Jul 2021 22:23:59 +0800 Message-ID: <87y29nnam8.fsf@localhost> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=yantar92@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: emacs-orgmode@gnu.org, Bhavin Gandhi Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627655081; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=4kltfVqE4ehGubrhf6IpFr6Noo1iM2ymSsiFk6y0y1s=; b=NSq9zLh45tN/F7SPHe16cWdKWDFMXzW2CNvGdLw9rW2IXmW1/oTDuG4NuBIl+PzvO+ov+m w8DjTbJ9u7+v14TKcEeMARGiI+kjMI4iGvpSzO5y6/Sr1l8RF8LZZexSnaLYlHyfvt/PPK TZriJ7rLSz5rJyZL/zjVzeUaSkskrXV9Vmv+h4RC1RSnV1vx5ePJFuosv7E/zVoZlpe8hv NsxpHK8c4oM0R5faBqbJ9QHesqz/S/f8RIIEMd1n6UFPvA+4QpW8/NCU/TC/Cs1w1N31YW 3i6xdle4tPkVPklN+cQHq0kXyullA1VUiVjxFUaHm6TF7mETD2xQH2jx7NOegA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627655081; a=rsa-sha256; cv=none; b=Puj8l1bJKcw6qN2gRdKqgGisl11pUgA+tP93JM0bKS7CSokMbQJqjV4vnLZaPFvBdovqV1 F1XUb0mJUIOrp6YkpT30fxlGuCGNjAc4OcNea6yJ62XoB7DIF4DY5nW5YIOhILZ7RWAzRo SBcs0c9gyZ55JeTv4qFCL4Hdle63wJUoD8oZ4HcOjIiD0FLWyqGfB8QeJi9xcgcStQ3vgG z2ZG6V71tWyBS9C3/RHJwec3PIFayqj5TEHHFb5aXwCYK7kPIx+hoyZLYiRLwN2CxCkG4A 2yT0dUpAytx8LVOezu/6LqEZzCYIaPSCtGZFexFGdtSta2cYMVe64ZbHz6WtGw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=gFMfNvNz; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -0.82 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=gFMfNvNz; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: B483AFACF X-Spam-Score: -0.82 X-Migadu-Scanner: scn1.migadu.com X-TUID: 1OWvQjrFbtYQ --=-=-= Content-Type: text/plain Eddie Drury writes: > I have followed those steps and that is the same behaviour I get. > > The expected behaviour is for it to clock out of the subtree, instead of > giving the "Clock start time is gone" error. I can also reproduce. The fix is attached. Best, Ihor --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Fix-not-updating-org-clock-marker-after-refiling-fro.patch >From 4ad92b3efc8717e3ca871ab83bcb5e23e8faeb35 Mon Sep 17 00:00:00 2001 Message-Id: <4ad92b3efc8717e3ca871ab83bcb5e23e8faeb35.1627654962.git.yantar92@gmail.com> From: Ihor Radchenko Date: Fri, 30 Jul 2021 22:16:02 +0800 Subject: [PATCH] Fix not updating org-clock-marker after refiling from indirect buffer * lisp/org.el (org-check-and-save-marker): Save markers in base buffer of indirect buffer in addition to markers in current buffer. Fixes bug reported in https://orgmode.org/list/CABa5=g4bvYQoTbBn96tFi9K827u_A+MweqYWWpib_tyFLBdG3g@mail.gmail.com/T/#t --- lisp/org.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index eca12a5e7..53fd5b7c7 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7877,7 +7877,8 @@ (defun org-check-and-save-marker (marker beg end) "Check if MARKER is between BEG and END. If yes, remember the marker and the distance to BEG." (when (and (marker-buffer marker) - (equal (marker-buffer marker) (current-buffer)) + (or (equal (marker-buffer marker) (current-buffer)) + (equal (marker-buffer marker) (buffer-base-buffer (current-buffer)))) (>= marker beg) (< marker end)) (push (cons marker (- marker beg)) org-markers-to-move))) -- 2.31.1 --=-=-=--