diff options
author | John Wiegley <johnw@newartisans.com> | 2016-03-11 13:33:32 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2016-03-11 13:33:32 -0800 |
commit | 63efcc268635dea78c6bd80749eae4ee2c72d717 (patch) | |
tree | 888b43de0eb148cf46a129a15f08a80caa8a5dfe /test/manual/etags/ETAGS.good_5 | |
parent | b4fbd69b66a927ad8ff479bee6ca57e977d7e649 (diff) | |
parent | facb5e20ce186e47506860bde982e35020fedce5 (diff) | |
download | emacs-63efcc268635dea78c6bd80749eae4ee2c72d717.tar.gz |
Merge from origin/emacs-25
facb5e2 Update Emacs manual section related to character folding
4efea8e ; * etc/DEBUG: Fix a typo. (Bug#22984)
f8df21b Update admin/notes/unicode
950be68 Add symref-filepattern entries for c?perl-mode
8b8a6ad Don't use XRANDR 1.3 extensions if the server doesn't support them.
985dacf ; NEWS update for the last change in etags
741a6f8 Sync with gnulib
7352c6c Rework C source files to avoid ^(
a589e9a By default, etags produces unqualified Perl tag names
72c7438 Indent methods with keyword names correctly
28532a9 Propertize character literals and special global variables
differently
a7d6f39 ; Fix last change in NEWS
83b2a20 Change how /etc/NEWS presents character folding
b417c5a Revert "Revert "Backport: * lisp/isearch.el: Turn char-folding
off by default""
711ca36 Properly handle lambda as read function (bug 22961)
1b9d616 Propertize operator symbol names with symbol syntax class
9b16bc2 Stop recognizing :#{} as symbol in ruby-mode
366ec77 Allow using the left shift operator without spaces on both sides
02bf7cc Properly handle unquoting in wdired (bug 22938)
16cf469 ; Spelling fix and tighten up comment
f50bc04 Allow splat operator before percent literal
991c801 Don't apply the return value of goto-char as syntax class
6e63b3e Guard against nested percent literals
066f3bc Recognize iuwu-mod after an escaped newline
6f7a57c Fix symbolic mode string conversion for s and t
50b9826 Update 'ucs-names' database
993b2fb Improve doc string of 'shell-command'
b71c717 Make the code in movemail_strftime more general
cc057e4 Speed up redisplay of binary files with long series of nulls
e51b27e Remove the highlighting support for quoting 'like this' inside
Lisp docstrings
b1abce1 Restore leading space in movemail pop output
98b8d44 Fix bidi-paragraph-direction in Rmail view buffer
dc9d837 Don't misindent computed property generator methods
7923112 Fix mbox files produced by movemail on MS-Windows
c45a1ca doc string file descriptor exhaustion fix
265141b Fix Bug#22814
Diffstat (limited to 'test/manual/etags/ETAGS.good_5')
-rw-r--r-- | test/manual/etags/ETAGS.good_5 | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5 index 9e3b258eabc..98de4f2c2fb 100644 --- a/test/manual/etags/ETAGS.good_5 +++ b/test/manual/etags/ETAGS.good_5 @@ -3746,7 +3746,7 @@ test 4,26 var $test12,176 foo(16,200 -perl-src/htlmify-cystic,1443 +perl-src/htlmify-cystic,1197 my @section_name;section_name12,236 my @appendix_name;appendix_name13,254 my @section_toc;section_toc15,274 @@ -3764,7 +3764,7 @@ my $output_file;output_file35,556 my $line;line37,574 my $subsection_marker;subsection_marker161,3883 my $new;new163,3907 -sub read_toc main::read_toc165,3917 +sub read_toc 165,3917 my $entry entry218,5621 my $entry entry234,6077 my $entry entry245,6351 @@ -3773,38 +3773,38 @@ sub read_toc main::read_toc165,3917 my $entry entry276,7204 my $entry entry281,7328 my $entry entry296,7698 -sub finish_subsubsections main::finish_subsubsections302,7805 -sub finish_subsections main::finish_subsections309,7987 -sub finish_sections main::finish_sections320,8310 -sub finish_appendices main::finish_appendices331,8599 -sub section_url_base main::section_url_base337,8724 -sub section_url_name main::section_url_name342,8922 -sub section_url main::section_url355,9284 +sub finish_subsubsections 302,7805 +sub finish_subsections 309,7987 +sub finish_sections 320,8310 +sub finish_appendices 331,8599 +sub section_url_base 337,8724 +sub section_url_name 342,8922 +sub section_url 355,9284 my $name name357,9336 -sub section_href main::section_href364,9452 -sub section_name main::section_name368,9551 -sub toc_line main::toc_line372,9655 -sub file_end main::file_end375,9750 +sub section_href 364,9452 +sub section_name 368,9551 +sub toc_line 372,9655 +sub file_end 375,9750 -perl-src/yagrip.pl,258 -sub getopt main::getopt7,156 +perl-src/yagrip.pl,233 +sub getopt 7,156 local($_,$flag,$opt,$f,$r,@temp)($_,$flag,$opt,$f,$r,@temp8,169 -sub usage main::usage38,856 +sub usage 38,856 local($prog,$_,@list)($prog,$_,@list39,868 local($string,$flag,@string,@temp,@last)($string,$flag,@string,@temp,@last40,897 -perl-src/kai-test.pl,244 -sub f1 main::f12,16 -sub main::f2 6,50 +perl-src/kai-test.pl,203 +sub f1 2,16 +sub main::f2 f26,50 package Foo;10,90 -sub f3 Foo::f312,104 -sub Bar::f4 16,138 +sub f3 12,104 +sub Bar::f4 f416,138 package Bar;20,177 -sub f5 Bar::f522,191 +sub f5 22,191 package Foo::Bar;26,225 -sub f6 Foo::Bar::f628,244 +sub f6 28,244 package main;32,278 -sub f7 main::f734,293 +sub f7 34,293 ps-src/rfc1245.ps,2478 /FMversion 12,311 |