* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): Slash after

&, |, +, - and * can't be a division.

Fixes: debbugs:17317

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b76d3c4a194afde5d87594296ab956a6d756e301..f3c94c1818d7485cfce45da2d448b3767c39fc12 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/perl-mode.el (perl-syntax-propertize-function): Slash after
+       &, |, +, - and * can't be a division (bug#17317).
+
 2014-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * term/xterm.el (xterm--version-handler): Don't use modern xterm

diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index f89fec7b1e0d9495d4e774e7b8118a670d80dd11..ef372a34fdb11a6dd153b71e0f2664d3a778c820 100644 (file)
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -281,7 +281,7 @@
       ((concat "\\(?:\\(?:^\\|[^$@&%[:word:]]\\)"
                (regexp-opt '("split" "if" "unless" "until" "while" "split"
                              "grep" "map" "not" "or" "and" "for" "foreach"))
-               "\\|[?:.,;=!~({[]\\|\\(^\\)\\)[ \t\n]*\\(/\\)")
+               "\\|[-?:.,;|&+*=!~({[]\\|\\(^\\)\\)[ \t\n]*\\(/\\)")
        (2 (ignore
            (if (and (match-end 1)       ; / at BOL.
                     (save-excursion

diff --git a/test/indent/perl.perl b/test/indent/perl.perl
index 7cb877b0a95d64d80f567f9d7b60df17c599c289..c7a2fbfb2d20b15ee1be3075e03e5d7816c924c7 100755 (executable)
--- a/test/indent/perl.perl
+++ b/test/indent/perl.perl
@@ -1,6 +1,8 @@
 #!/usr/bin/perl
 # -*- eval: (bug-reference-mode 1) -*-
 
+if ($c && /====/){xyz;}
+
 print <<"EOF1" . s/he"llo/th'ere/;
 foo
 EOF2