From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 23 Apr 2014 01:56:18 +0000 (-0400)
Subject: * lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): Slash after
X-Git-Tag: emacs-24.3.91~98
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c08684513a37f787a540033a6e543326c9631d37;p=emacs.git

* 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 b76d3c4a194..f3c94c1818d 100644
--- 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 f89fec7b1e0..ef372a34fdb 100644
--- 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 7cb877b0a95..c7a2fbfb2d2 100755
--- 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