From: phillip.lord@russet.org.uk (Phillip Lord)
To: Eli Zaretskii <eliz@gnu.org>
Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org
Subject: Re: Calling Lisp from undo.c's record_* functions
Date: Mon, 23 Nov 2015 17:29:13 +0000 [thread overview]
Message-ID: <87oaekaal2.fsf@russet.org.uk> (raw)
In-Reply-To: <m2lh9py7vj.fsf@newartisans.com> (John Wiegley's message of "Sun, 22 Nov 2015 14:41:36 -0800")
John Wiegley <jwiegley@gmail.com> writes:
>>>>>> Phillip Lord <phillip.lord@russet.org.uk> 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
next prev parent reply other threads:[~2015-11-23 17:29 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-16 16:46 Calling Lisp from undo.c's record_* functions Eli Zaretskii
2015-11-16 21:51 ` Phillip Lord
2015-11-16 22:51 ` Stefan Monnier
2015-11-17 12:14 ` Phillip Lord
2015-11-17 13:46 ` Stefan Monnier
2015-11-17 14:42 ` Phillip Lord
2015-11-17 15:40 ` Stefan Monnier
2015-11-17 16:24 ` Eli Zaretskii
2015-11-17 16:49 ` Stefan Monnier
2015-11-17 17:05 ` Eli Zaretskii
2015-11-17 17:34 ` Stefan Monnier
2015-11-17 18:00 ` Eli Zaretskii
2015-11-17 19:09 ` Stefan Monnier
2015-11-17 19:22 ` Eli Zaretskii
2015-11-17 21:05 ` Phillip Lord
2015-11-17 21:02 ` Phillip Lord
2015-11-18 2:55 ` Stefan Monnier
2015-11-18 12:26 ` Phillip Lord
2015-11-17 16:35 ` Eli Zaretskii
2015-11-17 20:52 ` Phillip Lord
2015-11-18 3:38 ` Eli Zaretskii
2015-11-18 9:56 ` Phillip Lord
2015-11-18 10:49 ` David Kastrup
2015-11-18 17:30 ` Eli Zaretskii
2015-11-17 16:40 ` Eli Zaretskii
2015-11-17 16:51 ` Stefan Monnier
2015-11-17 19:44 ` Eli Zaretskii
2015-11-17 21:35 ` Phillip Lord
2015-11-18 2:52 ` Stefan Monnier
2015-11-18 3:49 ` Eli Zaretskii
2015-11-18 12:31 ` Phillip Lord
2015-11-18 17:49 ` Eli Zaretskii
2015-11-19 1:49 ` Stefan Monnier
2015-11-19 10:16 ` Phillip Lord
2015-11-19 15:53 ` Eli Zaretskii
2015-11-19 17:49 ` Stefan Monnier
2015-11-19 17:58 ` Eli Zaretskii
2015-11-19 18:17 ` Stefan Monnier
2015-11-22 21:44 ` Phillip Lord
2015-11-22 22:41 ` John Wiegley
2015-11-23 17:29 ` Phillip Lord [this message]
2015-11-23 3:37 ` Eli Zaretskii
2015-11-23 17:28 ` Phillip Lord
2015-11-25 17:43 ` Eli Zaretskii
2015-11-25 22:51 ` Richard Stallman
2015-11-26 10:27 ` Phillip Lord
2015-11-17 21:13 ` Phillip Lord
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87oaekaal2.fsf@russet.org.uk \
--to=phillip.lord@russet.org.uk \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@IRO.UMontreal.CA \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).