From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 13 Mar 2019 17:40:36 +0000 (-0400)
Subject: * lisp/progmodes/python.el (python-rx-constituents): Fix ordering in `or`
X-Git-Tag: emacs-27.0.90~3418
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5feaf90;p=emacs.git

* lisp/progmodes/python.el (python-rx-constituents): Fix ordering in `or`

The previous code worked earlier because of a bug in `rx` (which used
`regexp-opt` without passing it to `keep-order` argument), but now that `rx`
has been fixed the underlying bug here reared its ugly head.
---

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 65d5d90cd5f..5d0d03d5029 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -438,7 +438,7 @@ It returns a file name which can be used directly as argument of
                                          (* ?\\ ?\\) (any ?\' ?\")))
                                 (* ?\\ ?\\)
                                 ;; Match single or triple quotes of any kind.
-                                (group (or  "\"" "\"\"\"" "'" "'''")))))
+                                (group (or  "\"\"\"" "\"" "'''" "'")))))
       (coding-cookie . ,(rx line-start ?# (* space)
                             (or
                              ;; # coding=<encoding name>