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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b693e077f76d3e9ab06864b5a86790f706bb2d79..148c2b0e65c181ff4879fad1161b6c811b7aab7e 100644 (file)
--- 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 240cf8aff8ce45f62ac1afe1f984db50e2e1bf37..f127d4b7028b8ce3b51282b29117e7149cc17195 100644 (file)
--- 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."