From: Glenn Morris Date: Mon, 10 Nov 2014 07:39:35 +0000 (-0800) Subject: Merge from emacs-24; up to 117698 X-Git-Tag: emacs-25.0.90~2635^2~508 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe Merge from emacs-24; up to 117698 --- c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe diff --cc admin/ChangeLog index 17de5a4990,6dfd0ebafc..1c43950489 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,38 -1,8 +1,43 @@@ -2014-11-09 Eli Zaretskii ++2014-11-10 Eli Zaretskii + + * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use + unmsys--file-name. (Bug#18955) + +2014-11-10 Glenn Morris + + * admin.el (set-version): No need to update doc/man/emacs.1. + + * admin.el (set-version): No need to update etc/refcards/emacsver.tex. + (set-copyright): Update etc/refcards/emacsver.tex.in. + + * admin.el (set-version): No need to update doc/emacs/emacsver.texi. + (make-manuals-dist-output-variables): Add top_srcdir. + (make-manuals-dist--1): Handle @version@ specially. + +2014-11-09 Eric Ludlam + + * grammars/c.by (template-type): Add :template-specifier and + :typevar to capture extra details about the template. + (opt-post-fcn-modifiers): Splice in the found symbol into the + return value correctly. + (QUESTION): New punctuation. + (expression): Add ternary conditional support. + + * grammars/scheme.by (MODULE): New token. + (scheme): Handle expanding the MODULE tag. + (scheme-list): Remove closeparen required match. + (scheme-in-list): Remove extraneous matches for DEFINE. Add + support for MODULE Simplify matching for code & make work. + (name-args, name-arg-list, name-arg-expand): Make it work. + +2014-11-09 David Engster + + * grammars/c.by (opt-brackets-after-symbol): New. + (multi-stage-dereference): Use it. Add rules for explicit + matching the last dereference. We cannot just juse + 'namespace-symbol' as a single rule, since this would match too + greedy and mess with parsing default values of variables. + 2014-11-09 Glenn Morris * admin.el (make-manuals-dist-output-variables) diff --cc admin/unidata/Makefile.in index 05d3f929f1,26c91bd3dc..94504818d1 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in @@@ -28,23 -28,19 +28,23 @@@ top_srcdir = @top_srcdir top_builddir = @top_builddir@ EMACS = ${top_builddir}/src/emacs -DSTDIR = ${top_srcdir}/lisp/international +unidir = ${top_srcdir}/lisp/international emacs = "${EMACS}" -batch --no-site-file --no-site-lisp -.PHONY: all compile install +.PHONY: all unifiles -all: ${top_srcdir}/src/macuvs.h ${DSTDIR}/charprop.el +all: ${top_srcdir}/src/macuvs.h unifiles -${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt - ${EMACS} -batch -l "${srcdir}/uvs.el" \ +## Specify .elc as an order-only prereq so as to not needlessly rebuild +## target just because the .elc is missing. +## Same with charprop.el below. +${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \ + ${srcdir}/uvs.elc + ${emacs} -L ${srcdir} -l uvs \ - --eval '(uvs-print-table-ivd "${srcdir}/IVD_Sequences.txt" "Adobe-Japan1")' \ + --eval '(uvs-print-table-ivd (unmsys--file-name "${srcdir}/IVD_Sequences.txt") "Adobe-Japan1")' \ > $@ -.el.elc: +%.elc: %.el ${emacs} -f batch-byte-compile $< unidata.txt: ${srcdir}/UnicodeData.txt diff --cc lisp/ChangeLog index 94473f03b7,33777c5afa..c170c50c9f --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,52 -1,7 +1,56 @@@ + 2014-11-10 Glenn Morris + + * startup.el (command-line): Handle nil elements in load-path. + +2014-11-10 Stefan Monnier + + * help.el (view-lossage): Include the actual commands run. + +2014-11-10 Dmitry Gutov + + * vc/vc-dir.el (vc-dir-hide-state): Also hide `ignored' items when + no state is specified. (Bug#18964) + +2014-11-09 Eric Ludlam + + * emacs-lisp/eieio-custom.el (eieio-customize-object): + Set eieio-cog (current group) to g, which is an improved form of input + group. + +2014-11-09 Juri Linkov + + * isearch.el (isearch-message-prefix): Show "Multi-file" and + "Multi-buffer" instead of "Multi". (Bug#13592) + + * misearch.el (multi-isearch-file-list): + Autoload multi-isearch-buffer-list and multi-isearch-file-list. + (multi-isearch-end): Reset multi-isearch-buffer-list and + multi-isearch-file-list to nil. + +2014-11-09 Stefan Monnier + + * emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment): + Don't call byte-compile-preprocess since the result will go through + cconv. + (byte-compile-output-docform): Handle uninterned `name' correctly. + * emacs-lisp/cl-macs.el (cl-define-compiler-macro): Use interned name + to circumvent byte-compiler bug. + + * emacs-lisp/macroexp.el (macroexp--expand-all): Fix typo. + (macroexp--compiler-macro): Remove left-over debug code. + + * emacs-lisp/cl-extra.el (cl-get): Silence compiler warning. + +2014-11-08 Juri Linkov + + * simple.el (shell-command): Use buffer-name when output-buffer is + a buffer. (Bug#18096) + +2014-11-08 Juri Linkov + + * minibuffer.el (minibuffer-completion-help): Compare this-command + with completion-at-point. (Bug#17809) + 2014-11-08 Glenn Morris * emacs-lisp/bytecomp.el (byte-compile-report-error): diff --cc lisp/erc/ChangeLog index 0875994e77,3b056da2e5..475b99edb9 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@@ -1,19 -1,9 +1,24 @@@ -2014-11-09 Kelvin White ++2014-11-10 Kelvin White + - * erc-match.el, erc-join.el, erc-stamp.el, erc-backend.el, erc.el, - erc-button.el: Update version to 24.5. ++ * erc-match.el, erc-join.el, erc-stamp.el, erc-backend.el, erc.el: ++ * erc-button.el: Update version to 24.5. + -2014-11-09 Ivan Shmakov +2014-11-05 Stefan Monnier + + * erc.el (erc-send-input): Bind `str' dynamically (bug#18936). + +2014-10-29 Paul Eggert + + Simplify use of current-time and friends. + * erc-backend.el (TOPIC): Omit unnecessary call to current-time. + * erc.el (erc-emacs-time-to-erc-time): Simplify by using float-time. + (erc-current-time): Simplify by using erc-emacs-time-to-erc-time. + +2014-10-20 Glenn Morris + + * Merge in all changes up to 24.4 release. + +2014-10-15 Ivan Shmakov * erc-track.el (erc-modified-channels-display): Update mode line more frequently (bug#18510). diff --cc lisp/startup.el index a1d1c3120f,17930b4a7b..c04b16c43c --- a/lisp/startup.el +++ b/lisp/startup.el @@@ -1286,6 -1319,8 +1286,7 @@@ the `--debug-init' option to view a com (let (warned) (dolist (dir load-path) (and (not warned) + (stringp dir) - (string-match-p "/[._]emacs\\.d/?\\'" dir) (string-equal (file-name-as-directory (expand-file-name dir)) (expand-file-name user-emacs-directory)) (setq warned t) diff --cc src/ChangeLog index b51f3c15a6,719ccec467..d44de652dd --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,24 -1,24 +1,38 @@@ -2014-11-09 Eli Zaretskii ++2014-11-10 Eli Zaretskii + + * fileio.c (Finsert_file_contents): Invalidate buffer caches also + when the inserted text does not need decoding. (Bug#18982) + - * w32heap.c (allocate_heap): Set the lower limit of heap at 8MB. - (Bug#18995) - -2014-11-09 Jan Djärv ++2014-11-10 Jan Djärv + + * nsterm.h (EmacsScroller): judge returns bool. + + * nsterm.m (ns_set_vertical_scroll_bar): Release bar. + (ns_judge_scroll_bars): Only set removed if judge returns true. + (judge): Returns bool == condemned. Remove self from window. + (setPosition:portion:whole:): Remove raise SIGIO (Bug#18757). + +2014-11-10 Stefan Monnier + + * keyboard.c (command_loop_1): Record this-command in recent-keys. + (Frecent_keys): Rewrite. and add optional `include-cmds' arg. + +2014-11-09 Jan Djärv + + * nsterm.m (ns_set_vertical_scroll_bar) + (ns_set_horizontal_scroll_bar): Cleanup merge error. + +2014-11-09 Paul Eggert + + * xgselect.c (xg_select): Don't assume n_gfds is nonnegative + merely because tmo_in_millisec is nonnegative. The 1st call + to g_main_context_query could succeed while the 2nd one fails. + + * frame.c (Fcan_run_window_configuration_change_hook): Return a value. + 2014-11-08 Jan Djärv - * nsterm.m (init): Replace OSX 10.9 check with IMPL_COCOA. - (run): Ditto. Only use non-system event loop if OSX version is + * nsterm.m (run): Only use non-system event loop if OSX version is exactly 10.9 (Bug#18993). (ns_set_vertical_scroll_bar): Don't call bar setPosition: unless needed (Bug#18757). diff --cc src/nsterm.m index 577b2a2772,9415922c6c..64951da308 --- a/src/nsterm.m +++ b/src/nsterm.m @@@ -3803,8 -3853,9 +3803,9 @@@ ns_set_vertical_scroll_bar (struct wind bar = XNS_SCROLL_BAR (window->vertical_scroll_bar); [bar removeFromSuperview]; wset_vertical_scroll_bar (window, Qnil); + [bar release]; } - ns_clear_frame_area (f, sb_left, top, width, height); + ns_clear_frame_area (f, left, top, width, height); unblock_input (); return; }