Re: Merging mistakes

[Leo <sdl.web@gmail.com>]

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 <sdl.web@gmail.com>
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;