Commit 062e286b authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): Handle $'

used as a variable.

Fixes: debbugs:17174
parent 8a7fd442
2014-04-03 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/perl-mode.el (perl-syntax-propertize-function): Handle $'
used as a variable (bug#17174).
2014-04-02 Stefan Monnier <monnier@iro.umontreal.ca> 2014-04-02 Stefan Monnier <monnier@iro.umontreal.ca>
   
* progmodes/perl-mode.el (perl-indent-new-calculate): * progmodes/perl-mode.el (perl-indent-new-calculate):
......
...@@ -250,7 +250,11 @@ ...@@ -250,7 +250,11 @@
;; Catch ${ so that ${var} doesn't screw up indentation. ;; Catch ${ so that ${var} doesn't screw up indentation.
;; This also catches $' to handle 'foo$', although it should really ;; This also catches $' to handle 'foo$', although it should really
;; check that it occurs inside a '..' string. ;; check that it occurs inside a '..' string.
("\\(\\$\\)[{']" (1 ". p")) ("\\(\\$\\)[{']" (1 (unless (and (eq ?\' (char-after (match-end 1)))
(save-excursion
(not (nth 3 (syntax-ppss
(match-beginning 0))))))
(string-to-syntax ". p"))))
;; Handle funny names like $DB'stop. ;; Handle funny names like $DB'stop.
("\\$ ?{?^?[_[:alpha:]][_[:alnum:]]*\\('\\)[_[:alpha:]]" (1 "_")) ("\\$ ?{?^?[_[:alpha:]][_[:alnum:]]*\\('\\)[_[:alpha:]]" (1 "_"))
;; format statements ;; format statements
......
...@@ -4231,7 +4231,7 @@ ...@@ -4231,7 +4231,7 @@
* frame.c (delete_frame): Block/unblock input to overcome race * frame.c (delete_frame): Block/unblock input to overcome race
condition (Bug#15475). condition (Bug#15475).
2013-09-29 Andreas Politz <politza@hochschule-trier.de> (tiny change) 2013-09-29 Andreas Politz <politza@hochschule-trier.de>
* frame.c (delete_frame): Record selected frame only after * frame.c (delete_frame): Record selected frame only after
calling Qdelete_frame_functions (Bug#15477). calling Qdelete_frame_functions (Bug#15477).
......
...@@ -16,5 +16,9 @@ ...@@ -16,5 +16,9 @@
bar bar
EOF2 EOF2
print $'; # This should not start a string!
print "hello" for /./;
$fileType_filesButNot # bug#12373? $fileType_filesButNot # bug#12373?
= join( '|', map { quotemeta($_).'$' } @{$fileType->{filesButNot}} ); = join( '|', map { quotemeta($_).'$' } @{$fileType->{filesButNot}} );
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment