HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c6d3df3
)
Revert "Merge pull request #83 from tkf/empty-triple-quote"
author
Fabián Ezequiel Gallina
<fgallina@cuca>
Thu, 17 May 2012 03:03:45 +0000
(
00:03
-0300)
committer
Fabián Ezequiel Gallina
<fgallina@gnu.org>
Thu, 17 May 2012 03:03:45 +0000
(
00:03
-0300)
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.
lisp/progmodes/python.el
patch
|
blob
|
blame
|
history
diff --git
a/lisp/progmodes/python.el
b/lisp/progmodes/python.el
index
4b9a298
..
2da5337
100644
(file)
--- 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)))))