Commit 90ab699c authored by Vincent Belaïche's avatar Vincent Belaïche
Browse files

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

parents 41b28dea ec359399
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
(sentence-end-double-space . t) (sentence-end-double-space . t)
(fill-column . 70))) (fill-column . 70)))
(c-mode . ((c-file-style . "GNU") (c-mode . ((c-file-style . "GNU")
(c-noise-macro-with-parens-names . ("IF_LINT")))) (c-noise-macro-names . ("NONVOLATILE" "UNINIT"))))
(objc-mode . ((c-file-style . "GNU"))) (objc-mode . ((c-file-style . "GNU")))
(log-edit-mode . ((log-edit-font-lock-gnu-style . t) (log-edit-mode . ((log-edit-font-lock-gnu-style . t)
(log-edit-setup-add-author . t))) (log-edit-setup-add-author . t)))
......
This diff is collapsed.
...@@ -156,7 +156,6 @@ HAVE_GETLOADAVG ...@@ -156,7 +156,6 @@ HAVE_GETLOADAVG
HAVE_GETOPT_H HAVE_GETOPT_H
HAVE_GETOPT_LONG_ONLY HAVE_GETOPT_LONG_ONLY
HAVE_GETPAGESIZE HAVE_GETPAGESIZE
HAVE_GETPEERNAME
HAVE_GETPT HAVE_GETPT
HAVE_GETPWENT HAVE_GETPWENT
HAVE_GETRLIMIT HAVE_GETRLIMIT
...@@ -234,7 +233,7 @@ HAVE_NET_IF_DL_H ...@@ -234,7 +233,7 @@ HAVE_NET_IF_DL_H
HAVE_NET_IF_H HAVE_NET_IF_H
HAVE_NLIST_H HAVE_NLIST_H
HAVE_OTF_GET_VARIATION_GLYPHS HAVE_OTF_GET_VARIATION_GLYPHS
HAVE_PERSONALITY_LINUX32 HAVE_PERSONALITY_ADDR_NO_RANDOMIZE
HAVE_PNG HAVE_PNG
HAVE_PNG_H HAVE_PNG_H
HAVE_POSIX_MEMALIGN HAVE_POSIX_MEMALIGN
......
...@@ -45,7 +45,9 @@ files.") ...@@ -45,7 +45,9 @@ files.")
'( '(
(nil "A\\. N\\. Other") ; unknown author 2014-12-03, later removed (nil "A\\. N\\. Other") ; unknown author 2014-12-03, later removed
("Aaron S. Hawley" "Aaron Hawley") ("Aaron S. Hawley" "Aaron Hawley")
("Alan Third" "Alan J Third")
("Alexandru Harsanyi" "Alex Harsanyi") ("Alexandru Harsanyi" "Alex Harsanyi")
("Álvar Jesús Ibeas Martín" "Álvar Ibeas")
("Andrew Csillag" "Drew Csillag") ("Andrew Csillag" "Drew Csillag")
("Anna M. Bigatti" "Anna Bigatti") ("Anna M. Bigatti" "Anna Bigatti")
("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc." ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc."
...@@ -61,6 +63,7 @@ files.") ...@@ -61,6 +63,7 @@ files.")
("David J. Biesack" "David Biesack") ("David J. Biesack" "David Biesack")
("David De La Harpe Golden" "David Golden") ("David De La Harpe Golden" "David Golden")
("David Gillespie" "Dave Gillespie") ("David Gillespie" "Dave Gillespie")
("David S. Goldberg" "Dave Goldberg")
("David Kågedal" "David K..edal") ("David Kågedal" "David K..edal")
("David M. Koppelman" "David Koppelman") ("David M. Koppelman" "David Koppelman")
("David M. Smith" "David Smith" "David M Smith") ("David M. Smith" "David Smith" "David M Smith")
...@@ -72,6 +75,7 @@ files.") ...@@ -72,6 +75,7 @@ files.")
("Eric M. Ludlam" "Eric Ludlam") ("Eric M. Ludlam" "Eric Ludlam")
("Eric S. Raymond" "Eric Raymond") ("Eric S. Raymond" "Eric Raymond")
("Fabián Ezequiel Gallina" "Fabian Ezequiel Gallina" "Fabi.n E\\. Gallina") ("Fabián Ezequiel Gallina" "Fabian Ezequiel Gallina" "Fabi.n E\\. Gallina")
("Francis Litterio" "Fran Litterio")
("Francis J. Wright" "Dr Francis J. Wright" "Francis Wright") ("Francis J. Wright" "Dr Francis J. Wright" "Francis Wright")
("François Pinard" "Francois Pinard") ("François Pinard" "Francois Pinard")
("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`") ("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`")
...@@ -122,11 +126,12 @@ files.") ...@@ -122,11 +126,12 @@ files.")
("Michaël Cadilhac" "Michael Cadilhac") ("Michaël Cadilhac" "Michael Cadilhac")
("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, p/BSG") ("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, p/BSG")
("Michael R. Cook" "Michael Cook") ("Michael R. Cook" "Michael Cook")
("Michael Sperber" "Michael Sperber \\[Mr. Preprocessor\\]") ("Michael Sperber" "Mike Sperber" "Michael Sperber \\[Mr. Preprocessor\\]")
("Mikio Nakajima" "Nakajima Mikio") ("Mikio Nakajima" "Nakajima Mikio")
("Nelson Jose dos Santos Ferreira" "Nelson Ferreira") ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
("Noorul Islam" "Noorul Islam K M") ("Noorul Islam" "Noorul Islam K M")
;;; ("Tetsurou Okazaki" "OKAZAKI Tetsurou") ; FIXME? ;;; ("Tetsurou Okazaki" "OKAZAKI Tetsurou") ; FIXME?
("Óscar Fuentes" "Oscar Fuentes")
("Paul Eggert" "Paul R\\. Eggert") ("Paul Eggert" "Paul R\\. Eggert")
("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik") ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik")
("Pavel Kobiakov" "Pavel Kobyakov") ("Pavel Kobiakov" "Pavel Kobyakov")
...@@ -136,6 +141,7 @@ files.") ...@@ -136,6 +141,7 @@ files.")
("Peter S. Galbraith" "Peter S Galbraith" "Peter Galbraith") ("Peter S. Galbraith" "Peter S Galbraith" "Peter Galbraith")
("Peter Runestig" "Peter 'luna' Runestig") ("Peter Runestig" "Peter 'luna' Runestig")
("Piotr Zieliński" "Piotr Zielinski") ("Piotr Zieliński" "Piotr Zielinski")
("Przemysław Wojnowski" "Przemyslaw Wojnowski")
("Rainer Schöpf" "Rainer Schoepf") ("Rainer Schöpf" "Rainer Schoepf")
("Raja R. Harinath" "Raja R Harinath") ("Raja R. Harinath" "Raja R Harinath")
("Richard G. Bielawski" "Richard G Bielawski" "Richard Bielawski") ("Richard G. Bielawski" "Richard G Bielawski" "Richard Bielawski")
...@@ -143,13 +149,16 @@ files.") ...@@ -143,13 +149,16 @@ files.")
("Richard M. Stallman" "Richard Stallman" "rms@gnu.org") ("Richard M. Stallman" "Richard Stallman" "rms@gnu.org")
("Robert J. Chassell" "Bob Chassell") ("Robert J. Chassell" "Bob Chassell")
("Roberto Huelga Díaz" "Roberto Huelga") ("Roberto Huelga Díaz" "Roberto Huelga")
("Rodney J. Whitby" "Rod Whitby")
("Roland B. Roberts" "Roland B Roberts" "Roland Roberts") ("Roland B. Roberts" "Roland B Roberts" "Roland Roberts")
("Ron Schnell" "Ronnie Schnell")
("Rui-Tao Dong" "Rui-Tao Dong ~{6-HpLN~}") ("Rui-Tao Dong" "Rui-Tao Dong ~{6-HpLN~}")
("Sacha Chua" "Sandra Jean Chua") ("Sacha Chua" "Sandra Jean Chua")
("Sam Steingold" "Sam Shteingold") ("Sam Steingold" "Sam Shteingold")
("Satyaki Das" "Indexed search by Satyaki Das") ("Satyaki Das" "Indexed search by Satyaki Das")
("Sébastien Vauban" "Sebastien Vauban") ("Sébastien Vauban" "Sebastien Vauban")
("Sergey Litvinov" "Litvinov Sergey") ("Sergey Litvinov" "Litvinov Sergey")
("Shun-ichi Goto" "Shun-ichi GOTO")
;; There are other Stefans. ;; There are other Stefans.
;;; ("Stefan Monnier" "Stefan") ;;; ("Stefan Monnier" "Stefan")
("Steven L. Baur" "SL Baur" "Steven L Baur") ("Steven L. Baur" "SL Baur" "Steven L Baur")
...@@ -186,12 +195,14 @@ If REALNAME is nil, ignore that author.") ...@@ -186,12 +195,14 @@ If REALNAME is nil, ignore that author.")
;; FIXME seems it would be less fragile to check for O', Mc, etc. ;; FIXME seems it would be less fragile to check for O', Mc, etc.
(defconst authors-fixed-case (defconst authors-fixed-case
'("Barry O'Reilly" '("Barry O'Reilly"
"Brian McKenna"
"Brian van den Broek" "Brian van den Broek"
"Bryan O'Sullivan" "Bryan O'Sullivan"
"Christian von Roques" "Christian von Roques"
"Christophe de Dinechin" "Christophe de Dinechin"
"Craig McDaniel" "Craig McDaniel"
"Daniel LaLiberte" "Daniel LaLiberte"
"Daniel McClanahan"
"David J. MacKenzie" "David J. MacKenzie"
"David McCabe" "David McCabe"
"David O'Toole" "David O'Toole"
...@@ -222,6 +233,7 @@ If REALNAME is nil, ignore that author.") ...@@ -222,6 +233,7 @@ If REALNAME is nil, ignore that author.")
"Shun-ichi Goto" "Shun-ichi Goto"
"Thomas DeWeese" "Thomas DeWeese"
"Tijs van Bakel" "Tijs van Bakel"
"Titus von der Malsburg"
"Yu-ji Hosokawa") "Yu-ji Hosokawa")
"List of authors whose names cannot be simply capitalized.") "List of authors whose names cannot be simply capitalized.")
...@@ -280,6 +292,7 @@ Changes to files matching one of the regexps in this list are not listed.") ...@@ -280,6 +292,7 @@ Changes to files matching one of the regexps in this list are not listed.")
"gfdl.1" "gfdl.1"
"texi/Makefile.in" "texi/Makefile.in"
"autodeps.mk" "autodeps.mk"
"lwlib/autodeps.mk"
"oldXMenu/autodeps.mk" "oldXMenu/autodeps.mk"
"src/autodeps.mk" "src/autodeps.mk"
"Imakefile" "icons/sink.ico" "aixcc.lex" "Imakefile" "icons/sink.ico" "aixcc.lex"
...@@ -371,9 +384,11 @@ Changes to files matching one of the regexps in this list are not listed.") ...@@ -371,9 +384,11 @@ Changes to files matching one of the regexps in this list are not listed.")
"lib/qset-acl.c" "lib/qcopy-acl.c" "lib/file-has-acl.c" "lib/qset-acl.c" "lib/qcopy-acl.c" "lib/file-has-acl.c"
;; files from old MS Windows build procedures ;; files from old MS Windows build procedures
"makefile.w32-in" "makefile.w32-in"
"admin/unidata/makefile.w32-in"
"unidata/makefile.w32-in" "unidata/makefile.w32-in"
"lib/makefile.w32-in" "lib/makefile.w32-in"
"leim/makefile.w32-in" "leim/makefile.w32-in"
"lisp/makefile.w32-in"
"src/makefile.w32-in" "src/makefile.w32-in"
"nt/emacs-src.tags" "nt/emacs-src.tags"
"doc/emacs/makefile.w32-in" "doc/emacs/makefile.w32-in"
...@@ -692,8 +707,9 @@ Changes to files in this list are not listed.") ...@@ -692,8 +707,9 @@ Changes to files in this list are not listed.")
"net/zone-mode.el" "xesam.el" "net/zone-mode.el" "xesam.el"
"term/mac-win.el" "sup-mouse.el" "term/mac-win.el" "sup-mouse.el"
"term/apollo.el" "term/apollo.el"
"term/vt102.el" "term/vt125.el" "term/vt201.el" "term/vt220.el" "term/vt300.el" "term/vt102.el" "term/vt125.el" "term/vt201.el" "term/vt220.el"
"term/vt320.el" "term/vt400.el" "term/vt420.el" "term/vt240.el" "term/vt300.el" "term/vt320.el" "term/vt400.el"
"term/vt420.el"
"url-https.el" "url-https.el"
"org-mac-message.el" "org-mew.el" "org-w3m.el" "org-vm.el" "org-wl.el" "org-mac-message.el" "org-mew.el" "org-w3m.el" "org-vm.el" "org-wl.el"
"org-mks.el" "org-remember.el" "org-xoxo.el" "org-docbook.el" "org-mks.el" "org-remember.el" "org-xoxo.el" "org-docbook.el"
...@@ -738,6 +754,7 @@ Changes to files in this list are not listed.") ...@@ -738,6 +754,7 @@ Changes to files in this list are not listed.")
"emacsclient.c" "etags.c" "hexl.c" "make-docfile.c" "movemail.c" "emacsclient.c" "etags.c" "hexl.c" "make-docfile.c" "movemail.c"
"test-distrib.c" "testfile" "test-distrib.c" "testfile"
"tpu-edt.doc" ; see below "tpu-edt.doc" ; see below
"lisp/obsolete/vc-mcvs.el"
) )
"File names which are valid, but no longer exist (or cannot be found) "File names which are valid, but no longer exist (or cannot be found)
in the repository.") in the repository.")
...@@ -829,11 +846,14 @@ in the repository.") ...@@ -829,11 +846,14 @@ in the repository.")
("emulation/crisp.el" . "crisp.el") ("emulation/crisp.el" . "crisp.el")
("emulation/tpu-edt.el" . "tpu-edt.el") ("emulation/tpu-edt.el" . "tpu-edt.el")
("emulation/tpu-extras.el" . "tpu-extras.el") ("emulation/tpu-extras.el" . "tpu-extras.el")
("emulation/tpu-mapper.el" . "tpu-mapper.el")
("emulation/vi.el" . "vi.el") ("emulation/vi.el" . "vi.el")
("emulation/vip.el" . "vip.el") ("emulation/vip.el" . "vip.el")
("emulation/ws-mode.el" . "ws-mode.el") ("emulation/ws-mode.el" . "ws-mode.el")
("mail/mailpost.el" . "mailpost.el") ("mail/mailpost.el" . "mailpost.el")
("net/eudcb-ph.el" . "eudcb-ph.el")
("play/bruce.el" . "bruce.el") ("play/bruce.el" . "bruce.el")
("lisp/play/landmark.el" . "landmark.el")
("play/yow.el" . "yow.el") ("play/yow.el" . "yow.el")
("patcomp.el" . "patcomp.el") ("patcomp.el" . "patcomp.el")
("emulation/ws-mode.el" . "ws-mode.el") ("emulation/ws-mode.el" . "ws-mode.el")
...@@ -886,6 +906,8 @@ in the repository.") ...@@ -886,6 +906,8 @@ in the repository.")
("ED.WORSHIP" . "JOKES") ("ED.WORSHIP" . "JOKES")
("GNU.JOKES" . "JOKES") ("GNU.JOKES" . "JOKES")
("CHARACTERS" . "TODO") ("CHARACTERS" . "TODO")
("lisp/character-fold.el" . "lisp/char-fold.el")
("test/automated/character-fold-tests.el" . "test/automated/char-fold-tests.el")
("images/gnus/mail_send.xpm" . "mail-send.xpm") ; still in images/gnus ("images/gnus/mail_send.xpm" . "mail-send.xpm") ; still in images/gnus
;; Renamed within same directory. ;; Renamed within same directory.
("schema/xhtml-basic-form.rnc" . "xhtml-bform.rnc" ) ("schema/xhtml-basic-form.rnc" . "xhtml-bform.rnc" )
...@@ -912,6 +934,7 @@ in the repository.") ...@@ -912,6 +934,7 @@ in the repository.")
("grammars" . "grammars") ("grammars" . "grammars")
;; Moved from lisp/emacs-lisp/ to admin/. ;; Moved from lisp/emacs-lisp/ to admin/.
("emacs-lisp/authors.el" . "authors.el") ("emacs-lisp/authors.el" . "authors.el")
("emacs-lisp/find-gc.el" . "admin/find-gc.el")
;; From etc to lisp/cedet/semantic/. ;; From etc to lisp/cedet/semantic/.
("grammars/bovine-grammar.el" . "bovine/grammar.el") ("grammars/bovine-grammar.el" . "bovine/grammar.el")
("grammars/wisent-grammar.el" . "wisent/grammar.el") ("grammars/wisent-grammar.el" . "wisent/grammar.el")
......
...@@ -14,6 +14,7 @@ Emacs uses the following files from the Unicode Character Database ...@@ -14,6 +14,7 @@ Emacs uses the following files from the Unicode Character Database
. BidiMirroring.txt . BidiMirroring.txt
. BidiBrackets.txt . BidiBrackets.txt
. IVD_Sequences.txt . IVD_Sequences.txt
. NormalizationTest.txt
First, these files need to be copied into admin/unidata/, and then First, these files need to be copied into admin/unidata/, and then
Emacs should be rebuilt for them to take effect. Rebuilding Emacs Emacs should be rebuilt for them to take effect. Rebuilding Emacs
...@@ -48,6 +49,14 @@ might need to be updated because it knows about used and unused ranges ...@@ -48,6 +49,14 @@ might need to be updated because it knows about used and unused ranges
of Unicode codepoints, which a new release of the Unicode Standard of Unicode codepoints, which a new release of the Unicode Standard
could change. could change.
Finally, test normalization functions against NormalizationTests.txt,
in the test/ directory run:
make lisp/international/ucs-normalize-tests
See commentary in test/lisp/international/ucs-normalize-tests.el
regarding failing lines.
Problems, fixmes and other unicode-related issues Problems, fixmes and other unicode-related issues
------------------------------------------------------------- -------------------------------------------------------------
...@@ -131,8 +140,6 @@ regard to completeness. ...@@ -131,8 +140,6 @@ regard to completeness.
* Need multibyte text in menus, e.g. for the above. (Not specific to * Need multibyte text in menus, e.g. for the above. (Not specific to
Unicode -- see Emacs etc/TODO, but now mostly works with gtk.) Unicode -- see Emacs etc/TODO, but now mostly works with gtk.)
* There's currently no support for Unicode normalization.
* Populate char-width-table correctly for Unicode characters and * Populate char-width-table correctly for Unicode characters and
worry about what happens when double-width charsets covering worry about what happens when double-width charsets covering
non-CJK characters are unified. non-CJK characters are unified.
......
# BidiBrackets-9.0.0.txt # BidiBrackets-9.0.0.txt
# Date: 2016-01-21, 22:00:00 GMT [AG, LI, KW] # Date: 2016-06-07, 22:30:00 GMT [AG, LI, KW]
# © 2016 Unicode®, Inc. # © 2016 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see http://www.unicode.org/terms_of_use.html # For terms of use, see http://www.unicode.org/terms_of_use.html
# #
# Unicode Character Database # Unicode Character Database
...@@ -28,6 +29,12 @@ ...@@ -28,6 +29,12 @@
# vice versa, and their Bidi_Paired_Bracket_Type (bpt) property values are # vice versa, and their Bidi_Paired_Bracket_Type (bpt) property values are
# Open (o) and Close (c), respectively. # Open (o) and Close (c), respectively.
# #
# The brackets with ticks U+298D LEFT SQUARE BRACKET WITH TICK IN TOP CORNER
# through U+2990 RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER are paired the
# same way their glyphs form mirror pairs, according to their bmg property
# values. They are not paired on the basis of a diagonal or antidiagonal
# matching of the corner ticks inferred from code point order.
#
# For legacy reasons, the characters U+FD3E ORNATE LEFT PARENTHESIS and # For legacy reasons, the characters U+FD3E ORNATE LEFT PARENTHESIS and
# U+FD3F ORNATE RIGHT PARENTHESIS do not mirror in bidirectional display # U+FD3F ORNATE RIGHT PARENTHESIS do not mirror in bidirectional display
# and therefore do not form a bracket pair. # and therefore do not form a bracket pair.
......
This diff is collapsed.
...@@ -20,3 +20,7 @@ http://www.unicode.org/Public/UNIDATA/UnicodeData.txt ...@@ -20,3 +20,7 @@ http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
Blocks.txt Blocks.txt
http://www.unicode.org/Public/8.0.0/ucd/Blocks.txt http://www.unicode.org/Public/8.0.0/ucd/Blocks.txt
2014-11-10 2014-11-10
NormalizationTest.txt
http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt
2016-07-16
...@@ -20179,10 +20179,10 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; ...@@ -20179,10 +20179,10 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
11C34;BHAIKSUKI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; 11C34;BHAIKSUKI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
11C35;BHAIKSUKI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; 11C35;BHAIKSUKI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
11C36;BHAIKSUKI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; 11C36;BHAIKSUKI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
11C38;BHAIKSUKI VOWEL SIGN E;Mc;0;L;;;;;N;;;;; 11C38;BHAIKSUKI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
11C39;BHAIKSUKI VOWEL SIGN AI;Mc;0;L;;;;;N;;;;; 11C39;BHAIKSUKI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
11C3A;BHAIKSUKI VOWEL SIGN O;Mc;0;L;;;;;N;;;;; 11C3A;BHAIKSUKI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
11C3B;BHAIKSUKI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;; 11C3B;BHAIKSUKI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
11C3C;BHAIKSUKI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; 11C3C;BHAIKSUKI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
11C3D;BHAIKSUKI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; 11C3D;BHAIKSUKI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
11C3E;BHAIKSUKI SIGN VISARGA;Mc;0;L;;;;;N;;;;; 11C3E;BHAIKSUKI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<td valign="top" class="navColCell"><a href="#7">Miscellaneous</a></td> <td valign="top" class="navColCell"><a href="#7">Miscellaneous</a></td>
</tr> </tr>
<tr> <tr>
<td valign="top" class="navColCell"><a href="#Exhibit1">Data Files and <td valign="top" class="navColCell"><a href="#License">Data Files and
Software License Agreement (Exhibit 1)</a></td> Software License Agreement (Exhibit 1)</a></td>
</tr> </tr>
<tr> <tr>
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<td> <td>
<blockquote> <blockquote>
<h1>Unicode Terms of Use</h1> <h1>Unicode® Terms of Use</h1>
<p>For the general privacy policy governing access to this site, see <p>For the general privacy policy governing access to this site, see
the&nbsp; the&nbsp;
...@@ -131,7 +131,7 @@ <h1>Unicode Terms of Use</h1> ...@@ -131,7 +131,7 @@ <h1>Unicode Terms of Use</h1>
<ol type="A"> <ol type="A">
<li><u><a name="1"></a>Unicode Copyright.</u> <li><u><a name="1"></a>Unicode Copyright.</u>
<ol> <ol>
<li>Copyright © 1991-2014 Unicode, Inc. All rights reserved.</li> <li>Copyright © 1991-2016 Unicode, Inc. All rights reserved.</li>
<li>Certain documents and files on this website contain a legend <li>Certain documents and files on this website contain a legend
indicating that &quot;Modification is permitted.&quot; Any person is indicating that &quot;Modification is permitted.&quot; Any person is
hereby authorized, without fee, to modify such documents and hereby authorized, without fee, to modify such documents and
...@@ -139,13 +139,13 @@ <h1>Unicode Terms of Use</h1> ...@@ -139,13 +139,13 @@ <h1>Unicode Terms of Use</h1>
Standard, subject to Terms and Conditions herein.</li> Standard, subject to Terms and Conditions herein.</li>
<li>Any person is hereby authorized, without fee, to view, use, <li>Any person is hereby authorized, without fee, to view, use,
reproduce, and distribute all documents and files solely for reproduce, and distribute all documents and files solely for
informational purposes in the creation of products supporting informational purposes and in the creation of products supporting
the Unicode Standard, subject to the Terms and Conditions the Unicode Standard, subject to the Terms and Conditions
herein.</li> herein.</li>
<li>Further specifications of rights and restrictions pertaining <li>Further specifications of rights and restrictions pertaining
to the use of the particular set of data files known as the to the use of the particular set of data files known as the
&quot;Unicode Character Database&quot; can be found in <a href="#Exhibit1"> &quot;Unicode Character Database&quot; can be found in the
Exhibit 1</a>.</li> <a href="#License">License</a>.</li>
<li>Each version of the Unicode Standard has further <li>Each version of the Unicode Standard has further
specifications of rights and restrictions of use. For the book specifications of rights and restrictions of use. For the book
editions (Unicode 5.0 and earlier), these are found on the back editions (Unicode 5.0 and earlier), these are found on the back
...@@ -247,35 +247,35 @@ <h1>Unicode Terms of Use</h1> ...@@ -247,35 +247,35 @@ <h1>Unicode Terms of Use</h1>
<blockquote> <blockquote>
<h3 align="center"><a name="Exhibit1">EXHIBIT 1</a><br> <h3 align="center"><a name="Exhibit1">EXHIBIT 1</a><br>
UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE</h3> <a name="License">UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE</a></h3>
<pre>
Unicode Data Files include all data files under the directories
http://www.unicode.org/Public/, http://www.unicode.org/reports/,
http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and
http://www.unicode.org/utility/trac/browser/.
<p>Unicode Data Files include all data files under the directories
<a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>, <a href="http://www.unicode.org/reports/">http://www.unicode.org/reports/</a>, and <a title="http://www.unicode.org/cldr/data/" onClick="return top.js.OpenExtLink(window,event,this)" target="_blank" href="http://www.unicode.org/cldr/data/">
http://www.unicode.org/cldr/data/</a>.
Unicode Data Files do not include PDF online code charts under the Unicode Data Files do not include PDF online code charts under the
directory <a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>. directory http://www.unicode.org/Public/.
Software includes any source code published in the Unicode Standard Software includes any source code published in the Unicode Standard
or under the directories <a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>, or under the directories
<a href="http://www.unicode.org/reports/">http://www.unicode.org/reports/</a>, and <a title="http://www.unicode.org/cldr/data/" onClick="return top.js.OpenExtLink(window,event,this)" target="_blank" href="http://www.unicode.org/cldr/data/"> http://www.unicode.org/Public/, http://www.unicode.org/reports/,
http://www.unicode.org/cldr/data/</a>.</p> http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and
http://www.unicode.org/utility/trac/browser/.
<p>NOTICE TO USER: Carefully read the following legal agreement. NOTICE TO USER: Carefully read the following legal agreement.
BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
TERMS AND CONDITIONS OF THIS AGREEMENT. TERMS AND CONDITIONS OF THIS AGREEMENT.
IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
THE DATA FILES OR SOFTWARE.</p> THE DATA FILES OR SOFTWARE.
<div align="center">
<table class="simple"><tr><td> COPYRIGHT AND PERMISSION NOTICE
<pre>COPYRIGHT AND PERMISSION NOTICE
Copyright © 1991-2014 Unicode, Inc. All rights reserved. Copyright © 1991-2016 Unicode, Inc. All rights reserved.
Distributed under the Terms of Use in Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
<a href="http://www.unicode.org/copyright.html">http://www.unicode.org/copyright.html</a>.
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of the Unicode data files and any associated documentation a copy of the Unicode data files and any associated documentation
...@@ -284,14 +284,11 @@ <h3 align="center"><a name="Exhibit1">EXHIBIT 1</a><br> ...@@ -284,14 +284,11 @@ <h3 align="center"><a name="Exhibit1">EXHIBIT 1</a><br>
without restriction, including without limitation the rights to use, without restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, and/or sell copies of copy, modify, merge, publish, distribute, and/or sell copies of
the Data Files or Software, and to permit persons to whom the Data Files the Data Files or Software, and to permit persons to whom the Data Files
or Software are furnished to do so, provided that or Software are furnished to do so, provided that either
(a) this copyright and permission notice appear with all copies (a) this copyright and permission notice appear with all copies
of the Data Files or Software, of the Data Files or Software, or
(b) this copyright and permission notice appear in associated (b) this copyright and permission notice appear in associated
documentation, and Documentation.
(c) there is clear notice in each modified Data File or in the Software
as well as in the documentation associated with the Data File(s) or
Software that the data or software has been modified.
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
...@@ -307,10 +304,8 @@ <h3 align="center"><a name="Exhibit1">EXHIBIT 1</a><br> ...@@ -307,10 +304,8 @@ <h3 align="center"><a name="Exhibit1">EXHIBIT 1</a><br>
Except as contained in this notice, the name of a copyright holder Except as contained in this notice, the name of a copyright holder
shall not be used in advertising or otherwise to promote the sale, shall not be used in advertising or otherwise to promote the sale,
use or other dealings in these Data Files or Software without prior use or other dealings in these Data Files or Software without prior
written authorization of the copyright holder.</pre> written authorization of the copyright holder.
</td></tr></table> </pre>
</div>
</blockquote> </blockquote>
......
...@@ -1643,15 +1643,17 @@ AC_CHECK_HEADERS_ONCE( ...@@ -1643,15 +1643,17 @@ AC_CHECK_HEADERS_ONCE(
sys/resource.h sys/resource.h
sys/utsname.h pwd.h utmp.h util.h) sys/utsname.h pwd.h utmp.h util.h)
AC_MSG_CHECKING(if personality LINUX32 can be set) AC_CACHE_CHECK([for ADDR_NO_RANDOMIZE],
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])], [emacs_cv_personality_addr_no_randomize],
emacs_cv_personality_linux32=yes, [AC_COMPILE_IFELSE(
emacs_cv_personality_linux32=no) [AC_LANG_PROGRAM([[#include <sys/personality.h>]],
AC_MSG_RESULT($emacs_cv_personality_linux32) [[personality (personality (0xffffffff)
| ADDR_NO_RANDOMIZE)]])],
if test $emacs_cv_personality_linux32 = yes; then [emacs_cv_personality_addr_no_randomize=yes],
AC_DEFINE(HAVE_PERSONALITY_LINUX32, 1, [emacs_cv_personality_addr_no_randomize=no])])
[Define to 1 if personality LINUX32 can be set.]) if test $emacs_cv_personality_addr_no_randomize = yes; then
AC_DEFINE([HAVE_PERSONALITY_ADDR_NO_RANDOMIZE], [1],
[Define to 1 if personality flag ADDR_NO_RANDOMIZE exists.])
fi fi
# Note that Solaris has sys/sysinfo.h which defines struct # Note that Solaris has sys/sysinfo.h which defines struct
...@@ -2177,8 +2179,8 @@ elif test "$hybrid_malloc" = yes; then ...@@ -2177,8 +2179,8 @@ elif test "$hybrid_malloc" = yes; then
AC_DEFINE(HYBRID_MALLOC, 1, AC_DEFINE(HYBRID_MALLOC, 1,
[Define to use gmalloc before dumping and the system malloc after.]) [Define to use gmalloc before dumping and the system malloc after.])
HYBRID_MALLOC=1 HYBRID_MALLOC=1
GNU_MALLOC= GNU_MALLOC=no
GNU_MALLOC_reason="only before dumping" GNU_MALLOC_reason=" (only before dumping)"
GMALLOC_OBJ=gmalloc.o GMALLOC_OBJ=gmalloc.o
VMLIMIT_OBJ= VMLIMIT_OBJ=
else else
...@@ -3245,34 +3247,29 @@ fi ...@@ -3245,34 +3247,29 @@ fi
### Use -lXpm if available, unless '--with-xpm=no'. ### Use -lXpm if available, unless '--with-xpm=no'.
### mingw32 doesn't use -lXpm, since it loads the library dynamically. ### mingw32 doesn't use -lXpm, since it loads the library dynamically.
### In the Cygwin-w32 build, we need to use /usr/include/noX/X11/xpm.h ### The Cygwin-w32 build uses <noX/xpm.h> instead of <X11/xpm.h>, so
### rather than /usr/include/X11/xpm.h, so we set CPPFLAGS (and ### we need to set LDFLAGS accordingly.
### LDFLAGS) accordingly.
HAVE_XPM=no HAVE_XPM=no
LIBXPM= LIBXPM=
if test "${HAVE_W32}" = "yes" && test "${opsys}" = "cygwin"; then if test "${HAVE_W32}" = "yes" && test "${opsys}" = "cygwin"; then
if test "${with_xpm}" != "no"; then if test "${with_xpm}" != "no"; then
SAVE_CPPFLAGS="$CPPFLAGS"
SAVE_LDFLAGS="$LDFLAGS"