From: Mark A. Hershberger Date: Fri, 9 Jul 2004 15:03:07 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: ttn-vms-21-2-B4~5523 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae04ab88fd2d133eb390e90ea127f985713f714a;p=emacs.git *** empty log message *** --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8c8dc99040f..0f143ca1c0e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2004-07-09 Mark A. Hershberger + * 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 c651e06b899..e679a48d642 100644 --- 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)