[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117909: * lisp/progmodes/perl-mode.el (perl-syntax-
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r117909: * lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): |
Date: |
Sun, 21 Sep 2014 22:00:34 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117909
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18502
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2014-09-21 18:00:28 -0400
message:
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function):
Accept underscores in identifiers after "sub".
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/progmodes/perl-mode.el perlmode.el-20091113204419-o5vbwnq5f7feedwu-402
test/indent/perl.perl perl.perl-20121031024456-cjjxr53eeyg5rvml-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-09-21 09:34:02 +0000
+++ b/lisp/ChangeLog 2014-09-21 22:00:28 +0000
@@ -1,3 +1,8 @@
+2014-09-21 Stefan Monnier <address@hidden>
+
+ * progmodes/perl-mode.el (perl-syntax-propertize-function):
+ Accept underscores in identifiers after "sub" (bug#18502).
+
2014-09-21 Tassilo Horn <address@hidden>
* textmodes/reftex-sel.el (reftex-select-label-mode)
@@ -6491,7 +6496,7 @@
COMMAND-alternatives variable, assign COMMAND as its definition
name so that `describe-variable' can relocate it.
-2014-01-14 Matthew Leach <address@hidden> (tiny change)
+2014-01-14 Matthew Leach <address@hidden>
* font-lock.el (font-lock-keywords): Fix typo in docstring
(bug#16307).
=== modified file 'lisp/progmodes/perl-mode.el'
--- a/lisp/progmodes/perl-mode.el 2014-07-08 16:51:35 +0000
+++ b/lisp/progmodes/perl-mode.el 2014-09-21 22:00:28 +0000
@@ -254,7 +254,7 @@
(1 (prog1 "\"" (perl-syntax-propertize-special-constructs end))))
;; Funny things in `sub' arg-specs like `sub myfun ($)' or `sub ($)'.
;; Be careful not to match "sub { (...) ... }".
-
("\\<sub\\(?:[[:space:]]+[^{}[:punct:][:space:]]+\\)?[[:space:]]*(\\([^)]+\\))"
+ ("\\<sub\\(?:[\s\t\n]+\\(?:\\sw\\|\\s_\\)+\\)?[\s\t\n]*(\\([^)]+\\))"
(1 "."))
;; Turn __DATA__ trailer into a comment.
("^\\(_\\)_\\(?:DATA\\|END\\)__[
\t]*\\(?:\\(\n\\)#.-\\*-.*perl.*-\\*-\\|\n.*\\)"
=== modified file 'test/indent/perl.perl'
--- a/test/indent/perl.perl 2014-07-08 16:51:35 +0000
+++ b/test/indent/perl.perl 2014-09-21 22:00:28 +0000
@@ -1,6 +1,10 @@
#!/usr/bin/perl
# -*- eval: (bug-reference-mode 1) -*-
+sub add_funds($) {
+ return 0;
+}
+
use v5.14;
my $str= <<END;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117909: * lisp/progmodes/perl-mode.el (perl-syntax-propertize-function):,
Stefan Monnier <=