From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kelvin White Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755 Date: Thu, 19 Jun 2014 14:58:25 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a1133aa1c32941904fc34f695 X-Trace: ger.gmane.org 1403204324 23867 80.91.229.3 (19 Jun 2014 18:58:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 19 Jun 2014 18:58:44 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 19 20:58:37 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 1WxhXe-0004ZG-3I for ged-emacs-devel@m.gmane.org; Thu, 19 Jun 2014 20:58:34 +0200 Original-Received: from localhost ([::1]:37276 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxhXd-00057x-Ke for ged-emacs-devel@m.gmane.org; Thu, 19 Jun 2014 14:58:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxhXZ-00057q-RQ for emacs-devel@gnu.org; Thu, 19 Jun 2014 14:58:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxhXY-0000sO-5f for emacs-devel@gnu.org; Thu, 19 Jun 2014 14:58:29 -0400 Original-Received: from mail-lb0-x230.google.com ([2a00:1450:4010:c04::230]:60109) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxhXX-0000pE-Si for emacs-devel@gnu.org; Thu, 19 Jun 2014 14:58:28 -0400 Original-Received: by mail-lb0-f176.google.com with SMTP id w7so1676431lbi.7 for ; Thu, 19 Jun 2014 11:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=T3cgo59oUgc26qAJe2+chEBck3mUYYfuIdHNU90yncw=; b=mhKxRX/CiV46HIwr/koNszPo5JCbcGkdFSWZl9vY61foFvBXjOSFEU/nKUcUjsPwTG u5ct5OLkDAOaKnb6eM243C1f/XqFQ2s07WlZPgRnqRm02sx+PNIb/LYWPo7E4I8+88Eb 8o+I/Z0J4buzw6+ww1NiCpI6bVn/s2nYWZmtlVwNNqtAveSOXDiX7ZgdHp03tX5Q6XXb OYjH6P8MMOIqGNef+r83x+62a1KS+uMHGVf6zaQIHS8Juwcpd8I/lBYtKVfJpZfkEnus tHdDAJh+FfkcPRqmb+FW4zkOKL04+CJzXwpPyC2OcDF0pkCSaLC45gCNMtyWXtsVzU8i hTOw== X-Received: by 10.112.56.233 with SMTP id d9mr4320860lbq.55.1403204305849; Thu, 19 Jun 2014 11:58:25 -0700 (PDT) Original-Received: by 10.112.57.45 with HTTP; Thu, 19 Jun 2014 11:58:25 -0700 (PDT) Original-Received: by 10.112.57.45 with HTTP; Thu, 19 Jun 2014 11:58:25 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::230 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:172545 Archived-At: --001a1133aa1c32941904fc34f695 Content-Type: text/plain; charset=UTF-8 Ok, sure. Sorry about that On Jun 19, 2014 2:51 PM, "Stefan Monnier" wrote: > > - (const "KICK") > > - (const "NICK") > > - (const "PART") > > - (const "QUIT") > > - (const "MODE") > > - (repeat :inline t :tag "Others" (string :tag "IRC Message > Type")))) > > + (const "KICK") > > + (const "NICK") > > + (const "PART") > > + (const "QUIT") > > + (const "MODE") > > + (repeat :inline t :tag "Others" (string :tag "IRC Message > Type")))) > > Your patch included a lot of whitespace changes. Please refrain from > changing whitespace (typically tabifying or untabifying). > It's perfectly OK to make such changes on the lines where you also > perform other changes, but elsewhere they're just a nuisance causing > spurious merge conflicts. > > > Stefan > --001a1133aa1c32941904fc34f695 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

Ok, sure. Sorry about that

On Jun 19, 2014 2:51 PM, "Stefan Monnier&qu= ot; <monnier@iro.umontreal.c= a> wrote:
> - =C2=A0 =C2=A0 =C2=A0 (const "KICK")
> - =C2=A0 =C2=A0 =C2=A0 (const "NICK")
> - =C2=A0 =C2=A0 =C2=A0 (const "PART")
> - =C2=A0 =C2=A0 =C2=A0 (const "QUIT")
> - =C2=A0 =C2=A0 =C2=A0 (const "MODE")
> - =C2=A0 =C2=A0 =C2=A0 (repeat :inline t :tag "Others" (stri= ng :tag "IRC Message Type"))))
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(const "KICK")
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(const "NICK")
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(const "PART")
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(const "QUIT")
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(const "MODE")
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(repeat :inline t :tag "Other= s" (string :tag "IRC Message Type"))))

Your patch included a lot of whitespace changes. =C2=A0Please refrain from<= br> changing whitespace (typically tabifying or untabifying).
It's perfectly OK to make such changes on the lines where you also
perform other changes, but elsewhere they're just a nuisance causing spurious merge conflicts.


=C2=A0 =C2=A0 =C2=A0 =C2=A0 Stefan
--001a1133aa1c32941904fc34f695--