diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/perl-mode.el | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c5d8bfae7a7..4cb8061e71e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-11-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/perl-mode.el (perl-syntax-propertize-function): + Handle __DATA__ and __END__. + 2010-11-02 Noah Friedman <friedman@splode.com> * emacs-lisp/bytecomp.el (byte-recompile-file): If bytecomp-arg is diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index ae3acc3cda3..1bc9a397bc7 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -274,6 +274,11 @@ The expansion is entirely correct because it uses the C preprocessor." ;; Be careful not to match "sub { (...) ... }". ("\\<sub\\(?:[[:space:]]+[^{}[:punct:][:space:]]+\\)?[[:space:]]*(\\([^)]+\\))" (1 ".")) + ;; Turn __DATA__ trailer into a comment. + ("^\\(_\\)_\\(?:DATA\\|END\\)__[ \t]*\\(?:\\(\n\\)#.-\\*-.*perl.*-\\*-\\|\n.*\\)" + (1 "< c") (2 "> c") + (0 (ignore (put-text-property (match-beginning 0) (match-end 0) + 'syntax-multiline t)))) ;; Regexp and funny quotes. Distinguishing a / that starts a regexp ;; match from the division operator is ...interesting. ;; Basically, / is a regexp match if it's preceded by an infix operator |