[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25
From: |
John Wiegley |
Subject: |
Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25 |
Date: |
Mon, 18 Jan 2016 23:38:45 -0800 |
User-agent: |
Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) |
>>>>> Paul Eggert <address@hidden> writes:
> On 01/12/2016 09:11 AM, John Wiegley wrote:
> > 1 31a97ac Michael Albinus : Merge branch 'emacs-25' of
> > git.sv.gnu.org:...
> > 2 e79b06e Paul Eggert : Avoid stdio in SIGINT handler
> > 3 5213ded Jens Lechtenboerger : Refactor mml-smime.el, mml1991.el,
> > mml2015.el
> > 4 372d00a Glenn Morris : ; Auto-commit of loaddefs files.
> > 5 9825305 Paul Eggert : Merge from gnulib
> > 6 30f4a89 YAMAMOTO Mitsuharu : Move variables to inner loop, preparing
> > for...
> >
> > I take it #1 and #4 are valid skips, but the other four should be
> > cherry-picked into master? Do we have a special command or annotation for
> > doing so?
>
> I don't think so, no. I would just install the patches into master. (It's not
> likely that anyone will want to backport them into emacs-25. :-)
Just a note that the four commits above have been cherry picked to master, and
another merge from emacs-25 has been performed.
--
John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
Re: master 70f3e4e 08/15: ; Merge from origin/emacs-25, John Wiegley, 2016/01/12