From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#12169: [PATCH] Merge changes from upstream ruby-mode Date: Fri, 10 Aug 2012 16:28:17 -0400 Message-ID: References: <50245771.6060109@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1344630535 455 80.91.229.3 (10 Aug 2012 20:28:55 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 10 Aug 2012 20:28:55 +0000 (UTC) Cc: 12169@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Aug 10 22:28:54 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1SzvpF-0002zA-Mx for geb-bug-gnu-emacs@m.gmane.org; Fri, 10 Aug 2012 22:28:53 +0200 Original-Received: from localhost ([::1]:34413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzvpE-0001pi-Do for geb-bug-gnu-emacs@m.gmane.org; Fri, 10 Aug 2012 16:28:52 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:56012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzvpA-0001pP-Dl for bug-gnu-emacs@gnu.org; Fri, 10 Aug 2012 16:28:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Szvp7-0002Sn-PH for bug-gnu-emacs@gnu.org; Fri, 10 Aug 2012 16:28:48 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:38028) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Szvp7-0002Sj-Lp for bug-gnu-emacs@gnu.org; Fri, 10 Aug 2012 16:28:45 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Szvx8-0008RZ-7s for bug-gnu-emacs@gnu.org; Fri, 10 Aug 2012 16:37:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 10 Aug 2012 20:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12169 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 12169-submit@debbugs.gnu.org id=B12169.134463100032426 (code B ref 12169); Fri, 10 Aug 2012 20:37:02 +0000 Original-Received: (at 12169) by debbugs.gnu.org; 10 Aug 2012 20:36:40 +0000 Original-Received: from localhost ([127.0.0.1]:47574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Szvwk-0008Qw-Id for submit@debbugs.gnu.org; Fri, 10 Aug 2012 16:36:39 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:36382) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Szvwi-0008Qp-Qk for 12169@debbugs.gnu.org; Fri, 10 Aug 2012 16:36:37 -0400 Original-Received: from faina.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id q7AKSIid017361; Fri, 10 Aug 2012 16:28:18 -0400 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 0A211B4177; Fri, 10 Aug 2012 16:28:17 -0400 (EDT) In-Reply-To: <50245771.6060109@yandex.ru> (Dmitry Gutov's message of "Fri, 10 Aug 2012 04:36:01 +0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Level: X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.2 X-NAI-Spam-Rules: 2 Rules triggered URI_32_40HEX=0.2, RV4306=0 X-NAI-Spam-Version: 2.2.0.9309 : core <4306> : streams <797298> : uri <1189161> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:63020 Archived-At: > The change to `ruby-syntax-propertize-function' is kind of messy, but > I don't see how to do it better without seriously rewriting > ruby-syntax-propertize-heredoc'. I think it can be simplified by adding a "\\(\\_ Here's part 2, in which I'm skipping the next 3 commits: > https://github.com/ruby/ruby/commit/85df40e9ab4559cd4ddde3f106ab56c76a808cc8 > https://github.com/ruby/ruby/commit/6b0dc7fd81b25bc66681548b8b82f38258f7e08c > https://github.com/ruby/ruby/commit/862048e28d26112af1e67205cfd1c16564590bce I also added that patch. I presume that you're also trying to convince Ruby's maintainers to undo those changes? Same as before: please provide a subsequent patch which corrects the authorship attribution. Stefan