From: Eli Zaretskii Date: Tue, 14 Oct 2014 18:10:37 +0000 (+0300) Subject: Merge from trunk and resolve conflicts. X-Git-Tag: emacs-25.0.90~2635^2~679^2~50^2~3 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/e3060a0c4d2f418ac786775109d71e5843ccf42e Merge from trunk and resolve conflicts. --- e3060a0c4d2f418ac786775109d71e5843ccf42e diff --cc admin/unidata/Makefile.in index 8234de1dd7,4649b3b339..05d3f929f1 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in @@@ -50,19 -50,26 +50,28 @@@ ${top_srcdir}/src/macuvs.h: ${srcdir}/u unidata.txt: ${srcdir}/UnicodeData.txt sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < $< > $@ - ${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt \ - ${srcdir}/BidiMirroring.txt ${srcdir}/BidiBrackets.txt | \ + FORCE = + FORCE: + .PHONY: FORCE + -${unidir}/charprop.el: ${FORCE} ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt | \ ++${unidir}/charprop.el: ${FORCE} ${srcdir}/unidata-gen.el \ ++ ${srcdir}/UnicodeData.txt ${srcdir}/BidiMirroring.txt \ ++ ${srcdir}/BidiBrackets.txt | \ ${srcdir}/unidata-gen.elc unidata.txt -if [ -f "$@" ]; then \ - cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \ + cd ${unidir} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \ fi ${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \ - ${srcdir} "${DSTDIR}" + ${srcdir} "${unidir}" - ## Like the above, but generate in PWD rather than lisp/international. - charprop.el: ${srcdir}/unidata-gen.elc unidata.txt BidiMirroring.txt BidiBrackets.txt - ${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \ - ${srcdir} + ## Check for deleted uni- files, and if any such, force a rebuild. + ## Perhaps a more elegant way would be for the previous rule + ## to generate a Makefile fragment explicitly listing the uni- files, + ## which this file could include. If no fragment, rebuild everything. + unifiles: ${unidir}/charprop.el + for f in `sed -n 's/^;; FILE: //p' < $<`; do \ + [ -f ${unidir}/$$f ] || { ${MAKE} $< FORCE=FORCE || exit 1; break; };\ + done .PHONY: clean bootstrap-clean distclean maintainer-clean extraclean diff --cc admin/unidata/unidata-gen.el index 0dc02c996e,ec4f9d154d..d10b260b47 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el @@@ -1198,38 -1170,14 +1196,44 @@@ Property value is a symbol `o' (Open), (setq tail (setcdr tail (list (list char mirror))))))) (cdr head))) +(defun unidata-gen-brackets-list () + (let ((head (list nil)) + tail) + (with-temp-buffer + (insert-file-contents (expand-file-name "BidiBrackets.txt" unidata-dir)) + (goto-char (point-min)) + (setq tail head) + (while (re-search-forward + "^\\([0-9A-F]+\\);\\s +\\([0-9A-F]+\\);\\s +\\([oc]\\)" + nil t) + (let ((char (string-to-number (match-string 1) 16)) + (paired (match-string 2))) + (setq tail (setcdr tail (list (list char paired))))))) + (cdr head))) + +(defun unidata-gen-bracket-type-list () + (let ((head (list nil)) + tail) + (with-temp-buffer + (insert-file-contents (expand-file-name "BidiBrackets.txt" unidata-dir)) + (goto-char (point-min)) + (setq tail head) + (while (re-search-forward + "^\\([0-9A-F]+\\);\\s +\\([0-9A-F]+\\);\\s +\\([oc]\\)" + nil t) + (let ((char (string-to-number (match-string 1) 16)) + (type (match-string 3))) + (setq tail (setcdr tail (list (list char type))))))) + (cdr head))) + ;; Verify if we can retrieve correct values from the generated ;; char-tables. + ;; + ;; Use like this: + ;; + ;; (let ((unidata-dir "/path/to/admin/unidata")) + ;; (unidata-setup-list "unidata.txt") + ;; (unidata-check)) (defun unidata-check () (dolist (elt unidata-prop-alist) diff --cc doc/lispref/ChangeLog index 151fb0005a,3955bd09b3..b8f17c0fae --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,8 -1,126 +1,131 @@@ + 2014-10-13 Glenn Morris + + * Makefile.in (dist): Update for new output variables. + + 2014-10-12 Glenn Morris + + * elisp.texi (DATE): Bump to October 2014. + + 2014-10-09 Glenn Morris + + * frames.texi (Multiple Terminals): Copyedits. + + 2014-10-09 Eli Zaretskii + + * frames.texi (Multiple Terminals): Improve the description of X + display names. Add index entries. + (Basic Parameters): Add a cross-reference to where X display names + are described. + (Position Parameters): Mention that positional parameters of the + form (+ POS) can be negative if they are on a non-primary monitor + of a multi-monitor display. (Bug#18636) + (Creating Frames): Mention that on multi-monitor displays the + frame might be positioned differently than specified by the frame + parameters alist. + + 2014-10-08 Leo Liu + + * streams.texi (Output Functions): Document new argument ENSURE to + terpri. (Bug#18652) + + 2014-10-04 Martin Rudalics + + * display.texi (Scroll Bars): Add description of horizontal scroll + bars and associated functions. + * frames.texi (Layout Parameters): Add horizontal scroll bar + entries. Remove paragraph on "combined fringe widths". + * windows.texi (Window Sizes): Describe affects of horizontal + scroll bars on window layout and sizes. Fix description of + window-full-height-p. + (Resizing Windows): Mention horizontal scroll bar. + + 2014-10-04 Glenn Morris + + * commands.texi (Generic Commands): Copyedits. + + * display.texi (Scroll Bars): + * modes.texi (Header Lines): Copyedits. + + * buffers.texi (Buffer List): + * display.texi (Image Descriptors, Defining Images): + * functions.texi (Core Advising Primitives): Small fixes re @var usage. + + * windows.texi (Window Sizes, Resizing Windows): Copyedits. + + * frames.texi (Multiple Terminals): Copyedits re multiple monitors. + + 2014-10-03 Martin Rudalics + + * frames.texi (Size Parameters, Size and Position): Mention that + with some window managers you have to set `frame-resize-pixelwise' + in order make a frame truly fullscreen or maximized. + + 2014-10-01 Paul Eggert + + Improve doc for use of 'int', and discuss 'ssize_t'. + * internals.texi (C Integer Types): Mention 'int' for other + randomish values that lie in 'int' range. Mention 'ssize_t'. See: + http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00019.html + + Use AUTO_CONS instead of SCOPED_CONS, etc. + * internals.texi (Stack-allocated Objects): + Adjust to match the revised, less error-prone macros. + + 2014-09-30 Paul Eggert + + * internals.texi (Stack-allocated Objects): Further improvements. + Give an example of misuse. + + 2014-09-30 Eli Zaretskii + + * internals.texi (Stack-allocated Objects): Minor improvements of + the wording and the indexing. + + 2014-09-30 Dmitry Antipov + + * internals.texi (Stack-allocated Objects): Describe this feature. + + 2014-09-15 Daniel Colascione + + * text.texi (Registers): Make `insert-register' documentation + reflect interface change. + + 2014-09-08 Stefan Monnier + + * functions.texi (Core Advising Primitives): Add a note about the + confusing treatment of `interactive' for :filter-args (bug#18399). + + 2014-09-07 Michael Albinus + + * strings.texi (Text Comparison): Describe `string-collate-equalp' + and `string-collate-lessp'. + + 2014-09-06 Leo Liu + + * control.texi (Pattern matching case statement): Document vector + qpattern. (Bug#18327) + + 2014-08-29 Dmitry Antipov + + * lists.texi (Functions that Rearrange Lists): Remove + description of sort ... + * sequences.texi (Sequence Functions): ... and generalize + it for sequences. Add an example. + + 2014-08-28 Eli Zaretskii + + * display.texi (Bidirectional Display): Update the Emacs's class + of bidirectional conformance. + + 2014-08-27 Dmitry Antipov + + * eval.texi (Eval): Mention possible recovery from stack overflow. + +2014-10-13 Eli Zaretskii + + * display.texi (Bidirectional Display): Update the version of the + UBA to which we are conforming. + 2014-07-11 Eli Zaretskii * internals.texi (Garbage Collection): Fix last change. diff --cc etc/ChangeLog index 9c3643edd3,711208e0e3..c74f86b1fb --- a/etc/ChangeLog +++ b/etc/ChangeLog @@@ -1,7 -1,87 +1,91 @@@ + 2014-10-13 Jan Djärv + + * NEWS: Move and clarify OSX >= 10.6. + + 2014-10-12 Jan Djärv + + * NEWS: OSX required is 10.6 or newer. + + 2014-10-09 Leo Liu + + * NEWS: Mention optional arg to terpri and new cl-lib functions. + + 2014-10-05 Jan Djärv + + * NEWS: Mention ns-use-fullscreen-animation. + + 2014-09-30 Bill Wohler + + Release MH-E version 8.6 + + * NEWS, MH-E-NEWS: Update for MH-E release 8.6. + + 2014-09-30 Fabrice Niessen + + * themes/leuven-theme.el: Updates. + + 2014-09-30 Stefan Monnier + + * package-keyring.gpg: New file. + + 2014-09-30 Paul Eggert + + * TODO: Remove char/unsigned char, long long, IRIX unexelf.c. + The first two are done, and IRIX support has been dropped. + + 2014-09-29 Eli Zaretskii + + * refcards/ru-refcard.tex: Bump version to 25.0.50. + + * refcards/emacsver.tex: Bump version to 25.0.50. + + 2014-09-14 Daniel Colascione + + * NEWS: Mention changes to `insert-register' + + 2014-09-13 Christopher Schmidt + + * NEWS: Mention nil `calendar-mode-line-format' will not modify + the mode line of the calendar buffer. (Bug#18467) + + 2014-09-06 Leo Liu + + * NEWS: Mention vector qpattern for pcase. (Bug#18327). + + 2014-09-01 Eli Zaretskii + + * NEWS: Mention that ls-lisp uses string-collate-lessp. + + 2014-09-01 Paul Eggert + + --enable-silent-rules now suppresses more chatter. + * NEWS: Document this. + + 2014-08-29 Leo Liu + + * NEWS: Mention (:append FUN) to minibuffer-with-setup-hook. + + 2014-08-29 Eli Zaretskii + + * NEWS: Mention w32-collate-ignore-punctuation. + + 2014-08-29 Dmitry Antipov + + * NEWS: Mention that `sort' can handle vectors. + + 2014-08-28 Glenn Morris + + * emacs.appdata.xml: New file; description from Emacs's homepage. + + 2014-08-25 Eli Zaretskii + + * NEWS: Mention that string-collate-* functions are supported on + MS-Windows as well. + +2014-10-13 Eli Zaretskii + + * NEWS: Mention the UBA implementation update. + 2014-08-08 Jan Nieuwenhuizen * compilation.txt (file): Add Guile backtrace example. diff --cc etc/NEWS index 0260abda5e,e336ff5b98..6c27831e6f --- a/etc/NEWS +++ b/etc/NEWS @@@ -76,16 -110,18 +110,26 @@@ character in the pasted text as actual paste experience similar to that under a window system, and significant performance improvements when pasting large amounts of text. +** Emacs now supports the latest version of the UBA. +The Emacs implementation of the Unicode Bidirectional Algorithm (UBA) +was updated to support all the latest additions and changes introduced +in Unicode Standard versions 6.3 and 7.0, and a few changes suggested +for Unicode 8.0. This includes full support for directional isolates +and the Bidirectional Parentheses Algorithm (BPA) specified by these +Unicode standards. + - * Changes in Specialized Modes and Packages in Emacs 24.5 + * Changes in Specialized Modes and Packages in Emacs 25.1 + + ** ElDoc + *** New minor mode global-eldoc-mode + *** eldoc-documentation-function now defaults to nil + + ** pcase + *** New UPatterns `quote' and `app'. + *** New UPatterns can be defined with `pcase-defmacro'. + +++ + *** New vector QPattern. ** Lisp mode *** Strings after `:documentation' are highlighted as docstrings.