]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/progmodes/python.el (python-rx-constituents): Fix ordering in `or`
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 13 Mar 2019 17:40:36 +0000 (13:40 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Wed, 13 Mar 2019 17:40:36 +0000 (13:40 -0400)
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.

lisp/progmodes/python.el

index 65d5d90cd5f19336fd9878b4de7108420cf5fa9c..5d0d03d5029421fec9244a984f9118738f783090 100644 (file)
@@ -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>