From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 16 Jun 2010 14:10:02 +0000 (-0400)
Subject: * src/lread.c (read1): Phase out old-style backquotes a bit more.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~52^2~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=288cf4e907c0350eb24824016763bddd09df8ea8;p=emacs.git

* src/lread.c (read1): Phase out old-style backquotes a bit more.
---

diff --git a/etc/NEWS b/etc/NEWS
index 60de0a286f3..b881edfb3b4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -257,7 +257,11 @@ Notifications API.  It requires D-Bus for communication.
 
 * Incompatible Lisp Changes in Emacs 24.1
 
+** A backquote not followed by a space is now always treated as new-style.
+
 ** Test for special mode-class was moved from view-file to view-buffer.
+FIXME: This only says what was changed, but not what are the
+programmer-visible consequences.
 
 ** Passing a nil argument to a minor mode function now turns the mode
    ON unconditionally.
diff --git a/src/ChangeLog b/src/ChangeLog
index 3e6c8f24398..799680498ea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lread.c (read1): Phase out old-style backquotes a bit more.
+
 2010-06-12  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in ($(BLD)/bidi.$(O)): Depend on biditype.h and
@@ -7,8 +11,7 @@
 
 	* bidi.c (bidi_initialize): Remove explicit initialization of
 	bidi_type_table; include biditype.h instead.  Don't support
-	entries whose second codepoint is zero.  Initialize
-	bidi_mirror_table.
+	entries whose second codepoint is zero.  Initialize bidi_mirror_table.
 	(bidi_mirror_char): Use bidi_mirror_table.
 
 	* biditype.h: New file.
diff --git a/src/lread.c b/src/lread.c
index 3a77a62b27f..c73f7f32e51 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2683,7 +2683,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;