From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: master f95bbe5 3/6: - Date: Tue, 22 Mar 2016 20:31:52 +0100 Message-ID: <87wpoujolz.fsf@gmx.de> References: <20160322181316.18561.2201@vcs.savannah.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1458675165 16574 80.91.229.3 (22 Mar 2016 19:32:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 19:32:45 +0000 (UTC) Cc: Paul Eggert To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 20:32:37 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aiS2e-0000ec-Og for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 20:32:36 +0100 Original-Received: from localhost ([::1]:39200 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiS2e-00070p-9a for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 15:32:36 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiS2G-0006Rd-6C for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:32:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiS2C-0001x6-Uu for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:32:12 -0400 Original-Received: from mout.gmx.net ([212.227.17.21]:53799) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiS2C-0001wu-Li for emacs-devel@gnu.org; Tue, 22 Mar 2016 15:32:08 -0400 Original-Received: from detlef.gmx.de ([87.146.58.73]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0Lngv5-1a8GGq16dT-00hsFi; Tue, 22 Mar 2016 20:31:55 +0100 In-Reply-To: (Paul Eggert's message of "Tue, 22 Mar 2016 18:13:17 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-Provags-ID: V03:K0:l9omM6ayuwzvJ1YpWLE3i1z8A8fTVv30iW2qkB+KZcL6Zrvt13Q 5Ye1HgS8o+Xjjr3izyHKirO5wfMz+iMcKkMPG4bMUopq6ZVTknN+SscIylW63XU/R3F50Zj S3H/2AOK9trMOYBzDb7825pfYaRrhxWH4ovqr3srayFAnA6ViMv2RY7UJjqGMNK9YoUGloK hcqbvViQY5YGBXEEj0YAw== X-UI-Out-Filterresults: notjunk:1;V01:K0:irGrpt6sofY=:g7pelVGnWi6NnpgZNNJR1u plb1CV0F5O3SrJpruJMqNtX7RDX4LL2vBMk2A77VRART78PYOD8WZxyYstFhCSrxDpBmAIX5l fg0KmSguzQPHuS9wtfkE2xw+pYLf6KV/0CG02Y30eCO66m8R2wR2yqwyXg83OGXL9y2HylFBm 5dVhwQGCHxAVuLYvY7J0DVmISRZGJDOBCEhp97gbl/VEbu6PMOOdWbWp5arQmae6ZaqyehmRX HcyIOswcVFdqrNPz2PdiV37nnsMH0NGbTRa4dnIE+qBiYgOos4nVELrVwrDr9uhujQcCPeK85 c1c6mFhyUZsFwiQ5vuk5vsxarHlimq5cQ2OJ4mSeHtGrACZn5mKnT/06Rp7XDZRxKvaGvhYds Zzx3VWRCIr+yr5wIVJEAtfop9UwU1MovizZYNGE2/oMFQSGEpaRGaIWipB/BtLGqh0wvfxDtc ERq7nOAyUTawNQq0C9vNDnarp0vEK6AKc0aj467BjThzfCl9+pmwgihoqctpLZmMh3m5xhIXb mzHyw7G3+vrN/+EI5Z73cubzwmIO9qWfSdB7EaNp9S+R8zovJOJl25dLoJp7sUTqsz3miJ+AS iQaZC488liYQnjKtJxbzQxBgF7umXmCTld98hC3jc3M3JkEsmuQxNVqVgxeLRrzupz199b86u UqlcUhxfWK3jctm37mi8w8aFZeu5gFfvU2CW4w74WdpCSV/dCB+0lgEVRDna6tEHa+YXYvsOZ BwOd4fFhO/8+11cJZOmCHNp4IqEXFI3WQunA9X9eMEJ+JtndDUUxEQPh7aRj96WamrmGAYTI X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.21 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:202095 Archived-At: Paul Eggert writes: > branch: master > commit f95bbe5a67e03fe6d05cbfb4d0c9151a754d6ccd > Merge: 4869e0d b8ea08b > Author: Paul Eggert > Commit: Paul Eggert > > - > --- > 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.