[Emacs-diffs] /srv/bzr/emacs/trunk r100605: * src/lread.c (read1): Phase out old-style backquotes a bit more.

[Stefan Monnier]

------------------------------------------------------------
revno: 100605
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2010-06-16 10:10:02 -0400
message:
  * src/lread.c (read1): Phase out old-style backquotes a bit more.
modified:
  etc/NEWS
  src/ChangeLog
  src/lread.c

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-06-14 16:03:04 +0000
+++ b/etc/NEWS  2010-06-16 14:10:02 +0000
@@ -257,7 +257,11 @@
 
 * 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.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-06-12 15:52:43 +0000
+++ b/src/ChangeLog     2010-06-16 14:10:02 +0000
@@ -1,3 +1,7 @@
+2010-06-16  Stefan Monnier  <address@hidden>
+
+       * lread.c (read1): Phase out old-style backquotes a bit more.
+
 2010-06-12  Eli Zaretskii  <address@hidden>
 
        * 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.

=== modified file 'src/lread.c'
--- a/src/lread.c       2010-06-08 03:12:21 +0000
+++ b/src/lread.c       2010-06-16 14:10:02 +0000
@@ -2683,7 +2683,17 @@
       }
 
     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;