diff options
| author | Fabián Ezequiel Gallina | 2012-05-17 00:03:45 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2012-05-17 00:03:45 -0300 |
| commit | bd982677367c3d441cea1d1c60cb3ad0bc3f263b (patch) | |
| tree | 3d223ccccd255c2859fd7acf58c9156f11b73366 | |
| parent | c6d3df36da36ee383a6dcde5cce76175258ba269 (diff) | |
| download | emacs-bd982677367c3d441cea1d1c60cb3ad0bc3f263b.tar.gz emacs-bd982677367c3d441cea1d1c60cb3ad0bc3f263b.zip | |
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.
| -rw-r--r-- | lisp/progmodes/python.el | 1 |
1 files changed, 0 insertions, 1 deletions
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." | |||
| 465 | ;; string delimiters. Fixme: Is there a better way? | 465 | ;; string delimiters. Fixme: Is there a better way? |
| 466 | ;; First avoid a sequence preceded by an odd number of backslashes. | 466 | ;; First avoid a sequence preceded by an odd number of backslashes. |
| 467 | `((,(concat "\\(?:\\([RUru]\\)[Rr]?\\|^\\|[^\\]\\(?:\\\\.\\)*\\)" ;Prefix. | 467 | `((,(concat "\\(?:\\([RUru]\\)[Rr]?\\|^\\|[^\\]\\(?:\\\\.\\)*\\)" ;Prefix. |
| 468 | "\\(?:''''''\\|\"\"\"\"\"\"\\)" ; Empty triple-quote | ||
| 469 | "\\(?:\\('\\)'\\('\\)\\|\\(?2:\"\\)\"\\(?3:\"\\)\\)") | 468 | "\\(?:\\('\\)'\\('\\)\\|\\(?2:\"\\)\"\\(?3:\"\\)\\)") |
| 470 | (3 (python-quote-syntax))))) | 469 | (3 (python-quote-syntax))))) |
| 471 | 470 | ||