From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.devel Subject: Re: Calling Lisp from undo.c's record_* functions Date: Mon, 23 Nov 2015 17:29:13 +0000 Message-ID: <87oaekaal2.fsf@russet.org.uk> References: <83r3jpc2of.fsf@gnu.org> <87h9kkbz6k.fsf@russet.org.uk> <838u5wbmvu.fsf@gnu.org> <83ziyc9zs0.fsf@gnu.org> <83wptg9dcd.fsf@gnu.org> <87610zsd3u.fsf@russet.org.uk> <83io4z9ozx.fsf@gnu.org> <87wpte8fas.fsf@russet.org.uk> <83poz67zpd.fsf@gnu.org> <87bnalwvy9.fsf@russet.org.uk> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1448299777 8981 80.91.229.3 (23 Nov 2015 17:29:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Nov 2015 17:29:37 +0000 (UTC) Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 23 18:29:32 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1a0uvc-00021a-Kk for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2015 18:29:24 +0100 Original-Received: from localhost ([::1]:33718 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0uvd-0007TE-47 for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2015 12:29:25 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0uvZ-0007Ri-Cd for emacs-devel@gnu.org; Mon, 23 Nov 2015 12:29:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0uvY-0005NC-IC for emacs-devel@gnu.org; Mon, 23 Nov 2015 12:29:21 -0500 Original-Received: from cheviot12.ncl.ac.uk ([128.240.234.12]:42866) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0uvT-0005JV-K6; Mon, 23 Nov 2015 12:29:15 -0500 Original-Received: from smtpauth-vm.ncl.ac.uk ([10.8.233.129] helo=smtpauth.ncl.ac.uk) by cheviot12.ncl.ac.uk with esmtp (Exim 4.63) (envelope-from ) id 1a0uvS-0006do-Ch; Mon, 23 Nov 2015 17:29:14 +0000 Original-Received: from jangai.ncl.ac.uk ([10.66.67.223] helo=localhost) by smtpauth.ncl.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1a0uvR-0002Ph-OF; Mon, 23 Nov 2015 17:29:13 +0000 In-Reply-To: (John Wiegley's message of "Sun, 22 Nov 2015 14:41:36 -0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 128.240.234.12 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:195128 Archived-At: John Wiegley writes: >>>>>> Phillip Lord writes: > >> Just to check I have this correct, now that we have feature freeze, I should >> merge (or rebase) to the emacs-25 branch? And, then I have to cherry pick >> this across to master? Or the other way around? Or does it not matter? > > Optionally rebase against emacs-25, then merge it there. Your merge commit > will get carried back to master in due course. Ah, merging to master is someone elses problem. That sounds good to me. Phil