Merge from emacs-24; up to 2014-06-11T19:33:[email protected]

3 files changed, 46 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 4aacf00992..d96368c4f9 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-26  Eli Zaretskii  <[email protected]>
+
+	* notes/unicode: Some notes about what to do when a new Unicode
+	version is imported.
+
 2014-06-26  Glenn Morris  <[email protected]>
 
 	* authors.el: Move here from ../lisp/emacs-lisp.
diff --git a/admin/authors.el b/admin/authors.el
index dfc60512c6..3a552c6c1e 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -622,11 +622,12 @@ Changes to files in this list are not listed.")
     "temacs.opt" "descrip.mms" "compile.com" "link.com"
     "compact.el" "fadr.el"
     "calc/calc-maint.el"
+    "emacs-lisp/cl-specs.el"
     "emacs-lisp/eieio-comp.el"
     "erc-hecomplete.el"
     "eshell/esh-maint.el"
     "language/persian.el"
-    "meese.el" "iswitchb.el"
+    "ledit.el" "meese.el" "iswitchb.el" "longlines.el"
     "mh-exec.el" "mh-init.el" "mh-customize.el"
     "net/zone-mode.el" "xesam.el"
     "term/mac-win.el" "sup-mouse.el"
@@ -647,6 +648,7 @@ Changes to files in this list are not listed.")
     "dns-mode.el" "run-at-time.el" "gnus-encrypt.el" "sha1-el.el"
     "gnus-gl.el" "gnus.sum.el" "proto-stream.el" "color.el" "color-lab.el"
     "eww.el" "shr-color.el" "shr.el" "earcon.el" "gnus-audio.el" "encrypt.el"
+    "format-spec.el" "gnus-move.el"
     ;; doc
     "getopt.c" "texindex.c" "news.texi" "vc.texi" "vc2-xtra.texi"
     "back.texi" "vol1.texi" "vol2.texi" "elisp-covers.texi" "two.el"
@@ -752,7 +754,11 @@ in the repository.")
     ("progmodes/octave-inf.el" . "octave.el")
     ("progmodes/octave-mod.el" . "octave.el")
     ;; Obsolete.
+    ("emacs-lisp/assoc.el" . "assoc.el")
+    ("emacs-lisp/cust-print.el" . "cust-print.el")
+    ("mail/mailpost.el" . "mailpost.el")
     ("play/bruce.el" . "bruce.el")
+    ("play/yow.el" . "yow.el")
     ("patcomp.el" . "patcomp.el")
     ;; From lisp to etc/forms.
     ("forms-d2.el" . "forms-d2.el")
@@ -771,6 +777,7 @@ in the repository.")
     ("build-install" . "build-ins.in")
     ("build-install.in" . "build-ins.in")
     ("unidata/Makefile" . "unidata/Makefile.in")
+    ("mac/uvs.el" . "unidata/uvs.el")
     ;; Moved from top to etc/
     ("CONTRIBUTE" . "CONTRIBUTE")
     ("FTP" . "FTP")
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 841b7ebd5e..79e0e1d77e 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -3,6 +3,39 @@
 Copyright (C) 2002-2014 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
+Importing a new Unicode Standard version into Emacs
+-------------------------------------------------------------
+
+Emacs uses the following files from the Unicode Character Database
+(a.k.a. "UCD):
+
+  . UnicodeData.txt
+  . BidiMirroring.txt
+  . IVD_Sequences.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/.
+
+When Emacs is rebuilt for the first time after importing the new
+files, pay attention to any warning or error messages.  In particular,
+admin/unidata/unidata-gen.el will complain if UnicodeData.txt defines
+new bidirectional attributes of characters, because unidata-gen.el,
+bidi.c and dispextern.h need to be updated in that case; failure to do
+so will cause aborts in redisplay.
+
+Next, review the changes in UnicodeData.txt vs the previous version
+used by Emacs.  Any changes, be it introduction of new scripts or
+addition of codepoints to existing scripts, need corresponding changes
+in the data used for filling char-script-table, see characters.el
+around line 1300.  Other databases and settings in characters.el, such
+as the data for char-width-table, might also need changes.
+
+Any new scripts added by UnicodeData.txt will also need updates to
+script-representative-chars defined in fontset.el.  Other databases in
+fontset.el might also need to be updated as needed.
+
 Problems, fixmes and other unicode-related issues
 -------------------------------------------------------------