aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark A. Hershberger2004-07-09 15:03:07 +0000
committerMark A. Hershberger2004-07-09 15:03:07 +0000
commitae04ab88fd2d133eb390e90ea127f985713f714a (patch)
tree75dab9d434f4c6ad5ae9ed279f456331cf413f84
parent6d12a4dfbcb5680fafac89769e1a2f111fdcc587 (diff)
downloademacs-ae04ab88fd2d133eb390e90ea127f985713f714a.tar.gz
emacs-ae04ab88fd2d133eb390e90ea127f985713f714a.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/cperl-mode.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c8dc99040f..0f143ca1c0e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12004-07-09 Mark A. Hershberger <mah@everybody.org> 12004-07-09 Mark A. Hershberger <mah@everybody.org>
2 2
3 * progmodes/cperl-mode.el (cperl-mode): Adapt defun-prompt-regexp
4 so that it is more understanding of whitespace.
5
3 * xml.el (xml-maybe-do-ns, xml-parse-tag): Produce elements in the 6 * xml.el (xml-maybe-do-ns, xml-parse-tag): Produce elements in the
4 form 7 form
5 (("ns" . "element") (attr-list) children) instead of 8 (("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',
1472 (make-local-variable 'comment-start-skip) 1472 (make-local-variable 'comment-start-skip)
1473 (setq comment-start-skip "#+ *") 1473 (setq comment-start-skip "#+ *")
1474 (make-local-variable 'defun-prompt-regexp) 1474 (make-local-variable 'defun-prompt-regexp)
1475 (setq defun-prompt-regexp "^[ \t]*sub[ \t]+\\([^ \t\n{(;]+\\)\\([ \t]*([^()]*)[ \t]*\\)?[ \t]*") 1475 (setq defun-prompt-regexp "^[ \t]*sub[ \t\n]+\\([^ \t\n{(;]+\\)\\([ \t\n]*([^()]*)[ \t\n]*\\)?[ \t\n]*)")
1476 (make-local-variable 'comment-indent-function) 1476 (make-local-variable 'comment-indent-function)
1477 (setq comment-indent-function 'cperl-comment-indent) 1477 (setq comment-indent-function 'cperl-comment-indent)
1478 (make-local-variable 'parse-sexp-ignore-comments) 1478 (make-local-variable 'parse-sexp-ignore-comments)