(py-imenu-method-regexp): Fix suggested by Daniel Calvelo to
generalize the matching of function arguments.
diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 5e9cb0b..12c2d11 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -87,7 +87,7 @@
See the Python Mode home page for details:
- <http://www.python.org/ftp/emacs/>
+ <http://www.python.org/emacs/python-mode>
")))
@@ -708,7 +708,8 @@
"\\(def[ \t]+" ; function definitions start with def
"\\([a-zA-Z0-9_]+\\)" ; name is here
; function arguments...
- "[ \t]*(\\([-+/a-zA-Z0-9_=,\* \t\n.()\"'#]*\\))"
+;; "[ \t]*(\\([-+/a-zA-Z0-9_=,\* \t\n.()\"'#]*\\))"
+ "[ \t]*(\\([^:#]*\\))"
"\\)" ; end of def
"[ \t]*:" ; and then the :
"\\)" ; >>methods and functions<<
@@ -766,6 +767,9 @@
py-imenu-method-arg-parens
py-imenu-method-no-arg-parens))
(goto-char (point-min))
+ ;; Warning: When the buffer has no classes or functions, this will
+ ;; return nil, which seems proper according to the Imenu API, but
+ ;; causes an error in the XEmacs port of Imenu. Sigh.
(py-imenu-create-index-engine nil))
(defun py-imenu-create-index-engine (&optional start-indent)