summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina <fgallina@gnu.org>2013-02-19 15:53:57 -0300
committerFabián Ezequiel Gallina <fgallina@gnu.org>2013-02-19 15:53:57 -0300
commit33c0cb2549452f1ba1c1da0a1d0e45559c0be99b (patch)
tree6fed42c6fdc75d655f796eebce5d5defb3b693c4
parent2af3b9c16e340ad034e57e949f09bbafc00bd52c (diff)
downloademacs-33c0cb2549452f1ba1c1da0a1d0e45559c0be99b.tar.gz
* progmodes/python.el (python-info-current-defun): Fix failed
defun name retrieval because of unwanted match-data cluttering.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/python.el5
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f99cab9edbf..390c825ad0a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
2013-02-19 Fabián Ezequiel Gallina <fgallina@cuca>
+ * progmodes/python.el (python-info-current-defun): Fix failed
+ defun name retrieval because of unwanted match-data cluttering.
+
+2013-02-19 Fabián Ezequiel Gallina <fgallina@cuca>
+
* progmodes/python.el (python-indent-context): Fix
python-info-line-ends-backslash-p call.
(python-info-line-ends-backslash-p)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 49eaff637a6..1ee95daa0a9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2976,7 +2976,10 @@ not inside a defun."
;; Else go to the end of defun and add
;; up the current indentation to the
;; ending position.
- (python-nav-end-of-defun)
+ (save-match-data
+ ;; FIXME: avoid cluttering match-data
+ ;; where's not wanted.
+ (python-nav-end-of-defun))
(+ (point)
(if (>= (current-indentation) min-indent)
(1+ (current-indentation))