(py-forward-into-nomenclature): Slightly better regex for stopping on

underscore.

diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index e4b6e670dda88bd8457d8617cb55325d653c77a2..feaf7afddbcffb21c076275cb2d5cad047872a95 100644 (file)
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -1728,10 +1728,12 @@ A `nomenclature' is a fancy way of saying AWordWithMixedCaseNotUnderscores."
   (interactive "p")
   (let ((case-fold-search nil))
     (if (> arg 0)
-       (re-search-forward "\\W*\\([A-Z_]*[a-z0-9]*\\)" (point-max) t arg)
+       (re-search-forward
+        "\\(\\W\\|[_]\\)*\\([A-Z]*[a-z0-9]*\\)"
+        (point-max) t arg)
       (while (and (< arg 0)
                  (re-search-backward
-                  "\\(\\(\\W\\|[a-z0-9]\\)[A-Z]+\\|\\W\\w+\\)"
+                  "\\(\\W\\|[a-z0-9]\\)[A-Z]+\\|\\(\\W\\|[_]\\)\\w+"
                   (point-min) 0))
        (forward-char 1)
        (setq arg (1+ arg)))))