*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c8dc99040fc4f0312cf32378ff41203775eea40..0f143ca1c0ef7b2ea6be31738c35632ae8676a0f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-09  Mark A. Hershberger  <mah@everybody.org>
 
+       * progmodes/cperl-mode.el (cperl-mode): Adapt defun-prompt-regexp
+       so that it is more understanding of whitespace.
+
        * xml.el (xml-maybe-do-ns, xml-parse-tag): Produce elements in the
        form
        (("ns" . "element") (attr-list) children) instead of

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index c651e06b899261870861d5816e52a75fe6cebb8a..e679a48d64286fc58eb9d12532b8e9617f57e9ed 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1472,7 +1472,7 @@ or as help on variables `cperl-tips', `cperl-problems',
   (make-local-variable 'comment-start-skip)
   (setq comment-start-skip "#+ *")
   (make-local-variable 'defun-prompt-regexp)
-  (setq defun-prompt-regexp "^[ \t]*sub[ \t]+\\([^ \t\n{(;]+\\)\\([ \t]*([^()]*)[ \t]*\\)?[ \t]*")
+  (setq defun-prompt-regexp "^[ \t]*sub[ \t\n]+\\([^ \t\n{(;]+\\)\\([ \t\n]*([^()]*)[ \t\n]*\\)?[ \t\n]*)")
   (make-local-variable 'comment-indent-function)
   (setq comment-indent-function 'cperl-comment-indent)
   (make-local-variable 'parse-sexp-ignore-comments)