From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: John Wiegley Newsgroups: gmane.emacs.devel Subject: Re: Calling Lisp from undo.c's record_* functions Date: Sun, 22 Nov 2015 14:41:36 -0800 Message-ID: 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 1448232130 18041 80.91.229.3 (22 Nov 2015 22:42:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 22 Nov 2015 22:42:10 +0000 (UTC) Cc: Eli Zaretskii , monnier@IRO.UMontreal.CA, emacs-devel@gnu.org To: phillip.lord@russet.org.uk (Phillip Lord) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 22 23:42:02 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 1a0dKb-00041T-8Z for ged-emacs-devel@m.gmane.org; Sun, 22 Nov 2015 23:42:01 +0100 Original-Received: from localhost ([::1]:57757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0dKa-00033i-Oo for ged-emacs-devel@m.gmane.org; Sun, 22 Nov 2015 17:42:00 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0dKN-00033Q-4c for emacs-devel@gnu.org; Sun, 22 Nov 2015 17:41:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0dKM-0008DJ-BM for emacs-devel@gnu.org; Sun, 22 Nov 2015 17:41:47 -0500 Original-Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]:34799) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0dKH-0008A7-Fk; Sun, 22 Nov 2015 17:41:41 -0500 Original-Received: by padhx2 with SMTP id hx2so171717217pad.1; Sun, 22 Nov 2015 14:41:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:mail-followup-to:mime-version:content-type; bh=q3m2tnznPJeR+X/B+j7uGg8GkMwbga6XOtSLCfBO4sA=; b=dAh00RpgdMuucIxneC35AE+4t5u5sFV10FkvWNnM3Ihs3zTLoYTEFDquZmrsq5WWSn OwQRMw2qVDvAuv18aKwFbd9NHc9Zu5/ycLX5pN+fzAiq5z+PNFRjnR8e8V57i6d71t5d DYbUCUa0qwANupCW93flnbCqNNjXpzJQHxBE6JbMxD+pH1PVM0nESdVCqnbDvqqkHOWG hSKcPmYEKCRBdhp+0c6gwRGNexTZ3sfYgmWMsiBn4AuJy2DsMpfquPLXToIRU/1XjHIV cdNtdPK/kGaxq8ise7ySLkd962mzWxxuf7yjBXnE8vUkzYq7KEHHCTyZcVoKOSN6HPdN wlhA== X-Received: by 10.68.237.5 with SMTP id uy5mr6042429pbc.8.1448232100657; Sun, 22 Nov 2015 14:41:40 -0800 (PST) Original-Received: from Vulcan.local (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id d12sm7742977pbu.20.2015.11.22.14.41.39 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 22 Nov 2015 14:41:39 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id 3D40F10A82C6F; Sun, 22 Nov 2015 14:41:38 -0800 (PST) In-Reply-To: <87bnalwvy9.fsf@russet.org.uk> (Phillip Lord's message of "Sun, 22 Nov 2015 21:44:30 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (darwin) Mail-Followup-To: phillip.lord@russet.org.uk (Phillip Lord), Eli Zaretskii , monnier@IRO.UMontreal.CA, emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22a 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:195076 Archived-At: >>>>> 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. John