From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Kyle Meyer Newsgroups: gmane.emacs.devel Subject: Re: Commit 49c0ff2 "Don't bind org-agenda .." Date: Mon, 19 Jun 2017 15:12:27 -0400 Message-ID: <87fuevdc6c.fsf@kyleam.com> References: <87a855of9m.fsf@bzg.fr> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1497899613 22175 195.159.176.226 (19 Jun 2017 19:13:33 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 19 Jun 2017 19:13:33 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Cc: Mark Oteiza , Emacs developers , Nicolas Goaziou , Kaushal Modi To: Bastien Guerry Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 19 21:13:27 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dN273-0005KA-Ob for ged-emacs-devel@m.gmane.org; Mon, 19 Jun 2017 21:13:26 +0200 Original-Received: from localhost ([::1]:43979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN278-0001lx-VF for ged-emacs-devel@m.gmane.org; Mon, 19 Jun 2017 15:13:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN26L-0001k9-1L for emacs-devel@gnu.org; Mon, 19 Jun 2017 15:12:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dN26J-0006Lb-Sd for emacs-devel@gnu.org; Mon, 19 Jun 2017 15:12:41 -0400 Original-Received: from pb-smtp1.pobox.com ([64.147.108.70]:57647 helo=sasl.smtp.pobox.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dN26F-0006KD-T7; Mon, 19 Jun 2017 15:12:36 -0400 Original-Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id B0DD28AC48; Mon, 19 Jun 2017 15:12:32 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type:content-transfer-encoding; s=sasl; bh=EmHS92msQ1kX 4/ffIhWkgnHlal8=; b=DhsPz7jiDjU+NYKRb9d1Gwvp4wqVq7CNmYOj6i4FdQYe kfVL9FIpdC4iImnhwGqTdqpba/d/y0Czmj7Zc9L6aw5qihzih0mE6b4LpRMuaTTG DZpAJ0gjzzgUQTtBsvvRl1OALmn7zSB0AtjZhBGX19OvF6aUsbYWl12met3pcGk= Original-Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id A80C58AC47; Mon, 19 Jun 2017 15:12:32 -0400 (EDT) Original-Received: from localhost (unknown [24.60.167.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 278B08AC46; Mon, 19 Jun 2017 15:12:32 -0400 (EDT) X-Attribution: Kyle In-Reply-To: <87a855of9m.fsf@bzg.fr> (Bastien Guerry's message of "Sun, 18 Jun 2017 10:45:41 +0200") X-Pobox-Relay-ID: 3EAB8016-5523-11E7-A2D5-EFB41968708C-24757444!pb-smtp1.pobox.com DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=kyleam.com; h=from:to:cc:subject:references:date:in-reply-to:message-id:mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=EmHS92msQ1kX4/ffIhWkgnHlal8=; b=aGrMFrNHx5l+ETQub05b7mDTJobVtll5LME0eEmMALE52aZsQDx+NbfFNEy0eHrkXGaPD18IFy7jSc/oAILtE/vCQDDOUnRfAtqeZOj3E5uCf+VD/o/+B0N1+w8ZFIrxhPe2XoXe0uVCy9Eelw895H71cbCfvxMyQgLZm2RX6Ao= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 64.147.108.70 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:215788 Archived-At: Bastien Guerry writes: > Hi Kaushal and Mark, > >> I recently saw this commit: >> http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=3D >> 49c0ff29c2e0243ba35ec17e3e3af49369be43db=C2=A0on emacs master branch. >> >> It caught my attention because I haven't seen any commits for >> org-mode functional changes in emacs master. The org-related commits >> in emacs master are usually ones for compatibility with emacs master. >> >> Not knowing the "right way", I am just confirming if commits like >> these should go to org master ( http://orgmode.org/cgit.cgi/ >> org-mode.git/log/=C2=A0) instead. > > For *every* org commit, committers should first consider committing > (1) to the Org maint branch, then (2) to the Org master branch, then > (3) to the Emacs repo. > > We don't discourage commits made directly in the Emacs repo, because > we are glad people fix things there too, but life would be a little > easier if all commits would go to upstream first. Right, but I think it's worth emphasizing that commits that are more than just fixes are much harder to deal with. Under the current system for syncing Emacs and Org [*], bug fixes are (usually) trivial to backport to Org's maint branch, but changes that are appropriate for Org's master branch are more problematic because it's a release from the Org maint branch that will be synced with the Emacs master branch. [*] As mentioned several times on this list, the Emacs repo is very overdue for a sync with Org. Aside from this commit, all Org-related commits on Emacs's side have been backported (or otherwise resolved) to Org's maint branch. On the Org list, Kaushal expressed interest in moving along the final step of syncing, so hopefully a sync isn't too far off. =20=20=20=20=20=20 > In this particular case, the commit should go on Org master. (No > need to delete it from Emacs.) > > About the functionality itself, I just gave a quick look, but it > feels like (org-agenda-redo t) should be responsible for doing what > `org-agenda-redo-all' is doing, and we need to carefully check that > checking all buffers is a good idea. I think the options are 1. Revert this commit in Emacs and make the (org-agenda-redo t) change you propose (in either maint or master). 2. Revert this commit in Emacs. 3. Revert this commit in Emacs and apply it to Org's master branch. 4. Despite this commit being more appropriate for Org's master branch, backport it to Org's maint branch because it seems like it would be backward-compatible. Other options will result in Emacs-specific Org code that isn't included in a released version of Org and that will be lost when syncing. --=20 Kyle