From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Newsgroups: gmane.emacs.devel Subject: Re: Merging mistakes Date: Sat, 04 Dec 2010 14:42:17 +0000 Message-ID: References: <8362v998xv.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1291473755 31822 80.91.229.12 (4 Dec 2010 14:42:35 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 4 Dec 2010 14:42:35 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 04 15:42:31 2010 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.69) (envelope-from ) id 1POtJl-0000ao-Td for ged-emacs-devel@m.gmane.org; Sat, 04 Dec 2010 15:42:30 +0100 Original-Received: from localhost ([127.0.0.1]:54946 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POtJk-0008RV-3C for ged-emacs-devel@m.gmane.org; Sat, 04 Dec 2010 09:42:28 -0500 Original-Received: from [140.186.70.92] (port=39919 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POtJg-0008RM-1A for emacs-devel@gnu.org; Sat, 04 Dec 2010 09:42:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POtJf-0007Z5-0l for emacs-devel@gnu.org; Sat, 04 Dec 2010 09:42:23 -0500 Original-Received: from mail-ww0-f49.google.com ([74.125.82.49]:55445) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POtJe-0007Ym-Si; Sat, 04 Dec 2010 09:42:22 -0500 Original-Received: by wwb17 with SMTP id 17so2509717wwb.30 for ; Sat, 04 Dec 2010 06:42:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=EZmuClLwlvKZ3lvbPjbFQTbBzqH4QMsV9ELJryhxUJ0=; b=GylZhouZ5RiIPKdSf19Fgo9LYD1OBDJsL53uehnLeEcuk2OrY54DzXtVmZAwD+g6MQ jf0Gruudk1ahrW2oifPE6KqMdxMNd1UaQne2IxCJloqXVlalrJ/JaBfpfSx7X6L1wg1K 7P9ASX9uaClUyH9ZGqZ8+boek5xT8DrbJpN+w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=lp9XLjA8voG4Ov5HQ0pBwEhCQKAl6WU68qI9fnDAkbEsNoajz6rJ8WSUgwfkakLPMb X15VUjdoZ0ISSQf9u+tmx56RmbQVJKYF1aK7r7+lRBAz+8kg1ZF7yezOrYRzu9dmy30t cbYy6FSvTL/VLkNon/t/B6RalVMOtdEfcXqPQ= Original-Received: by 10.216.51.208 with SMTP id b58mr556620wec.8.1291473741805; Sat, 04 Dec 2010 06:42:21 -0800 (PST) Original-Received: from Victoria.local (cpc1-cmbg13-0-0-cust596.5-4.cable.virginmedia.com [86.9.122.85]) by mx.google.com with ESMTPS id a2sm1427970wer.17.2010.12.04.06.42.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 04 Dec 2010 06:42:21 -0800 (PST) In-Reply-To: (Stefan Monnier's message of "Sat, 04 Dec 2010 09:00:24 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2.90 (Mac OS X 10.6.5) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:133403 Archived-At: On 2010-12-04 14:00 +0000, Stefan Monnier wrote: > I've tested the smie.el code in Emacs-23 about as much as is possible > (i.e. with coq-mode, sml-mode, octave-mode, modula2-mode, prolog-mode; > the last three requiring extra steps to perform this check since they > use pcase which doesn't exist/work in Emacs-23). pcase.el seems to be working with this patch (I also add r100617) from trunk: commit f150e3df20d5fbfde1d2cfd3f58b390d3e9bd005 Author: Leo Date: Mon Sep 27 00:05:57 2010 +0100 Phase out old-style backquotes a bit more (r100605) Needed for pcase.el. Modified src/lread.c diff --git a/src/lread.c b/src/lread.c index ceac9de..72c01ed 100644 --- a/src/lread.c +++ b/src/lread.c @@ -2700,7 +2700,17 @@ read1 (readcharfun, pch, first_in_list) } case '`': - if (first_in_list) + /* Transition from old-style to new-style: + If we see "(`" it used to mean old-style, which usually works + fine because ` should almost never appear in such a position + for new-style. But occasionally we need "(`" to mean new + style, so we try to distinguish the two by the fact that we + can either write "( `foo" or "(` foo", where the first + intends to use new-style whereas the second intends to use + old-style. For Emacs-25, we should completely remove this + first_in_list exception (old-style can still be obtained via + "(\`" anyway). */ + if (first_in_list && (c = READCHAR, UNREAD (c), c == ' ')) { Vold_style_backquotes = Qt; goto default_label;