[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117010: * lisp/progmodes/perl-mode.el (perl-synt
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs-24 r117010: * lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): Slash after |
Date: |
Wed, 23 Apr 2014 01:56:41 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117010
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17317
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-04-22 21:56:18 -0400
message:
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): Slash after
&, |, +, - and * can't be a division.
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-04-22 20:35:33 +0000
+++ b/lisp/ChangeLog 2014-04-23 01:56:18 +0000
@@ -1,3 +1,8 @@
+2014-04-23 Stefan Monnier <address@hidden>
+
+ * progmodes/perl-mode.el (perl-syntax-propertize-function): Slash after
+ &, |, +, - and * can't be a division (bug#17317).
+
2014-04-22 Stefan Monnier <address@hidden>
* term/xterm.el (xterm--version-handler): Don't use modern xterm
=== modified file 'lisp/progmodes/perl-mode.el'
--- a/lisp/progmodes/perl-mode.el 2014-04-16 14:13:06 +0000
+++ b/lisp/progmodes/perl-mode.el 2014-04-23 01:56:18 +0000
@@ -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
=== modified file 'test/indent/perl.perl'
--- a/test/indent/perl.perl 2014-04-03 00:41:09 +0000
+++ b/test/indent/perl.perl 2014-04-23 01:56:18 +0000
@@ -1,6 +1,8 @@
#!/usr/bin/perl
# -*- eval: (bug-reference-mode 1) -*-
+if ($c && /====/){xyz;}
+
print <<"EOF1" . s/he"llo/th'ere/;
foo
EOF2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117010: * lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): Slash after,
Stefan Monnier <=