More fixes for triple-quoted string syntax

leoliu · Oct 7, 2012 · aff8a7c · aff8a7c
1 parent d151335
commit aff8a7c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/python.el b/python.el
@@ -170,7 +170,7 @@
   ;; First avoid a sequence preceded by an odd number of backslashes.
   (syntax-propertize-rules
    (;; ¡Backrefs don't work in syntax-propertize-rules!
-    (concat "\\(?:\\([RUru]\\)[Rr]?\\|^\\|[^\\]\\(?:\\\\.\\)*\\)?" ;Prefix.
+    (concat "\\(?:\\([RUru]\\)[Rr]?\\|\\(?:\\=\\|[^\\]\\)\\(?:\\\\.\\)*\\)?" ;Prefix.
 	    "\\(?:\\('\\)'\\('\\)\\|\\(?2:\"\\)\"\\(?3:\"\\)\\)")
     (3 (ignore (python-quote-syntax))))
    ;; This doesn't really help.

diff --git a/t/test_python.el b/t/test_python.el
@@ -9,4 +9,6 @@
     (should-not (nth 3 (syntax-ppss 44)))
     (should-not (nth 3 (syntax-ppss 52)))
     (should-not (nth 3 (syntax-ppss 64)))
-    (should-not (nth 3 (syntax-ppss 105)))))
+    (should-not (nth 3 (syntax-ppss 105)))
+    (should-not (nth 3 (syntax-ppss 122)))
+    (should-not (nth 3 (syntax-ppss 140)))))
diff --git a/t/tqstr.py b/t/tqstr.py
@@ -5,3 +5,5 @@
 
 # empty triple quoted string
   """""" x
+  ''''''"""""" x
+  u""""""'''''' x