Merge from origin/emacs-25

9ffe7dd * lisp/isearch.el (isearch-define-mode-toggle): Improve logic
16140f7 * lisp/menu-bar.el (menu-bar-options-menu): New search submenu
3db6adb * lisp/isearch.el (search-default-mode)
4ea1ea7 * lisp/isearch.el: Rename search-default-regexp-mode to search-default-mode
c77ffc8 Use monitor's resolution for positioning tooltips
49e5749 Fix file-notify-test on MS-Windows
be1d874 Fix issues found by auditing w32notify code
87ae218 Extend etags Ruby support for accessors
aa35257 Update publicsuffix.txt.
6816bff Ensure that Gnus dribble handling allows removing entries
691feae Be consistent when using encoded strings in nnimap data
3ed423b Display the decoded Gnus group name
5428b5b Use completion-ignore-case instead of defining command

7 files changed, 54 insertions, 26 deletions

diff --git a/test/manual/etags/CTAGS.good b/test/manual/etags/CTAGS.good
index 58b1db6b0a3..ebde715272a 100644
--- a/test/manual/etags/CTAGS.good
+++ b/test/manual/etags/CTAGS.good
@@ -454,7 +454,7 @@ Condition_Variable/t	ada-src/2ataspri.ads	/^   type Condition_Variable is privat
 Condition_Variable/t	ada-src/2ataspri.ads	/^   type Condition_Variable is$/
 Configure	pyt-src/server.py	/^class Configure(Frame, ControlEdit):$/
 ConfirmQuit	pyt-src/server.py	/^def ConfirmQuit(frame, context):$/
-Constant	ruby-src/test1.ru	38
+Constant	ruby-src/test1.ru	42
 ControlEdit	pyt-src/server.py	/^class ControlEdit(Frame):$/
 Controls	pyt-src/server.py	/^class Controls:$/
 CopyTextString	pas-src/common.pas	/^function CopyTextString;(*($/
@@ -2555,6 +2555,7 @@ bar	c-src/c.c	/^void bar() {while(0) {}}$/
 bar	c.c	143
 bar	c-src/h.h	19
 bar	cp-src/x.cc	/^XX::bar()$/
+bar1	ruby-src/test1.ru	/^    attr_reader(:foo1, :bar1, # comment$/
 bar=	ruby-src/test1.ru	/^    attr_writer :bar,$/
 bas_syn	prol-src/natded.prolog	/^bas_syn(n(_)).$/
 base	c-src/emacs/src/lisp.h	2188
@@ -3008,6 +3009,8 @@ foo	f-src/entry.strange	/^       character*(*) function foo()$/
 foo	php-src/ptest.php	/^foo()$/
 foo	ruby-src/test1.ru	/^    attr_reader :foo$/
 foo!	ruby-src/test1.ru	/^    def foo!$/
+foo1	ruby-src/test1.ru	/^    attr_reader(:foo1, :bar1, # comment$/
+foo2	ruby-src/test1.ru	/^    alias_method ( :foo2, #cmmt$/
 foobar	c-src/c.c	/^int foobar() {;}$/
 foobar	c.c	/^extern void foobar (void) __attribute__ ((section /
 foobar2	c-src/h.h	20
@@ -3880,7 +3883,8 @@ questo	../c/c.web	34
 quiettest	make-src/Makefile	/^quiettest:$/
 quit_char	c-src/emacs/src/keyboard.c	192
 quit_throw_to_read_char	c-src/emacs/src/keyboard.c	/^quit_throw_to_read_char (bool from_signal)$/
-qux	ruby-src/test1.ru	/^    alias_method :qux, :tee, attr_accessor :bogus$/
+qux	ruby-src/test1.ru	/^    alias_method :qux, :tee, attr_accessor(:bogus)/
+qux1	ruby-src/test1.ru	/^                :qux1)$/
 qux=	ruby-src/test1.ru	/^      def qux=(tee)$/
 r0	c-src/sysdep.h	54
 r1	c-src/sysdep.h	55
diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1
index 90bbe774f05..d2550863428 100644
--- a/test/manual/etags/ETAGS.good_1
+++ b/test/manual/etags/ETAGS.good_1
@@ -3061,7 +3061,7 @@ module ModuleExample1,0
     def module_instance_method46,1051
     def ModuleExample.module_class_methodmodule_class_method
49,1131
 
-ruby-src/test1.ru,785
+ruby-src/test1.ru,935
 class A1,0
  def a(2,8
  def b(5,38
@@ -3084,9 +3084,13 @@ module A9,57
     attr_accessor :teetee
31,382
     attr_accessor :teetee=
31,382
     alias_method :qux,qux
32,405
-    alias_method :xyz,xyz
33,455
-                 :tee ; attr_reader :subtlesubtle
34,478
-A::Constant Constant
38,533
+    alias_method :xyz,xyz
33,456
+                 :tee ; attr_reader :subtlesubtle
34,479
+    attr_reader(:foo1,foo1
35,523
+    attr_reader(:foo1, :bar1,bar1
35,523
+                :qux1)qux1
36,563
+    alias_method ( :foo2,foo2
37,586
+A::Constant Constant
42,655
 
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm
4,77
diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2
index d774bb1b190..9eb1d4297c8 100644
--- a/test/manual/etags/ETAGS.good_2
+++ b/test/manual/etags/ETAGS.good_2
@@ -3631,7 +3631,7 @@ module ModuleExample1,0
     def module_instance_method46,1051
     def ModuleExample.module_class_methodmodule_class_method
49,1131
 
-ruby-src/test1.ru,785
+ruby-src/test1.ru,935
 class A1,0
  def a(2,8
  def b(5,38
@@ -3654,9 +3654,13 @@ module A9,57
     attr_accessor :teetee
31,382
     attr_accessor :teetee=
31,382
     alias_method :qux,qux
32,405
-    alias_method :xyz,xyz
33,455
-                 :tee ; attr_reader :subtlesubtle
34,478
-A::Constant Constant
38,533
+    alias_method :xyz,xyz
33,456
+                 :tee ; attr_reader :subtlesubtle
34,479
+    attr_reader(:foo1,foo1
35,523
+    attr_reader(:foo1, :bar1,bar1
35,523
+                :qux1)qux1
36,563
+    alias_method ( :foo2,foo2
37,586
+A::Constant Constant
42,655
 
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm
4,77
diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3
index e3855a59309..1f5a34272e3 100644
--- a/test/manual/etags/ETAGS.good_3
+++ b/test/manual/etags/ETAGS.good_3
@@ -3408,7 +3408,7 @@ module ModuleExample1,0
     def module_instance_method46,1051
     def ModuleExample.module_class_methodmodule_class_method
49,1131
 
-ruby-src/test1.ru,785
+ruby-src/test1.ru,935
 class A1,0
  def a(2,8
  def b(5,38
@@ -3431,9 +3431,13 @@ module A9,57
     attr_accessor :teetee
31,382
     attr_accessor :teetee=
31,382
     alias_method :qux,qux
32,405
-    alias_method :xyz,xyz
33,455
-                 :tee ; attr_reader :subtlesubtle
34,478
-A::Constant Constant
38,533
+    alias_method :xyz,xyz
33,456
+                 :tee ; attr_reader :subtlesubtle
34,479
+    attr_reader(:foo1,foo1
35,523
+    attr_reader(:foo1, :bar1,bar1
35,523
+                :qux1)qux1
36,563
+    alias_method ( :foo2,foo2
37,586
+A::Constant Constant
42,655
 
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm
4,77
diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4
index dbae59bd59e..b8a3d9de6db 100644
--- a/test/manual/etags/ETAGS.good_4
+++ b/test/manual/etags/ETAGS.good_4
@@ -3225,7 +3225,7 @@ module ModuleExample1,0
     def module_instance_method46,1051
     def ModuleExample.module_class_methodmodule_class_method
49,1131
 
-ruby-src/test1.ru,785
+ruby-src/test1.ru,935
 class A1,0
  def a(2,8
  def b(5,38
@@ -3248,9 +3248,13 @@ module A9,57
     attr_accessor :teetee
31,382
     attr_accessor :teetee=
31,382
     alias_method :qux,qux
32,405
-    alias_method :xyz,xyz
33,455
-                 :tee ; attr_reader :subtlesubtle
34,478
-A::Constant Constant
38,533
+    alias_method :xyz,xyz
33,456
+                 :tee ; attr_reader :subtlesubtle
34,479
+    attr_reader(:foo1,foo1
35,523
+    attr_reader(:foo1, :bar1,bar1
35,523
+                :qux1)qux1
36,563
+    alias_method ( :foo2,foo2
37,586
+A::Constant Constant
42,655
 
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm
4,77
diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5
index 9ea77977ab6..9e3b258eabc 100644
--- a/test/manual/etags/ETAGS.good_5
+++ b/test/manual/etags/ETAGS.good_5
@@ -4142,7 +4142,7 @@ module ModuleExample1,0
     def module_instance_method46,1051
     def ModuleExample.module_class_methodmodule_class_method
49,1131
 
-ruby-src/test1.ru,785
+ruby-src/test1.ru,935
 class A1,0
  def a(2,8
  def b(5,38
@@ -4165,9 +4165,13 @@ module A9,57
     attr_accessor :teetee
31,382
     attr_accessor :teetee=
31,382
     alias_method :qux,qux
32,405
-    alias_method :xyz,xyz
33,455
-                 :tee ; attr_reader :subtlesubtle
34,478
-A::Constant Constant
38,533
+    alias_method :xyz,xyz
33,456
+                 :tee ; attr_reader :subtlesubtle
34,479
+    attr_reader(:foo1,foo1
35,523
+    attr_reader(:foo1, :bar1,bar1
35,523
+                :qux1)qux1
36,563
+    alias_method ( :foo2,foo2
37,586
+A::Constant Constant
42,655
 
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm
4,77
diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6
index 7420a41b108..f5e0ad4407f 100644
--- a/test/manual/etags/ETAGS.good_6
+++ b/test/manual/etags/ETAGS.good_6
@@ -4142,7 +4142,7 @@ module ModuleExample1,0
     def module_instance_method46,1051
     def ModuleExample.module_class_methodmodule_class_method
49,1131
 
-ruby-src/test1.ru,785
+ruby-src/test1.ru,935
 class A1,0
  def a(2,8
  def b(5,38
@@ -4165,9 +4165,13 @@ module A9,57
     attr_accessor :teetee
31,382
     attr_accessor :teetee=
31,382
     alias_method :qux,qux
32,405
-    alias_method :xyz,xyz
33,455
-                 :tee ; attr_reader :subtlesubtle
34,478
-A::Constant Constant
38,533
+    alias_method :xyz,xyz
33,456
+                 :tee ; attr_reader :subtlesubtle
34,479
+    attr_reader(:foo1,foo1
35,523
+    attr_reader(:foo1, :bar1,bar1
35,523
+                :qux1)qux1
36,563
+    alias_method ( :foo2,foo2
37,586
+A::Constant Constant
42,655
 
 tex-src/testenv.tex,52
 \newcommand{\nm}\nm
4,77