aboutsummaryrefslogtreecommitdiffstats
path: root/test/indent
diff options
context:
space:
mode:
authorGlenn Morris2014-05-11 23:59:30 -0700
committerGlenn Morris2014-05-11 23:59:30 -0700
commitbbbabffe06d4c763534d5be92844c48a3f8746e2 (patch)
treea6fffb13638948223f3142e5209cbce57282fbbd /test/indent
parentffd6d9c4d321e93e301f9cafd1fe054389898978 (diff)
parent96b894717caa773aa6d98ff57385f1c7537e8972 (diff)
downloademacs-bbbabffe06d4c763534d5be92844c48a3f8746e2.tar.gz
emacs-bbbabffe06d4c763534d5be92844c48a3f8746e2.zip
Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org
Diffstat (limited to 'test/indent')
-rwxr-xr-xtest/indent/perl.perl11
-rw-r--r--test/indent/ruby.rb3
2 files changed, 14 insertions, 0 deletions
diff --git a/test/indent/perl.perl b/test/indent/perl.perl
index 0bfcc98356b..34cd4af1125 100755
--- a/test/indent/perl.perl
+++ b/test/indent/perl.perl
@@ -1,6 +1,17 @@
1#!/usr/bin/perl 1#!/usr/bin/perl
2# -*- eval: (bug-reference-mode 1) -*- 2# -*- eval: (bug-reference-mode 1) -*-
3 3
4use v5.14;
5
6my $str= <<END;
7Hello
8END
9
10my $a = $';
11
12my $b=3;
13
14print $str;
4if ($c && /====/){xyz;} 15if ($c && /====/){xyz;}
5 16
6print "a" . <<EOF . s/he"llo/th'ere/; 17print "a" . <<EOF . s/he"llo/th'ere/;
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index fb341ee7ba6..7e778798996 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -16,6 +16,9 @@ d = %(hello (nested) world)
16# Don't propertize percent literals inside strings. 16# Don't propertize percent literals inside strings.
17"(%s, %s)" % [123, 456] 17"(%s, %s)" % [123, 456]
18 18
19"abc/#{def}ghi"
20"abc\#{def}ghi"
21
19# Or inside comments. 22# Or inside comments.
20x = # "tot %q/to"; = 23x = # "tot %q/to"; =
21 y = 2 / 3 24 y = 2 / 3