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

diff --cc etc/NEWS
Simple merge

diff --cc lib-src/etags.c
Simple merge

diff --cc lisp/erc/erc.el
Simple merge

diff --cc lisp/gnus/gnus-start.el
Simple merge

diff --cc lisp/gnus/gnus-sum.el
Simple merge

diff --cc lisp/menu-bar.el
Simple merge

diff --cc test/lisp/filenotify-tests.el
Simple merge

diff --cc test/manual/etags/CTAGS.good
Simple merge

diff --cc test/manual/etags/ETAGS.good_1
Simple merge

diff --cc test/manual/etags/ETAGS.good_2
Simple merge

diff --cc test/manual/etags/ETAGS.good_3
Simple merge

diff --cc test/manual/etags/ETAGS.good_4
Simple merge

diff --cc test/manual/etags/ETAGS.good_5
Simple merge

diff --cc test/manual/etags/ETAGS.good_6
Simple merge