From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: master 01db800: Merge from origin/emacs-26 Date: Sat, 09 Dec 2017 15:58:32 -0500 Message-ID: <5xpo7n4o07.fsf@fencepost.gnu.org> References: <20171209102340.2914.60218@vcs0.savannah.gnu.org> <20171209102341.B679C20404@vcs0.savannah.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1512853117 13734 195.159.176.226 (9 Dec 2017 20:58:37 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 9 Dec 2017 20:58:37 +0000 (UTC) User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) Cc: Michael Albinus To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 09 21:58:34 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eNmCf-0003P9-DU for ged-emacs-devel@m.gmane.org; Sat, 09 Dec 2017 21:58:33 +0100 Original-Received: from localhost ([::1]:42542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNmCm-0000d2-Ed for ged-emacs-devel@m.gmane.org; Sat, 09 Dec 2017 15:58:40 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNmCg-0000cm-2X for emacs-devel@gnu.org; Sat, 09 Dec 2017 15:58:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eNmCf-00052O-7h for emacs-devel@gnu.org; Sat, 09 Dec 2017 15:58:34 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNmCf-00052E-3j; Sat, 09 Dec 2017 15:58:33 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1eNmCe-0004Ag-Ma; Sat, 09 Dec 2017 15:58:32 -0500 X-Spook: Shots fired Phishing Smuggling Illegal immigrants Fusion X-Ran: >I\+Y";$A~]R7Sz:u\,)#{7VMQQtBZT>Kg9 (Michael Albinus's message of "Sat, 9 Dec 2017 05:23:41 -0500 (EST)") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:220831 Archived-At: Michael Albinus wrote: > branch: master > commit 01db80046f41c94569efd5dcdb11a1e46b3f16f3 > Merge: 3ef212c 7eea314 > Author: Michael Albinus > Commit: Michael Albinus > > Merge from origin/emacs-26 > > 7eea3144d4 Minor Tramp fixes > c0a670a8b5 * lisp/help-mode.el (help-function-def): Allow help-make-x... > 05720162c1 Fix doc-string of 'display-buffer-in-side-window' > a1bbc49015 Fix Bug#29579 > cb3d979b74 ; NEWS: Update Org version number Thanks for merging. The NEWS change from cb3d979b74 seems to have gotten lost. Any idea why? It should have been applied to etc/NEWS.26 in master. I tried to make gitmerge.el handled this automatically in master 0b6f4f2c60, so if you used that version of gitmerge, it may be my fault.