From: Barry Warsaw <barry@python.org>
Date: Mon, 5 Aug 1996 21:53:02 +0000 (+0000)
Subject: (py-forward-into-nomenclature): Slightly better regex for stopping on
X-Git-Tag: v1.4b2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5a8cbd35d24f44808dd5bf3525befaa729cbd61;p=python

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

diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index e4b6e670dd..feaf7afddb 100644
--- 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)))))