From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: rel-22 to trunk merge failures 2008-02-24 Date: Sun, 24 Feb 2008 10:48:44 -0500 Message-ID: References: <61y79aveo0.fsf@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1203868247 20495 80.91.229.12 (24 Feb 2008 15:50:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 24 Feb 2008 15:50:47 +0000 (UTC) Cc: jasonr@gnu.org, mituharu@math.s.chiba-u.ac.jp, emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 24 16:51:11 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JTJ8A-0005iW-OI for ged-emacs-devel@m.gmane.org; Sun, 24 Feb 2008 16:51:11 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JTJ7f-000807-3W for ged-emacs-devel@m.gmane.org; Sun, 24 Feb 2008 10:50:39 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JTJ71-0007EV-7K for emacs-devel@gnu.org; Sun, 24 Feb 2008 10:49:59 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JTJ6z-0007C0-BV for emacs-devel@gnu.org; Sun, 24 Feb 2008 10:49:58 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JTJ6z-0007Bl-5L for emacs-devel@gnu.org; Sun, 24 Feb 2008 10:49:57 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JTJ6r-000623-8Q; Sun, 24 Feb 2008 10:49:49 -0500 Original-Received: from ceviche.home (vpn-132-204-232-145.acd.umontreal.ca [132.204.232.145]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id m1OFniFT015744; Sun, 24 Feb 2008 10:49:44 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 18507B41A8; Sun, 24 Feb 2008 10:48:44 -0500 (EST) In-Reply-To: <61y79aveo0.fsf@fencepost.gnu.org> (Miles Bader's message of "Sun, 24 Feb 2008 05:20:47 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered HAS_X_HELO=0 X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:90242 Archived-At: > [Remember, all changes below are _not_ in the trunk, and will not be > merged later, so somebody needs to either make the appropriate change to > the trunk (including the ChangeLog entry), or confirm that it isn't > needed (e.g., the trunk already contains an equivalent change. > Thanks, -Miles] > M src/w32term.c > M src/macterm.c > M lisp/diff-mode.el I'll take care of the diff-mode.el changes, thanks Miles, Stefan