From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Wed, 26 Nov 2014 20:54:50 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87y4qx76hh.fsf@lifelogs.com> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417053301 18166 80.91.229.3 (27 Nov 2014 01:55:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Nov 2014 01:55:01 +0000 (UTC) Cc: Oscar Fuentes To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 27 02:54:53 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 1XtoID-0008CS-Pv for ged-emacs-devel@m.gmane.org; Thu, 27 Nov 2014 02:54:49 +0100 Original-Received: from localhost ([::1]:36692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtoID-0004kU-6P for ged-emacs-devel@m.gmane.org; Wed, 26 Nov 2014 20:54:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtoHt-0004kO-UP for emacs-devel@gnu.org; Wed, 26 Nov 2014 20:54:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtoHo-00084O-0s for emacs-devel@gnu.org; Wed, 26 Nov 2014 20:54:29 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:44417) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtoHn-00084I-QB for emacs-devel@gnu.org; Wed, 26 Nov 2014 20:54:23 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XtoHm-00085o-QP for emacs-devel@gnu.org; Thu, 27 Nov 2014 02:54:22 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 27 Nov 2014 02:54:22 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 27 Nov 2014 02:54:22 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 17 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:74neNXHrHyTJ2zxlLQcwE+YVzPw= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:178337 Archived-At: On Wed, 26 Nov 2014 13:59:33 -0500 Stefan Monnier wrote: >> Is it enough to merge laconically like you did: SM> [...] >> ...and resolve conflicts as needed? SM> Yes. Be careful with the conflicts, tho: some of those patches should SM> simply not be applied (regardless if they'd create conflicts or not). OK, I pushed my proposed merge to the repo in branch master-merge-emacs-24-2014-11-26 for your review. The major change I'm not sure about is from Oscar Fuentes, courtesy-CC-ed here. I'd appreciate a review for the MinGW64 stuff which I don't understand enough to merge properly. The rest seems OK. Ted