diff options
| author | Stefan Monnier | 2019-03-13 13:40:36 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2019-03-13 13:40:36 -0400 |
| commit | 5feaf906e110097a443af78f549f01c1bd527e25 (patch) | |
| tree | efb5e3f18e4f62d7b82b58e1cec02212baf78d9e /lisp/progmodes/python.el | |
| parent | 9486d87cfe7a68d43a44eecd660d2fbe8f0fcb73 (diff) | |
| download | emacs-5feaf906e110097a443af78f549f01c1bd527e25.tar.gz emacs-5feaf906e110097a443af78f549f01c1bd527e25.zip | |
* 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.
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 438 | (* ?\\ ?\\) (any ?\' ?\"))) | 438 | (* ?\\ ?\\) (any ?\' ?\"))) |
| 439 | (* ?\\ ?\\) | 439 | (* ?\\ ?\\) |
| 440 | ;; Match single or triple quotes of any kind. | 440 | ;; Match single or triple quotes of any kind. |
| 441 | (group (or "\"" "\"\"\"" "'" "'''"))))) | 441 | (group (or "\"\"\"" "\"" "'''" "'"))))) |
| 442 | (coding-cookie . ,(rx line-start ?# (* space) | 442 | (coding-cookie . ,(rx line-start ?# (* space) |
| 443 | (or | 443 | (or |
| 444 | ;; # coding=<encoding name> | 444 | ;; # coding=<encoding name> |