unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: charles@aurox.ch (Charles A. Roelli)
To: Eli Zaretskii <eliz@gnu.org>
Cc: 28817@debbugs.gnu.org
Subject: bug#28817: incorrect NEWS entry about vc-state faces
Date: Mon, 16 Oct 2017 16:34:17 +0200	[thread overview]
Message-ID: <m2d15nkvpy.fsf@aurox.ch> (raw)
In-Reply-To: <83fuamkhzg.fsf@gnu.org> (message from Eli Zaretskii on Fri, 13 Oct 2017 21:41:55 +0300)

> Date: Fri, 13 Oct 2017 21:41:55 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> CC: 28817@debbugs.gnu.org
> Reply-to: Eli Zaretskii <eliz@gnu.org>
> 
> > Date: Fri, 13 Oct 2017 20:28:44 +0200
> > From: charles@aurox.ch (Charles A. Roelli)
> > 
> > * | | | | | | | | | | | | | | | | | 65fa442..: Lars Ingebrigtsen 2016-03-01 Add a NEWS entry for the colorful VC indicator
> >   commit 65fa442f2bae42d3f9b06264ca432073ee3197c3
> >   Author: Lars Ingebrigtsen <larsi@gnus.org>
> >   Date:   Tue Mar 1 14:31:35 2016 +1100
> > 
> >   Add a NEWS entry for the colorful VC indicator
> > 
> > * | | | | | | | | | | | | | | | | | 2621c29..: Lars Ingebrigtsen 2016-03-01 Use colors in the VC mode lines
> >   commit 2621c293d82c15c00d9e73a8db75d70da7d0a23b
> >   Author: Lars Ingebrigtsen <larsi@gnus.org>
> >   Date:   Tue Mar 1 14:25:27 2016 +1100
> > 
> >   Use colors in the VC mode lines
> > 
> >   * lisp/vc/vc-hooks.el: Make the mode line faces default to
> >   using colors to more clearly tell the user what the status is.
> > 
> > The NEWS entry commit seems to have made it to Emacs 26, but the mode
> > line faces are still the same as in Emacs 25.  Looks like commit
> > 2621c29 got lost somehow.
> 
> Some merge snafu, I suppose: this was merged from the emacs-25 branch.

I'm not sure I understand: the commit was made in the master branch.
See:

https://lists.gnu.org/archive/html/emacs-diffs/2016-02/msg00709.html

Ah, I think I understand now.  Commit 2621c29 was reverted later:

* | | | | | | | | | | | | | | | | | 7882dc6..: John Wiegley 2016-03-06 Revert "Use colors in the VC mode lines"
  commit 7882dc625e1ec562fcd0e1b743ef11b160cae18e
  Author: John Wiegley <johnw@newartisans.com>
  Date:   Sun Mar 6 12:51:44 2016 -0800

  Revert "Use colors in the VC mode lines"

  This reverts commit 2621c293d82c15c00d9e73a8db75d70da7d0a23b.

and I can't find a revert for commit 65fa442 (the NEWS entry).





  reply	other threads:[~2017-10-16 14:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-13 18:28 bug#28817: incorrect NEWS entry about vc-state faces Charles A. Roelli
2017-10-13 18:41 ` Eli Zaretskii
2017-10-16 14:34   ` Charles A. Roelli [this message]
2017-11-21 19:40     ` Charles A. Roelli

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=m2d15nkvpy.fsf@aurox.ch \
    --to=charles@aurox.ch \
    --cc=28817@debbugs.gnu.org \
    --cc=eliz@gnu.org \
    /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).