From 1d5f9884579cffea181467b5b4366eb330047ce6 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Wed, 28 Oct 1998 04:08:13 +0000 Subject: [PATCH] (py-imenu-method-regexp): Fix suggested by Daniel Calvelo to generalize the matching of function arguments. --- Misc/python-mode.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Misc/python-mode.el b/Misc/python-mode.el index 5e9cb0bc486..12c2d1114f0 100644 --- a/Misc/python-mode.el +++ b/Misc/python-mode.el @@ -87,7 +87,7 @@ of the Custom library from: See the Python Mode home page for details: - + "))) @@ -708,7 +708,8 @@ package. Note that the latest X/Emacs releases contain this package.") "\\(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 @@ of how this works." 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)