From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Some proposed backports from master to emacs-25 Date: Thu, 6 Oct 2016 21:42:01 -0400 Message-ID: References: <87shseyhfl.fsf@users.sourceforge.net> <83int8oc6b.fsf@gnu.org> <87h98s38u0.fsf@engster.org> <8360p8o8fx.fsf@gnu.org> <83twcsmhnc.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: blaine.gmane.org 1475804547 9791 195.159.176.226 (7 Oct 2016 01:42:27 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 7 Oct 2016 01:42:27 +0000 (UTC) Cc: David Engster , Emacs developers To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 07 03:42:23 2016 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 1bsKAw-0000wA-Nh for ged-emacs-devel@m.gmane.org; Fri, 07 Oct 2016 03:42:14 +0200 Original-Received: from localhost ([::1]:60190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsKAv-0000E5-Cb for ged-emacs-devel@m.gmane.org; Thu, 06 Oct 2016 21:42:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsKAq-0000Cx-8z for emacs-devel@gnu.org; Thu, 06 Oct 2016 21:42:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bsKAo-0004xC-C3 for emacs-devel@gnu.org; Thu, 06 Oct 2016 21:42:07 -0400 Original-Received: from mail-oi0-x234.google.com ([2607:f8b0:4003:c06::234]:32814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsKAl-0004vJ-OD; Thu, 06 Oct 2016 21:42:03 -0400 Original-Received: by mail-oi0-x234.google.com with SMTP id r126so42257526oib.0; Thu, 06 Oct 2016 18:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=yLuGyUXBLrO0XSZtJl3WW0dcr2tm8Im7h2OM6m8AoqQ=; b=rTo0c1q1KYoKnT9v5TmCkYxGa4rV2kHmkItZ8QPiunXDSrI9CawPMQz9wBHfHiK+KH dJXfCtGNUI42ZJys93eH1vc8/ENuUz0iv38CIWUligAQaY/KpBmoLGBD51ZTM4yHPCet 0dEfGi6JfDtJHsUbKwIEspNADnUwjIc7u4l2fUmwlB40TVrnisGa++2Xpwm987KeMw9g rPnos69Uy34ivkYfeWuvXxuiP73evcux5rb7qJ/yDsDY+9yzULHCbUbHONLloTCHL5M+ X3IIwoxXDOSVWYorkgBRqup4ERtPVVRHimLpDEKWNbxe8Z78en0yTFNXug5rRLHqISOF GiIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=yLuGyUXBLrO0XSZtJl3WW0dcr2tm8Im7h2OM6m8AoqQ=; b=hXcpMhmNTGtRXFkjsngWe1bceaOwRSSUUY0zJnLk9e4khfaMZ/GZjEEWB09MylCQhF yFjnxKdflMDEa0ZbktwTsYAHkuEvaSy/asEPUppW2brRPv2O5AOWDdVFSJe5aVV63+wU o4600XvDBTY23uv+AVmpwuVZSfhoIDVD17mGL3z+KRZpGqfRcQS7/qNfIJOjvESp/Hna BhLRwdf0rNVOR1b3+3BrmWULcw/9sEHV2y1xk0UCpc9XMLSdkZs+KzTtBCrFYvh0fAdO pGQvK5N/1kryovJILgDT3v9Y8KBJ0W3awmC+g6FQyOp9U4kya9Okg5F7yz3rqntiemtS TVzw== X-Gm-Message-State: AA6/9RkTPaMyTAUiGmMSPDoKVvQfXR5XmdpcVneLziXAEErgtEjxDcHaUpGry37NkQGGPVevrvyXIkc6xVxEKg== X-Received: by 10.202.182.3 with SMTP id g3mr13997137oif.46.1475804521596; Thu, 06 Oct 2016 18:42:01 -0700 (PDT) Original-Received: by 10.157.42.16 with HTTP; Thu, 6 Oct 2016 18:42:01 -0700 (PDT) In-Reply-To: <83twcsmhnc.fsf@gnu.org> X-Google-Sender-Auth: zICmFpEd_hmoNG351NlJ9KG6QOQ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c06::234 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:208050 Archived-At: On Tue, Oct 4, 2016 at 8:18 AM, Eli Zaretskii wrote: >> >> This is only on the master branch, though. I've no idea why I didn't >> >> commit this to emacs-25... >> > >> > The merges are only done on master, right? >> >> Yeah, so it should be fine, except that it's potentially a bit >> confusing (I asked the question because I only looked at the emacs-25 >> branch). > > I'm okay with backporting that change to emacs-25. Merged the scratch/backports-25.2-strict branch in fb12af2, and cherrypicked the gitmerge.el change as a6e0a677.