Re: master f95bbe5 3/6: -

[Michael Albinus]

Paul Eggert <address@hidden> writes:

> branch: master
> commit f95bbe5a67e03fe6d05cbfb4d0c9151a754d6ccd
> Merge: 4869e0d b8ea08b
> Author: Paul Eggert <address@hidden>
> Commit: Paul Eggert <address@hidden>
>
>     -
> ---
>  admin/release-process          |    4 ++--
>  doc/emacs/abbrevs.texi         |    9 +++++----
>  doc/lispref/abbrevs.texi       |    9 ++++++---
>  doc/misc/eshell.texi           |    4 +++-
>  etc/themes/tsdh-light-theme.el |    7 ++++---
>  lisp/doc-view.el               |    2 +-
>  lisp/forms.el                  |    2 +-
>  lisp/mail/rmail.el             |    2 ++
>  lisp/progmodes/cc-defs.el      |    2 +-
>  lisp/progmodes/ruby-mode.el    |    4 ++--
>  lisp/progmodes/xref.el         |   11 +++++------
>  lisp/simple.el                 |   36 +++++++++++++++++++++---------------
>  src/bidi.c                     |    2 +-
>  src/emacsgtkfixed.c            |    3 +--
>  src/emacsgtkfixed.h            |    1 -
>  src/floatfns.c                 |    3 +--
>  src/gtkutil.c                  |   12 ++++--------
>  src/lisp.h                     |    3 ++-
>  src/nsterm.m                   |   30 +++++++++++++++++++++++++++++-
>  test/lisp/net/tramp-tests.el   |   13 +++++++++++--
>  20 files changed, 102 insertions(+), 57 deletions(-)

Hmm. In the commit message of tramp-tests.el in the emacs-25 branch, I wrote

    Suppress some Tramp tests for OSX, do not merge with master

Now it has arrived master. And also no commit message in master, that
means ChangeLog generation won't work.

Merges are going worse :-(

Best regards, Michael.

PS: I'll revert that change in master.