* ERC bug fixes
@ 2014-11-09 1:59 Kelvin White
2014-11-09 3:44 ` Glenn Morris
0 siblings, 1 reply; 8+ messages in thread
From: Kelvin White @ 2014-11-09 1:59 UTC (permalink / raw)
To: Emacs development discussions
ERC Bug fixes have been merged into emacs-24 branch from trunk.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: ERC bug fixes
2014-11-09 1:59 ERC bug fixes Kelvin White
@ 2014-11-09 3:44 ` Glenn Morris
[not found] ` <CAG-q9=YXDQge3ZJuvOcLWLdp+LnCirQmBRpZVbnGPBz=5k2NDg@mail.gmail.com>
0 siblings, 1 reply; 8+ messages in thread
From: Glenn Morris @ 2014-11-09 3:44 UTC (permalink / raw)
To: Kelvin White; +Cc: Emacs development discussions
The emacs-24 ChangeLog is messed up. The backported entries should go at
the top with today's date. The "Version 24.4 released" statement got
clobbered. (These fixes should not get merged back to trunk.)
:version needs to be changed to 24.5 (and that change
needs to get merged back to trunk).
Was this big diff really all bug fixes?
Eg I see a bunch of what looks like whitespace changes.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Fwd: ERC bug fixes
[not found] ` <CAG-q9=YXDQge3ZJuvOcLWLdp+LnCirQmBRpZVbnGPBz=5k2NDg@mail.gmail.com>
@ 2014-11-09 13:12 ` Kelvin White
2014-11-09 13:48 ` Kelvin White
0 siblings, 1 reply; 8+ messages in thread
From: Kelvin White @ 2014-11-09 13:12 UTC (permalink / raw)
To: Glenn Morris; +Cc: Emacs development discussions
Glenn Morris <rgm@gnu.org> wrote:
>
> The emacs-24 ChangeLog is messed up. The backported entries should go at
> the top with today's date. The "Version 24.4 released" statement got
> clobbered. (These fixes should not get merged back to trunk.)
> :version needs to be changed to 24.5 (and that change
> needs to get merged back to trunk).
Fixing this now, sorry.
> Was this big diff really all bug fixes?
> Eg I see a bunch of what looks like whitespace changes.
Yes bug fixes, and mishandlings... besides the whitespace.
I apparently untabified by mistake, It will be a tedious effort to fix
and I'm not sure how to handle this now.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: ERC bug fixes
2014-11-09 13:12 ` Fwd: " Kelvin White
@ 2014-11-09 13:48 ` Kelvin White
2014-11-09 19:44 ` Glenn Morris
0 siblings, 1 reply; 8+ messages in thread
From: Kelvin White @ 2014-11-09 13:48 UTC (permalink / raw)
To: Glenn Morris; +Cc: Emacs development discussions
Ok, fixed changelog and committed version changes to be merged back to trunk.
Did I miss anything else?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: ERC bug fixes
2014-11-09 13:48 ` Kelvin White
@ 2014-11-09 19:44 ` Glenn Morris
2014-11-09 19:46 ` Glenn Morris
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Glenn Morris @ 2014-11-09 19:44 UTC (permalink / raw)
To: Kelvin White; +Cc: Emacs development discussions
Kelvin White wrote:
> Ok, fixed changelog and committed version changes to be merged back to trunk.
> Did I miss anything else?
Thanks for fixing things. Comments:
The ChangeLog fixes should have been labelled "do not merge to trunk" in
the commit log.
You changed a bunch of :version tags that were not 25.1 to 24.5. Why?
Eg erc-coding-system-precedence doesn't seem to have changed.
The :version tag is for new defcustoms, or those whose default has
changed in a non-trivial way.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: ERC bug fixes
2014-11-09 19:44 ` Glenn Morris
@ 2014-11-09 19:46 ` Glenn Morris
2014-11-09 19:47 ` Glenn Morris
2014-11-10 10:27 ` Kelvin White
2 siblings, 0 replies; 8+ messages in thread
From: Glenn Morris @ 2014-11-09 19:46 UTC (permalink / raw)
To: Kelvin White; +Cc: Emacs development discussions
PS also the correct format for a multi-line ChangeLog entry would be:
* erc-match.el, erc-join.el, erc-stamp.el, erc-backend.el, erc.el:
* erc-button.el: Update version to 24.5.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: ERC bug fixes
2014-11-09 19:44 ` Glenn Morris
2014-11-09 19:46 ` Glenn Morris
@ 2014-11-09 19:47 ` Glenn Morris
2014-11-10 10:27 ` Kelvin White
2 siblings, 0 replies; 8+ messages in thread
From: Glenn Morris @ 2014-11-09 19:47 UTC (permalink / raw)
To: Kelvin White; +Cc: Emacs development discussions
Glenn Morris wrote:
> The ChangeLog fixes should have been labelled "do not merge to trunk" in
> the commit log.
Sorry, I missed that you put the word "backport" there. That works too.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: ERC bug fixes
2014-11-09 19:44 ` Glenn Morris
2014-11-09 19:46 ` Glenn Morris
2014-11-09 19:47 ` Glenn Morris
@ 2014-11-10 10:27 ` Kelvin White
2 siblings, 0 replies; 8+ messages in thread
From: Kelvin White @ 2014-11-10 10:27 UTC (permalink / raw)
To: Glenn Morris; +Cc: Emacs development discussions
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
Glenn Morris wrote:
> You changed a bunch of :version tags that were not 25.1 to 24.5. Why?
I guess I was confused about your previous statement concerning :version
tags.
> Eg erc-coding-system-precedence doesn't seem to have changed.
> The :version tag is for new defcustoms, or those whose default has
> changed in a non-trivial way.
I will change only the ones that were set to 25.1.
[-- Attachment #2: Type: text/html, Size: 495 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-11-10 10:27 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-09 1:59 ERC bug fixes Kelvin White
2014-11-09 3:44 ` Glenn Morris
[not found] ` <CAG-q9=YXDQge3ZJuvOcLWLdp+LnCirQmBRpZVbnGPBz=5k2NDg@mail.gmail.com>
2014-11-09 13:12 ` Fwd: " Kelvin White
2014-11-09 13:48 ` Kelvin White
2014-11-09 19:44 ` Glenn Morris
2014-11-09 19:46 ` Glenn Morris
2014-11-09 19:47 ` Glenn Morris
2014-11-10 10:27 ` Kelvin White
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).