Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
062e286b
Commit
062e286b
authored
Apr 02, 2014
by
Stefan Monnier
Browse files
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): Handle $'
used as a variable. Fixes: debbugs:17174
parent
8a7fd442
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
2 deletions
+15
-2
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/progmodes/perl-mode.el
lisp/progmodes/perl-mode.el
+5
-1
src/ChangeLog
src/ChangeLog
+1
-1
test/indent/perl.perl
test/indent/perl.perl
+4
-0
No files found.
lisp/ChangeLog
View file @
062e286b
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>
* progmodes/perl-mode.el (perl-indent-new-calculate):
...
...
lisp/progmodes/perl-mode.el
View file @
062e286b
...
...
@@ -250,7 +250,11 @@
;; Catch ${ so that ${var} doesn't screw up indentation.
;; This also catches $' to handle 'foo$', although it should really
;; 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.
(
"\\$ ?{?^?[_[:alpha:]][_[:alnum:]]*\\('\\)[_[:alpha:]]"
(
1
"_"
))
;; format statements
...
...
src/ChangeLog
View file @
062e286b
...
...
@@ -4231,7 +4231,7 @@
* frame.c (delete_frame): Block/unblock input to overcome race
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
calling Qdelete_frame_functions (Bug#15477).
...
...
test/indent/perl.perl
View file @
062e286b
...
...
@@ -16,5 +16,9 @@
bar
EOF2
print
$'
;
# This should not start a string!
print
"
hello
"
for
/./
;
$fileType_filesButNot
# bug#12373?
=
join
(
'
|
',
map
{
quotemeta
(
$_
)
.
'
$
'
}
@
{
$fileType
->
{
filesButNot
}}
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment