summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina <fgallina@gnu.org>2014-06-21 08:26:43 -0300
committerFabián Ezequiel Gallina <fgallina@gnu.org>2014-06-21 08:26:43 -0300
commit3114d9e702aada713f029cfd80f8785240c9d940 (patch)
treee20fc56bdfeae288b7940ca59265909b10429771
parent97a1ef484e61190deece48ee73b9b9d3b6be221c (diff)
downloademacs-3114d9e702aada713f029cfd80f8785240c9d940.tar.gz
Enhancements for outline integration.
* lisp/progmodes/python.el (python-mode): Properly set outline-heading-end-regexp so that comments after colons for defuns are supported. Fixes: debbugs:17796
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/progmodes/python.el2
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b693e077f76..148c2b0e65c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-21 Fabián Ezequiel Gallina <fgallina@gnu.org>
+
+ Enhancements for outline integration (bug#17796).
+ * progmodes/python.el (python-mode): Properly set
+ outline-heading-end-regexp so that comments after colons for
+ defuns are supported.
+
2014-06-21 Eli Zaretskii <eliz@gnu.org>
* skeleton.el (skeleton-insert): Doc fix.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 240cf8aff8c..f127d4b7028 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3732,7 +3732,7 @@ returned as is."
(set (make-local-variable 'outline-regexp)
(python-rx (* space) block-start))
- (set (make-local-variable 'outline-heading-end-regexp) ":\\s-*\n")
+ (set (make-local-variable 'outline-heading-end-regexp) ":[^\n]*\n")
(set (make-local-variable 'outline-level)
#'(lambda ()
"`outline-level' function for Python mode."