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: [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755 Date: Thu, 19 Jun 2014 14:51:07 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1403203896 18234 80.91.229.3 (19 Jun 2014 18:51:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 19 Jun 2014 18:51:36 +0000 (UTC) Cc: emacs-devel@gnu.org To: Kelvin White Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 19 20:51:27 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 1WxhQj-0003C1-TW for ged-emacs-devel@m.gmane.org; Thu, 19 Jun 2014 20:51:26 +0200 Original-Received: from localhost ([::1]:37265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxhQj-0004I0-Ij for ged-emacs-devel@m.gmane.org; Thu, 19 Jun 2014 14:51:25 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxhQa-0004Ht-3k for emacs-devel@gnu.org; Thu, 19 Jun 2014 14:51:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxhQS-0006nj-Ji for emacs-devel@gnu.org; Thu, 19 Jun 2014 14:51:16 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:64487) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxhQS-0006nV-Fa for emacs-devel@gnu.org; Thu, 19 Jun 2014 14:51:08 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArUGAIDvNVNLd+D9/2dsb2JhbABZgwaDSsA9gRcXdIImAQEEViMQCzQSFBgNJIgM0hkXjnoHhDgEqRmBaoNMIQ X-IPAS-Result: ArUGAIDvNVNLd+D9/2dsb2JhbABZgwaDSsA9gRcXdIImAQEEViMQCzQSFBgNJIgM0hkXjnoHhDgEqRmBaoNMIQ X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="68360135" Original-Received: from 75-119-224-253.dsl.teksavvy.com (HELO pastel.home) ([75.119.224.253]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 19 Jun 2014 14:51:07 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 9EE6B60D16; Thu, 19 Jun 2014 14:51:07 -0400 (EDT) In-Reply-To: (Kelvin White's message of "Thu, 19 Jun 2014 17:00:42 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:172544 Archived-At: > - (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