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

12 files changed, 187 insertions, 150 deletions

diff --git a/test/lisp/progmodes/ruby-mode-tests.el b/test/lisp/progmodes/ruby-mode-tests.el
index da8d77c5157..4fa7470218a 100644
--- a/test/lisp/progmodes/ruby-mode-tests.el
+++ b/test/lisp/progmodes/ruby-mode-tests.el
@@ -91,6 +91,15 @@ VALUES-PLIST is a list with alternating index and value elements."
 (ert-deftest ruby-no-heredoc-inside-quotes ()
   (ruby-assert-state "\"<<\", \"\",\nfoo" 3 nil))
 
+(ert-deftest ruby-no-heredoc-left-shift ()
+  ;; We can't really detect the left shift operator (like in similar
+  ;; cases, it depends on the type of foo), so we just require for <<
+  ;; to be preceded by a character from a known set.
+  (ruby-assert-state "foo(a<<b)" 3 nil))
+
+(ert-deftest ruby-no-heredoc-class-self ()
+  (ruby-assert-state "class <<self\nend" 3 nil))
+
 (ert-deftest ruby-exit!-font-lock ()
   (ruby-assert-face "exit!" 5 font-lock-builtin-face))
 
@@ -461,6 +470,14 @@ VALUES-PLIST is a list with alternating index and value elements."
   (ruby-assert-face "%S{foo}" 4 nil)
   (ruby-assert-face "%R{foo}" 4 nil))
 
+(ert-deftest ruby-no-nested-percent-literals ()
+  (ruby-with-temp-buffer "a = %w[b %()]"
+    (syntax-propertize (point))
+    (should (null (nth 8 (syntax-ppss))))
+    (should (eq t (nth 3 (syntax-ppss (1- (point-max))))))
+    (search-backward "[")
+    (should (eq t (nth 3 (syntax-ppss))))))
+
 (ert-deftest ruby-add-log-current-method-examples ()
   (let ((pairs '(("foo" . "#foo")
                  ("C.foo" . ".foo")
diff --git a/test/manual/etags/CTAGS.good b/test/manual/etags/CTAGS.good
index ebde715272a..19bc0bef657 100644
--- a/test/manual/etags/CTAGS.good
+++ b/test/manual/etags/CTAGS.good
@@ -305,8 +305,6 @@ BUFFER_OBJFWDP	c-src/emacs/src/lisp.h	/^BUFFER_OBJFWDP (union Lisp_Fwd *a)$/
 BYTE_MARK_STACK c-src/emacs/src/lisp.h  3181
 Bar     lua-src/test.lua        /^function Square.something:Bar ()$/
 Bar     perl-src/kai-test.pl    /^package Bar;$/
-Bar::f4 perl-src/kai-test.pl    /^sub Bar::f4 {$/
-Bar::f5 perl-src/kai-test.pl    /^sub f5 {$/
 Barrier_Function_Pointer/t      ada-src/etags-test-for.ada      /^   type Barrier_Function_Pointer is access$/
 Bidule/b        ada-src/etags-test-for.ada      /^  protected body Bidule is$/
 Bidule/b        ada-src/waroquiers.ada  /^  protected body Bidule is$/
@@ -614,8 +612,6 @@ Finalize_TAS_Cell/p	ada-src/2ataspri.ads	/^   procedure Finalize_TAS_Cell   (Cel
 First100Chars   pas-src/common.pas      /^procedure First100Chars; (*($/
 Foo     perl-src/kai-test.pl    /^package Foo;$/
 Foo::Bar        perl-src/kai-test.pl    /^package Foo::Bar;$/
-Foo::Bar::f6    perl-src/kai-test.pl    /^sub f6 {$/
-Foo::f3 perl-src/kai-test.pl    /^sub f3 {$/
 Forth_help      c-src/etags.c   573
 Forth_suffixes  c-src/etags.c   571
 Forth_words     c-src/etags.c   /^Forth_words (FILE *inf)$/
@@ -2931,7 +2927,14 @@ f	cp-src/c.C	/^     void f() {}$/
 f       cp-src/fail.C   /^              int f() { return 5; }$/
 f       cp-src/fail.C   /^int A::B::f() { return 2; }$/
 f1      c.c     /^     f1 () { \/* Do something. *\/; }$/
+f1      perl-src/kai-test.pl    /^sub f1 {$/
 f2      c.c     /^void f2 () { \/* Do something. *\/; }$/
+f2      perl-src/kai-test.pl    /^sub main::f2 {$/
+f3      perl-src/kai-test.pl    /^sub f3 {$/
+f4      perl-src/kai-test.pl    /^sub Bar::f4 {$/
+f5      perl-src/kai-test.pl    /^sub f5 {$/
+f6      perl-src/kai-test.pl    /^sub f6 {$/
+f7      perl-src/kai-test.pl    /^sub f7 {$/
 fast_string_match_ignore_case   c-src/emacs/src/lisp.h  /^fast_string_match_ignore_case (Lisp_Object regexp,/
 fastctags       make-src/Makefile       /^fastctags:$/
 fastetags       make-src/Makefile       /^fastetags:$/
@@ -2952,6 +2955,7 @@ fignore	c-src/etags.c	2416
 file-of-tag     el-src/emacs/lisp/progmodes/etags.el    /^(defun file-of-tag (&optional relative)$/
 file-of-tag-function    el-src/emacs/lisp/progmodes/etags.el    /^(defvar file-of-tag-function nil$/
 fileJoin        php-src/lce_functions.php       /^  function fileJoin()$/
+file_end        perl-src/htlmify-cystic /^sub file_end ()$/
 file_index      perl-src/htlmify-cystic 33
 file_tocs       perl-src/htlmify-cystic 30
 filename_is_absolute    c-src/etags.c   /^filename_is_absolute (char *fn)$/
@@ -2978,6 +2982,10 @@ find-tag-tag-order	el-src/emacs/lisp/progmodes/etags.el	/^(defvar find-tag-tag-o
 find_entries    c-src/etags.c   /^find_entries (FILE *inf)$/
 find_user_signal_name   c-src/emacs/src/keyboard.c      /^find_user_signal_name (int sig)$/
 findcats        prol-src/natded.prolog  /^findcats([],Left,Left).$/
+finish_appendices       perl-src/htlmify-cystic /^sub finish_appendices ()$/
+finish_sections perl-src/htlmify-cystic /^sub finish_sections ()$/
+finish_subsections      perl-src/htlmify-cystic /^sub finish_subsections ()$/
+finish_subsubsections   perl-src/htlmify-cystic /^sub finish_subsubsections ()$/
 finlist c-src/etags.c   2414
 first   c-src/emacs/src/gmalloc.c       151
 fitchtreelist   prol-src/natded.prolog  /^fitchtreelist([]).$/
@@ -3085,6 +3093,7 @@ get_layer_by_name	lua-src/allegro.lua	/^local function get_layer_by_name (sprite
 get_tag c-src/etags.c   /^get_tag (register char *bp, char **namepp)$/
 get_word        c-src/tab.c     /^static char           *get_word(char **str, char delim)$/
 getcjmp c-src/emacs/src/keyboard.c      147
+getopt  perl-src/yagrip.pl      /^sub getopt {$/
 getopt.o        make-src/Makefile       /^getopt.o: emacs\/lib-src\/getopt.c$/
 getopt1.o       make-src/Makefile       /^getopt1.o: emacs\/lib-src\/getopt1.c$/
 getptys objc-src/Subprocess.m   /^getptys (int *master, int *slave)$/
@@ -3419,23 +3428,6 @@ mach_reply_port	c-src/machsyscalls.h	/^SYSCALL (mach_reply_port, -26,$/
 mach_task_self  c-src/machsyscalls.h    /^SYSCALL (mach_task_self, -28,$/
 mach_thread_self        c-src/machsyscalls.h    /^SYSCALL (mach_thread_self, -27,$/
 magic   c-src/emacs/src/gmalloc.c       1863
-main::f1        perl-src/kai-test.pl    /^sub f1 {$/
-main::f2        perl-src/kai-test.pl    /^sub main::f2 {$/
-main::f7        perl-src/kai-test.pl    /^sub f7 {$/
-main::file_end  perl-src/htlmify-cystic /^sub file_end ()$/
-main::finish_appendices perl-src/htlmify-cystic /^sub finish_appendices ()$/
-main::finish_sections   perl-src/htlmify-cystic /^sub finish_sections ()$/
-main::finish_subsections        perl-src/htlmify-cystic /^sub finish_subsections ()$/
-main::finish_subsubsections     perl-src/htlmify-cystic /^sub finish_subsubsections ()$/
-main::getopt    perl-src/yagrip.pl      /^sub getopt {$/
-main::read_toc  perl-src/htlmify-cystic /^sub read_toc ()$/
-main::section_href      perl-src/htlmify-cystic /^sub section_href ($)$/
-main::section_name      perl-src/htlmify-cystic /^sub section_name ($)$/
-main::section_url       perl-src/htlmify-cystic /^sub section_url ()$/
-main::section_url_base  perl-src/htlmify-cystic /^sub section_url_base ()$/
-main::section_url_name  perl-src/htlmify-cystic /^sub section_url_name ()$/
-main::toc_line  perl-src/htlmify-cystic /^sub toc_line ($)$/
-main::usage     perl-src/yagrip.pl      /^sub usage {$/
 maintaining.info        make-src/Makefile       /^maintaining.info: maintaining.texi$/
 make-abbrev-table       c-src/abbrev.c  /^DEFUN ("make-abbrev-table", Fmake_abbrev_table, Sm/
 make_C_tag      c-src/etags.c   /^make_C_tag (bool isfun)$/
@@ -3922,6 +3914,7 @@ read_key_sequence_cmd	c-src/emacs/src/keyboard.c	232
 read_key_sequence_remapped      c-src/emacs/src/keyboard.c      233
 read_key_sequence_vs    c-src/emacs/src/keyboard.c      /^read_key_sequence_vs (Lisp_Object prompt, Lisp_Obj/
 read_menu_command       c-src/emacs/src/keyboard.c      /^read_menu_command (void)$/
+read_toc        perl-src/htlmify-cystic /^sub read_toc ()$/
 readable_events c-src/emacs/src/keyboard.c      /^readable_events (int flags)$/
 readline        c-src/etags.c   /^readline (linebuffer *lbp, FILE *stream)$/
 readline_internal       c-src/etags.c   /^readline_internal (linebuffer *lbp, register FILE /
@@ -4027,8 +4020,13 @@ scroll_bar_parts	c-src/emacs/src/keyboard.c	5189
 sec=\relax      tex-src/texinfo.tex     /^\\let\\appendixsec=\\relax$/
 section perl-src/htlmify-cystic 25
 section=\relax  tex-src/texinfo.tex     /^\\let\\appendixsection=\\relax$/
+section_href    perl-src/htlmify-cystic /^sub section_href ($)$/
 section_name    perl-src/htlmify-cystic 12
+section_name    perl-src/htlmify-cystic /^sub section_name ($)$/
 section_toc     perl-src/htlmify-cystic 15
+section_url     perl-src/htlmify-cystic /^sub section_url ()$/
+section_url_base        perl-src/htlmify-cystic /^sub section_url_base ()$/
+section_url_name        perl-src/htlmify-cystic /^sub section_url_name ()$/
 select  prol-src/natded.prolog  /^select(X,[X|Xs],Xs).$/
 select-tags-table       el-src/emacs/lisp/progmodes/etags.el    /^(defun select-tags-table ()$/
 select-tags-table-mode  el-src/emacs/lisp/progmodes/etags.el    /^(define-derived-mode select-tags-table-mode specia/
@@ -4324,6 +4322,7 @@ timers_run	c-src/emacs/src/keyboard.c	320
 tinbody c-src/etags.c   2431
 tkeyseen        c-src/etags.c   2429
 tnone   c-src/etags.c   2428
+toc_line        perl-src/htlmify-cystic /^sub toc_line ($)$/
 toggleDescription       objc-src/PackInsp.m     /^-toggleDescription$/
 tok     c-src/etags.c   2491
 token   c-src/etags.c   2508
@@ -4396,6 +4395,7 @@ unsignedp	cccp.y	113
 unsignedp       y-src/cccp.y    112
 uprintmax_t     c-src/emacs/src/lisp.h  149
 uprintmax_t     c-src/emacs/src/lisp.h  154
+usage   perl-src/yagrip.pl      /^sub usage {$/
 usecharno       c-src/etags.c   210
 used    c-src/emacs/src/regex.h 347
 used_syntax     c-src/emacs/src/regex.h 398
diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1
index d2550863428..58661bbf600 100644
--- a/test/manual/etags/ETAGS.good_1
+++ b/test/manual/etags/ETAGS.good_1
@@ -2665,7 +2665,7 @@ define("TEST"TEST
1,0
 test 4,26
 foo(16,200
 
-perl-src/htlmify-cystic,1443
+perl-src/htlmify-cystic,1197
 my @section_name;section_name
12,236
 my @appendix_name;appendix_name
13,254
 my @section_toc;section_toc
15,274
@@ -2683,7 +2683,7 @@ my $output_file;output_file
35,556
 my $line;line
37,574
 my $subsection_marker;subsection_marker
161,3883
 my $new;new
163,3907
-sub read_toc main::read_toc
165,3917
+sub read_toc 165,3917
           my $entry entry
218,5621
           my $entry entry
234,6077
               my $entry entry
245,6351
@@ -2692,38 +2692,38 @@ sub read_toc main::read_toc
165,3917
               my $entry entry
276,7204
           my $entry entry
281,7328
       my $entry entry
296,7698
-sub finish_subsubsections main::finish_subsubsections
302,7805
-sub finish_subsections main::finish_subsections
309,7987
-sub finish_sections main::finish_sections
320,8310
-sub finish_appendices main::finish_appendices
331,8599
-sub section_url_base main::section_url_base
337,8724
-sub section_url_name main::section_url_name
342,8922
-sub section_url main::section_url
355,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 name
357,9336
-sub section_href main::section_href
364,9452
-sub section_name main::section_name
368,9551
-sub toc_line main::toc_line
372,9655
-sub file_end main::file_end
375,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::getopt
7,156
+perl-src/yagrip.pl,233
+sub getopt 7,156
         local($_,$flag,$opt,$f,$r,@temp)($_,$flag,$opt,$f,$r,@temp
8,169
-sub usage main::usage
38,856
+sub usage 38,856
         local($prog,$_,@list)($prog,$_,@list
39,868
         local($string,$flag,@string,@temp,@last)($string,$flag,@string,@temp,@last
40,897
 
-perl-src/kai-test.pl,244
-sub f1 main::f1
2,16
-sub main::f2 6,50
+perl-src/kai-test.pl,203
+sub f1 2,16
+sub main::f2 f2
6,50
 package Foo;10,90
-sub f3 Foo::f3
12,104
-sub Bar::f4 16,138
+sub f3 12,104
+sub Bar::f4 f4
16,138
 package Bar;20,177
-sub f5 Bar::f5
22,191
+sub f5 22,191
 package Foo::Bar;26,225
-sub f6 Foo::Bar::f6
28,244
+sub f6 28,244
 package main;32,278
-sub f7 main::f7
34,293
+sub f7 34,293
 
 ps-src/rfc1245.ps,2478
 /FMversion 12,311
diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2
index 9eb1d4297c8..ecfa7d19885 100644
--- a/test/manual/etags/ETAGS.good_2
+++ b/test/manual/etags/ETAGS.good_2
@@ -3235,7 +3235,7 @@ define("TEST"TEST
1,0
 test 4,26
 foo(16,200
 
-perl-src/htlmify-cystic,1443
+perl-src/htlmify-cystic,1197
 my @section_name;section_name
12,236
 my @appendix_name;appendix_name
13,254
 my @section_toc;section_toc
15,274
@@ -3253,7 +3253,7 @@ my $output_file;output_file
35,556
 my $line;line
37,574
 my $subsection_marker;subsection_marker
161,3883
 my $new;new
163,3907
-sub read_toc main::read_toc
165,3917
+sub read_toc 165,3917
           my $entry entry
218,5621
           my $entry entry
234,6077
               my $entry entry
245,6351
@@ -3262,38 +3262,38 @@ sub read_toc main::read_toc
165,3917
               my $entry entry
276,7204
           my $entry entry
281,7328
       my $entry entry
296,7698
-sub finish_subsubsections main::finish_subsubsections
302,7805
-sub finish_subsections main::finish_subsections
309,7987
-sub finish_sections main::finish_sections
320,8310
-sub finish_appendices main::finish_appendices
331,8599
-sub section_url_base main::section_url_base
337,8724
-sub section_url_name main::section_url_name
342,8922
-sub section_url main::section_url
355,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 name
357,9336
-sub section_href main::section_href
364,9452
-sub section_name main::section_name
368,9551
-sub toc_line main::toc_line
372,9655
-sub file_end main::file_end
375,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::getopt
7,156
+perl-src/yagrip.pl,233
+sub getopt 7,156
         local($_,$flag,$opt,$f,$r,@temp)($_,$flag,$opt,$f,$r,@temp
8,169
-sub usage main::usage
38,856
+sub usage 38,856
         local($prog,$_,@list)($prog,$_,@list
39,868
         local($string,$flag,@string,@temp,@last)($string,$flag,@string,@temp,@last
40,897
 
-perl-src/kai-test.pl,244
-sub f1 main::f1
2,16
-sub main::f2 6,50
+perl-src/kai-test.pl,203
+sub f1 2,16
+sub main::f2 f2
6,50
 package Foo;10,90
-sub f3 Foo::f3
12,104
-sub Bar::f4 16,138
+sub f3 12,104
+sub Bar::f4 f4
16,138
 package Bar;20,177
-sub f5 Bar::f5
22,191
+sub f5 22,191
 package Foo::Bar;26,225
-sub f6 Foo::Bar::f6
28,244
+sub f6 28,244
 package main;32,278
-sub f7 main::f7
34,293
+sub f7 34,293
 
 ps-src/rfc1245.ps,2478
 /FMversion 12,311
diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3
index 1f5a34272e3..5f84aa9a0c6 100644
--- a/test/manual/etags/ETAGS.good_3
+++ b/test/manual/etags/ETAGS.good_3
@@ -3012,7 +3012,7 @@ test 4,26
         var $test12,176
 foo(16,200
 
-perl-src/htlmify-cystic,1443
+perl-src/htlmify-cystic,1197
 my @section_name;section_name
12,236
 my @appendix_name;appendix_name
13,254
 my @section_toc;section_toc
15,274
@@ -3030,7 +3030,7 @@ my $output_file;output_file
35,556
 my $line;line
37,574
 my $subsection_marker;subsection_marker
161,3883
 my $new;new
163,3907
-sub read_toc main::read_toc
165,3917
+sub read_toc 165,3917
           my $entry entry
218,5621
           my $entry entry
234,6077
               my $entry entry
245,6351
@@ -3039,38 +3039,38 @@ sub read_toc main::read_toc
165,3917
               my $entry entry
276,7204
           my $entry entry
281,7328
       my $entry entry
296,7698
-sub finish_subsubsections main::finish_subsubsections
302,7805
-sub finish_subsections main::finish_subsections
309,7987
-sub finish_sections main::finish_sections
320,8310
-sub finish_appendices main::finish_appendices
331,8599
-sub section_url_base main::section_url_base
337,8724
-sub section_url_name main::section_url_name
342,8922
-sub section_url main::section_url
355,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 name
357,9336
-sub section_href main::section_href
364,9452
-sub section_name main::section_name
368,9551
-sub toc_line main::toc_line
372,9655
-sub file_end main::file_end
375,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::getopt
7,156
+perl-src/yagrip.pl,233
+sub getopt 7,156
         local($_,$flag,$opt,$f,$r,@temp)($_,$flag,$opt,$f,$r,@temp
8,169
-sub usage main::usage
38,856
+sub usage 38,856
         local($prog,$_,@list)($prog,$_,@list
39,868
         local($string,$flag,@string,@temp,@last)($string,$flag,@string,@temp,@last
40,897
 
-perl-src/kai-test.pl,244
-sub f1 main::f1
2,16
-sub main::f2 6,50
+perl-src/kai-test.pl,203
+sub f1 2,16
+sub main::f2 f2
6,50
 package Foo;10,90
-sub f3 Foo::f3
12,104
-sub Bar::f4 16,138
+sub f3 12,104
+sub Bar::f4 f4
16,138
 package Bar;20,177
-sub f5 Bar::f5
22,191
+sub f5 22,191
 package Foo::Bar;26,225
-sub f6 Foo::Bar::f6
28,244
+sub f6 28,244
 package main;32,278
-sub f7 main::f7
34,293
+sub f7 34,293
 
 ps-src/rfc1245.ps,2478
 /FMversion 12,311
diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4
index b8a3d9de6db..12e2a6549cf 100644
--- a/test/manual/etags/ETAGS.good_4
+++ b/test/manual/etags/ETAGS.good_4
@@ -2829,7 +2829,7 @@ define("TEST"TEST
1,0
 test 4,26
 foo(16,200
 
-perl-src/htlmify-cystic,1443
+perl-src/htlmify-cystic,1197
 my @section_name;section_name
12,236
 my @appendix_name;appendix_name
13,254
 my @section_toc;section_toc
15,274
@@ -2847,7 +2847,7 @@ my $output_file;output_file
35,556
 my $line;line
37,574
 my $subsection_marker;subsection_marker
161,3883
 my $new;new
163,3907
-sub read_toc main::read_toc
165,3917
+sub read_toc 165,3917
           my $entry entry
218,5621
           my $entry entry
234,6077
               my $entry entry
245,6351
@@ -2856,38 +2856,38 @@ sub read_toc main::read_toc
165,3917
               my $entry entry
276,7204
           my $entry entry
281,7328
       my $entry entry
296,7698
-sub finish_subsubsections main::finish_subsubsections
302,7805
-sub finish_subsections main::finish_subsections
309,7987
-sub finish_sections main::finish_sections
320,8310
-sub finish_appendices main::finish_appendices
331,8599
-sub section_url_base main::section_url_base
337,8724
-sub section_url_name main::section_url_name
342,8922
-sub section_url main::section_url
355,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 name
357,9336
-sub section_href main::section_href
364,9452
-sub section_name main::section_name
368,9551
-sub toc_line main::toc_line
372,9655
-sub file_end main::file_end
375,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::getopt
7,156
+perl-src/yagrip.pl,233
+sub getopt 7,156
         local($_,$flag,$opt,$f,$r,@temp)($_,$flag,$opt,$f,$r,@temp
8,169
-sub usage main::usage
38,856
+sub usage 38,856
         local($prog,$_,@list)($prog,$_,@list
39,868
         local($string,$flag,@string,@temp,@last)($string,$flag,@string,@temp,@last
40,897
 
-perl-src/kai-test.pl,244
-sub f1 main::f1
2,16
-sub main::f2 6,50
+perl-src/kai-test.pl,203
+sub f1 2,16
+sub main::f2 f2
6,50
 package Foo;10,90
-sub f3 Foo::f3
12,104
-sub Bar::f4 16,138
+sub f3 12,104
+sub Bar::f4 f4
16,138
 package Bar;20,177
-sub f5 Bar::f5
22,191
+sub f5 22,191
 package Foo::Bar;26,225
-sub f6 Foo::Bar::f6
28,244
+sub f6 28,244
 package main;32,278
-sub f7 main::f7
34,293
+sub f7 34,293
 
 ps-src/rfc1245.ps,2478
 /FMversion 12,311
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_name
12,236
 my @appendix_name;appendix_name
13,254
 my @section_toc;section_toc
15,274
@@ -3764,7 +3764,7 @@ my $output_file;output_file
35,556
 my $line;line
37,574
 my $subsection_marker;subsection_marker
161,3883
 my $new;new
163,3907
-sub read_toc main::read_toc
165,3917
+sub read_toc 165,3917
           my $entry entry
218,5621
           my $entry entry
234,6077
               my $entry entry
245,6351
@@ -3773,38 +3773,38 @@ sub read_toc main::read_toc
165,3917
               my $entry entry
276,7204
           my $entry entry
281,7328
       my $entry entry
296,7698
-sub finish_subsubsections main::finish_subsubsections
302,7805
-sub finish_subsections main::finish_subsections
309,7987
-sub finish_sections main::finish_sections
320,8310
-sub finish_appendices main::finish_appendices
331,8599
-sub section_url_base main::section_url_base
337,8724
-sub section_url_name main::section_url_name
342,8922
-sub section_url main::section_url
355,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 name
357,9336
-sub section_href main::section_href
364,9452
-sub section_name main::section_name
368,9551
-sub toc_line main::toc_line
372,9655
-sub file_end main::file_end
375,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::getopt
7,156
+perl-src/yagrip.pl,233
+sub getopt 7,156
         local($_,$flag,$opt,$f,$r,@temp)($_,$flag,$opt,$f,$r,@temp
8,169
-sub usage main::usage
38,856
+sub usage 38,856
         local($prog,$_,@list)($prog,$_,@list
39,868
         local($string,$flag,@string,@temp,@last)($string,$flag,@string,@temp,@last
40,897
 
-perl-src/kai-test.pl,244
-sub f1 main::f1
2,16
-sub main::f2 6,50
+perl-src/kai-test.pl,203
+sub f1 2,16
+sub main::f2 f2
6,50
 package Foo;10,90
-sub f3 Foo::f3
12,104
-sub Bar::f4 16,138
+sub f3 12,104
+sub Bar::f4 f4
16,138
 package Bar;20,177
-sub f5 Bar::f5
22,191
+sub f5 22,191
 package Foo::Bar;26,225
-sub f6 Foo::Bar::f6
28,244
+sub f6 28,244
 package main;32,278
-sub f7 main::f7
34,293
+sub f7 34,293
 
 ps-src/rfc1245.ps,2478
 /FMversion 12,311
diff --git a/test/manual/etags/c-src/emacs/src/keyboard.c b/test/manual/etags/c-src/emacs/src/keyboard.c
index 077b147c76e..68584ee71fc 100644
--- a/test/manual/etags/c-src/emacs/src/keyboard.c
+++ b/test/manual/etags/c-src/emacs/src/keyboard.c
@@ -7,8 +7,8 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/test/manual/etags/c-src/emacs/src/lisp.h b/test/manual/etags/c-src/emacs/src/lisp.h
index 96c52c04691..db8722917ea 100644
--- a/test/manual/etags/c-src/emacs/src/lisp.h
+++ b/test/manual/etags/c-src/emacs/src/lisp.h
@@ -7,8 +7,8 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/test/manual/etags/c-src/etags.c b/test/manual/etags/c-src/etags.c
index 4465b830602..453419897bc 100644
--- a/test/manual/etags/c-src/etags.c
+++ b/test/manual/etags/c-src/etags.c
@@ -35,8 +35,8 @@ This file is not considered part of GNU Emacs.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -613,8 +613,8 @@ static const char *Objc_suffixes [] =
 static const char Objc_help [] =
 "In Objective C code, tags include Objective C definitions for classes,\n\
 class categories, methods and protocols.  Tags for variables and\n\
-functions in classes are named `CLASS::VARIABLE' and `CLASS::FUNCTION'.\n\
-(Use --help --lang=c --lang=objc --lang=java for full help.)";
+functions in classes are named `CLASS::VARIABLE' and `CLASS::FUNCTION'.\
+\n(Use --help --lang=c --lang=objc --lang=java for full help.)";
 
 static const char *Pascal_suffixes [] =
   { "p", "pas", NULL };
diff --git a/test/manual/indent/js.js b/test/manual/indent/js.js
index 9a1e0dc7ad5..d843f615fd8 100644
--- a/test/manual/indent/js.js
+++ b/test/manual/indent/js.js
@@ -72,7 +72,12 @@ baz(`http://foo.bar/${tee}`)
 class A {
   * x() {
     return 1
-      * 2;
+      * a(2);
+  }
+
+  *[Symbol.iterator]() {
+    yield "Foo";
+    yield "Bar";
   }
 }
 
diff --git a/test/manual/indent/ruby.rb b/test/manual/indent/ruby.rb
index dfd1c75a679..585263d02a6 100644
--- a/test/manual/indent/ruby.rb
+++ b/test/manual/indent/ruby.rb
@@ -168,6 +168,15 @@ if x == :!=
   something
 end
 
+qux :+,
+    bar,
+    :[]=,
+    bar,
+    :a
+
+b = $:
+c = ??
+
 # Example from http://www.ruby-doc.org/docs/ProgrammingRuby/html/language.html
 d = 4 + 5 +      # no '\' needed
     6 + 7
@@ -194,6 +203,9 @@ class C
     self.end
     D.new.class
   end
+
+  def begin
+  end
 end
 
 a = foo(j, k) -
@@ -223,6 +235,9 @@ z = {
 foo if
   bar
 
+fail "stuff" \
+  unless all_fine?
+
 if foo?
   bar
 end