aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorPaul Eggert2011-09-28 13:07:17 -0700
committerPaul Eggert2011-09-28 13:07:17 -0700
commitb13f71e2dda86836dc7dea90b385b3791f8ebd01 (patch)
treed15fcbcfb6b94693c2db439828e7daa4e07fe0fc /lisp/progmodes
parent7b09a37a895ab2d428d1ab0786aa262ef82efba2 (diff)
parente1504b9b0b2fdcf757c29dcc65ffe8b670cc7604 (diff)
downloademacs-b13f71e2dda86836dc7dea90b385b3791f8ebd01.tar.gz
emacs-b13f71e2dda86836dc7dea90b385b3791f8ebd01.zip
Merge from trunk.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/perl-mode.el3
1 files changed, 2 insertions, 1 deletions
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))