aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2011-09-27 22:19:56 -0400
committerStefan Monnier2011-09-27 22:19:56 -0400
commita5daf810f38ce0d4f08ea6a38f55f7f50651305f (patch)
tree448d44f3a9c63ba41e5c42b2ea7a6f1fd18cbf7e
parenta8406c20c43b156a6af9b51ebfa75ba085ba396d (diff)
downloademacs-a5daf810f38ce0d4f08ea6a38f55f7f50651305f.tar.gz
emacs-a5daf810f38ce0d4f08ea6a38f55f7f50651305f.zip
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function):
Don't confuse "y => 3" as the beginning of a `y' operation.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/perl-mode.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eaea2b33204..f83dbdd344a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-09-28 Stefan Monnier <monnier@iro.umontreal.ca> 12011-09-28 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * progmodes/perl-mode.el (perl-syntax-propertize-function):
4 Don't confuse "y => 3" as the beginning of a `y' operation.
5
3 * emacs-lisp/debug.el (debug-convert-byte-code): Don't assume the 6 * emacs-lisp/debug.el (debug-convert-byte-code): Don't assume the
4 object has more than 4 slots (bug#9613). 7 object has more than 4 slots (bug#9613).
5 8
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 8ca8c690f92..933f004bb5d 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -304,11 +304,12 @@ The expansion is entirely correct because it uses the C preprocessor."
304 (put-text-property (match-beginning 2) (match-end 2) 304 (put-text-property (match-beginning 2) (match-end 2)
305 'syntax-table (string-to-syntax "\"")) 305 'syntax-table (string-to-syntax "\""))
306 (perl-syntax-propertize-special-constructs end))))) 306 (perl-syntax-propertize-special-constructs end)))))
307 ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\([^])}> \n\t]\\)" 307 ("\\(^\\|[?:.,;=!~({[ \t]\\)\\([msy]\\|q[qxrw]?\\|tr\\)\\>\\s-*\\(?:\\([^])}>= \n\t]\\)\\|\\(?3:=\\)[^>]\\)"
308 ;; Nasty cases: 308 ;; Nasty cases:
309 ;; /foo/m $a->m $#m $m @m %m 309 ;; /foo/m $a->m $#m $m @m %m
310 ;; \s (appears often in regexps). 310 ;; \s (appears often in regexps).
311 ;; -s file 311 ;; -s file
312 ;; y => 3
312 ;; sub tr {...} 313 ;; sub tr {...}
313 (3 (ignore 314 (3 (ignore
314 (if (save-excursion (goto-char (match-beginning 0)) 315 (if (save-excursion (goto-char (match-beginning 0))