From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: [PATCH] Fix: Emacs 25 fancy diary inclusion in agenda Date: Mon, 13 Oct 2014 18:59:17 +0200 Message-ID: <874mv7gb2y.fsf@Rainer.invalid> References: <84d2a0ypk7.fsf@tm6592.fritz.box> <87lhonx578.fsf@gmail.com> <84siiuj3l6.fsf@tm6592.fritz.box> <87d29yn5lu.fsf@bzg.ath.cx> <84r3yey3vj.fsf@tm6592.fritz.box> <87fveu5wl0.fsf@Rainer.invalid> <84iojoz4mp.fsf@tm6592.fritz.box> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xdiy7-00073t-Gd for emacs-orgmode@gnu.org; Mon, 13 Oct 2014 12:59:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xdiy1-0006CP-9K for emacs-orgmode@gnu.org; Mon, 13 Oct 2014 12:59:35 -0400 Received: from plane.gmane.org ([80.91.229.3]:53222) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xdiy1-0006CL-3E for emacs-orgmode@gnu.org; Mon, 13 Oct 2014 12:59:29 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xdixz-0005D5-VQ for emacs-orgmode@gnu.org; Mon, 13 Oct 2014 18:59:27 +0200 Received: from pd9eb09c9.dip0.t-ipconnect.de ([217.235.9.201]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 13 Oct 2014 18:59:27 +0200 Received: from Stromeko by pd9eb09c9.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 13 Oct 2014 18:59:27 +0200 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 Marco Wahl writes: > Sorry for that. I was not aware that fixes should go to maint. I just > naively took the first best branch (which was master) for applying the > change. BTW: It looks like a good soul already merged the patch into > the maint branch. The general rule is that bugfixes for bugs that are (also) in maint are fixed there and then merged into master. If backwards compatibility is broken or new features get introduced, things go directly to master. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Factory and User Sound Singles for Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds