From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Strange ChangeLog entry after merge from emacs-24 Date: Mon, 08 Dec 2014 19:12:09 +0200 Message-ID: <83k322xdzq.fsf@gnu.org> References: <83iohp18fk.fsf@gnu.org> <83bnnfz78y.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1418058762 27004 80.91.229.3 (8 Dec 2014 17:12:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 8 Dec 2014 17:12:42 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 08 18:12:35 2014 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 1Xy1rO-00028H-28 for ged-emacs-devel@m.gmane.org; Mon, 08 Dec 2014 18:12:34 +0100 Original-Received: from localhost ([::1]:35120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xy1rN-00088K-IA for ged-emacs-devel@m.gmane.org; Mon, 08 Dec 2014 12:12:33 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57345) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xy1rG-00087F-LN for emacs-devel@gnu.org; Mon, 08 Dec 2014 12:12:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xy1rB-0000Ok-Bp for emacs-devel@gnu.org; Mon, 08 Dec 2014 12:12:26 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:63381) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xy1rB-0000OP-0s for emacs-devel@gnu.org; Mon, 08 Dec 2014 12:12:21 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NG900500X2QAD00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Mon, 08 Dec 2014 19:12:18 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NG9004H6X4IJ4A0@a-mtaout22.012.net.il>; Mon, 08 Dec 2014 19:12:18 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:179412 Archived-At: > From: Stefan Monnier > Cc: emacs-devel@gnu.org > Date: Sun, 07 Dec 2014 16:18:04 -0500 > > >> 2014-12-05 Paul Eggert > >> 2014-12-05 Eli Zaretskii > >> > >> * .gitignore: Ignore test/biditest.txt. > >> > >> What happened here? Not that it was a significant contribution for > >> which I'd object sharing the credit with Paul, but there might be a > >> larger merging problem hiding behind this. > >> > >> What am I missing? > > > Ping! > > Should I fix that entry and forget about this? > > I think so, yes. Done. Btw, it also happened in another entry in src/ChangeLog: 2014-12-05 Eli Zaretskii 2014-12-05 Eli Zaretskii * dispextern.h (enum bidi_dir_t): Force NEUTRAL_DIR to be zero. (struct bidi_stack): Reduce size by using bit fields and by packing sos, override, and isolate_status into a single 8-bit byte called 'flags'. So there definitely was some problem in that merge. (And what's with "merge from emacs-24" followed by "merge from origin/emacs-24"?)