From: Fabián Ezequiel Gallina Date: Thu, 17 May 2012 03:03:45 +0000 (-0300) Subject: Revert "Merge pull request #83 from tkf/empty-triple-quote" X-Git-Tag: emacs-24.2.90~1199^2~481 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bd982677367c3d441cea1d1c60cb3ad0bc3f263b;p=emacs.git Revert "Merge pull request #83 from tkf/empty-triple-quote" This reverts commit f4d086427343eb0b8bc91355388d2437c568b1f6, reversing changes made to 8f697fd2ef23a9e1d9a06ac8ca419d76ccedb27d. While the fix worked with empty triple quoted strings it broke simpler cases like these: """ def someting(a, b, c): " """ or ''' def someting(a, b, c): ' ''' Another approach is needed for giving triple quoted string the correct syntax. --- diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 4b9a29845c5..2da5337b8c5 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -465,7 +465,6 @@ This variant of `rx' supports common python named REGEXPS." ;; string delimiters. Fixme: Is there a better way? ;; First avoid a sequence preceded by an odd number of backslashes. `((,(concat "\\(?:\\([RUru]\\)[Rr]?\\|^\\|[^\\]\\(?:\\\\.\\)*\\)" ;Prefix. - "\\(?:''''''\\|\"\"\"\"\"\"\\)" ; Empty triple-quote "\\(?:\\('\\)'\\('\\)\\|\\(?2:\"\\)\"\\(?3:\"\\)\\)") (3 (python-quote-syntax)))))