Merge from origin/emacs-25

cf9e174 Document the optional zlib library in MS-Windows builds
84eb144 ; * admin/notes/unicode: Mention BidiCharacterTest.txt.
73c67dd Fix tagging of DEFUN by etags
ea1960b Avoid resetting track-mouse by mouse clicks
505fef3 Improve nt/README.W32 instructions
1229cc4 Document that desktop file overrides frame parameters
f0eb70d ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 release

# Conflicts:
#	ChangeLog.2
#	admin/notes/unicode
#	lisp/ldefs-boot.el

1 files changed, 10 insertions, 5 deletions

diff --git a/admin/notes/unicode b/admin/notes/unicode
index 65df2166f28..c8a956d620a 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -15,11 +15,12 @@ Emacs uses the following files from the Unicode Character Database
   . BidiBrackets.txt
   . IVD_Sequences.txt
   . NormalizationTest.txt
+  . BidiCharacterTest.txt
 
-First, these files need to be copied into admin/unidata/, and then
-Emacs should be rebuilt for them to take effect.  Rebuilding Emacs
-updates several derived files elsewhere in the Emacs source tree,
-mainly in lisp/international/.
+First, the first 6 files need to be copied into admin/unidata/, and
+then Emacs should be rebuilt for them to take effect.  Rebuilding
+Emacs updates several derived files elsewhere in the Emacs source
+tree, mainly in lisp/international/.
 
 When Emacs is rebuilt for the first time after importing the new
 files, pay attention to any warning or error messages.  In particular,
@@ -49,7 +50,7 @@ might need to be updated because it knows about used and unused ranges
 of Unicode codepoints, which a new release of the Unicode Standard
 could change.
 
-Finally, test normalization functions against NormalizationTests.txt,
+Next, test normalization functions against NormalizationTests.txt,
 in the test/ directory run:
 
   make lisp/international/ucs-normalize-tests
@@ -57,6 +58,10 @@ in the test/ directory run:
 See commentary in test/lisp/international/ucs-normalize-tests.el
 regarding failing lines.
 
+The file BidiCharacterTest.txt should be copied to the test suite, and
+if its format has changed, the file biditest.el there should be
+modified to follow suit.
+
 Problems, fixmes and other unicode-related issues
 -------------------------------------------------------------