Merge from origin/emacs-25

[gnu-emacs] / test / manual / etags / ETAGS.good_1

diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1
index d2550863428add2c1f15f16df08dbe940f5f8e69..58661bbf600b839531b9cb73cbaa734098ad596e 100644 (file)
--- a/test/manual/etags/ETAGS.good_1
+++ b/test/manual/etags/ETAGS.good_1
@@ -2665,7 +2665,7 @@ define("TEST"\7fTEST\ 11,0
 test \7f4,26
 foo(\7f16,200
 \f
-perl-src/htlmify-cystic,1443
+perl-src/htlmify-cystic,1197
 my @section_name;\7fsection_name\ 112,236
 my @appendix_name;\7fappendix_name\ 113,254
 my @section_toc;\7fsection_toc\ 115,274
@@ -2683,7 +2683,7 @@ my $output_file;\7foutput_file\ 135,556
 my $line;\7fline\ 137,574
 my $subsection_marker;\7fsubsection_marker\ 1161,3883
 my $new;\7fnew\ 1163,3907
-sub read_toc \7fmain::read_toc\ 1165,3917
+sub read_toc \7f165,3917
          my $entry \7fentry\ 1218,5621
          my $entry \7fentry\ 1234,6077
              my $entry \7fentry\ 1245,6351
@@ -2692,38 +2692,38 @@ sub read_toc \7fmain::read_toc\ 1165,3917
              my $entry \7fentry\ 1276,7204
          my $entry \7fentry\ 1281,7328
       my $entry \7fentry\ 1296,7698
-sub finish_subsubsections \7fmain::finish_subsubsections\ 1302,7805
-sub finish_subsections \7fmain::finish_subsections\ 1309,7987
-sub finish_sections \7fmain::finish_sections\ 1320,8310
-sub finish_appendices \7fmain::finish_appendices\ 1331,8599
-sub section_url_base \7fmain::section_url_base\ 1337,8724
-sub section_url_name \7fmain::section_url_name\ 1342,8922
-sub section_url \7fmain::section_url\ 1355,9284
+sub finish_subsubsections \7f302,7805
+sub finish_subsections \7f309,7987
+sub finish_sections \7f320,8310
+sub finish_appendices \7f331,8599
+sub section_url_base \7f337,8724
+sub section_url_name \7f342,8922
+sub section_url \7f355,9284
   my $name \7fname\ 1357,9336
-sub section_href \7fmain::section_href\ 1364,9452
-sub section_name \7fmain::section_name\ 1368,9551
-sub toc_line \7fmain::toc_line\ 1372,9655
-sub file_end \7fmain::file_end\ 1375,9750
+sub section_href \7f364,9452
+sub section_name \7f368,9551
+sub toc_line \7f372,9655
+sub file_end \7f375,9750
 \f
-perl-src/yagrip.pl,258
-sub getopt \7fmain::getopt\ 17,156
+perl-src/yagrip.pl,233
+sub getopt \7f7,156
        local($_,$flag,$opt,$f,$r,@temp)\7f($_,$flag,$opt,$f,$r,@temp\ 18,169
-sub usage \7fmain::usage\ 138,856
+sub usage \7f38,856
        local($prog,$_,@list)\7f($prog,$_,@list\ 139,868
        local($string,$flag,@string,@temp,@last)\7f($string,$flag,@string,@temp,@last\ 140,897
 \f
-perl-src/kai-test.pl,244
-sub f1 \7fmain::f1\ 12,16
-sub main::f2 \7f6,50
+perl-src/kai-test.pl,203
+sub f1 \7f2,16
+sub main::f2 \7ff2\ 16,50
 package Foo;\7f10,90
-sub f3 \7fFoo::f3\ 112,104
-sub Bar::f4 \7f16,138
+sub f3 \7f12,104
+sub Bar::f4 \7ff4\ 116,138
 package Bar;\7f20,177
-sub f5 \7fBar::f5\ 122,191
+sub f5 \7f22,191
 package Foo::Bar;\7f26,225
-sub f6 \7fFoo::Bar::f6\ 128,244
+sub f6 \7f28,244
 package main;\7f32,278
-sub f7 \7fmain::f7\ 134,293
+sub f7 \7f34,293
 \f
 ps-src/rfc1245.ps,2478
 /FMversion \7f12,311