From: Noam Postavsky <npostavs@gmail.com>
Date: Wed, 2 Nov 2016 03:24:33 +0000 (-0400)
Subject: Fix python-mode hideshow regexp
X-Git-Tag: emacs-25.1.90~56
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b6b8151186e2d8d48aff8182a66aee21a6edb53;p=emacs.git

Fix python-mode hideshow regexp

2015-02-07 "Fix hideshow integration[...]" changed the regexp added to
`hs-special-modes-alist' so that it worked when not searching from the
beginning of the line.  However, this allows matching tokens ending in
"def" or "class", not just those keywords.  This results in an infinite
loop in hs-hide-all (Bug #24815).

* lisp/progmodes/python.el (python-mode): Add symbol boundaries around
the def|class matching part of the regexp added to
hs-special-modes-alist.
---

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 8ec9febe5c9..9091289b62e 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -5136,7 +5136,7 @@ returned as is."
   (add-to-list
    'hs-special-modes-alist
    `(python-mode
-     "\\s-*\\(?:def\\|class\\)\\>"
+     "\\s-*\\_<\\(?:def\\|class\\)\\_>"
      ;; Use the empty string as end regexp so it doesn't default to
      ;; "\\s)".  This way parens at end of defun are properly hidden.
      ""