From bcc9e35de511709de077d23f882485a57ca79ec5 Mon Sep 17 00:00:00 2001 From: Kelvin White Date: Sun, 9 Nov 2014 08:36:43 -0500 Subject: [PATCH 1/7] backports: fix changelog --- lisp/erc/ChangeLog | 64 ++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 0875994e775..cf3f05bcea0 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,43 +1,28 @@ -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 +2014-11-09 Ivan Shmakov * erc-track.el (erc-modified-channels-display): Update mode line more frequently (bug#18510). -2014-10-10 Kelvin White +2014-11-09 Kelvin White * erc.el (erc-initialize-log-marker): Only initialize erc-last-saved-position if not already a marker. -2014-10-04 Stefan Monnier +2014-11-09 Stefan Monnier * erc.el (erc-channel-receive-names): Silence compiler warning. (erc-format-@nick, erc-update-modes): Idem. -2014-10-03 Kelvin White +2014-11-09 Kelvin White * erc.el (erc-rename-buffers): Use defcustom instead of defvar for buffer renaming configuration option. -2014-10-02 Paul Eggert +2014-11-09 Paul Eggert * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755). -2014-10-02 Kelvin White +2014-11-09 Kelvin White * erc.el (erc-rename-buffer-p): When set to t buffers will be renamed to the current irc network. @@ -46,7 +31,7 @@ * erc-ring.el (erc-input-ring-setup): Fixes Bug #18599 -2014-09-30 Stefan Monnier +2014-11-09 Stefan Monnier * erc-track.el (erc-modified-channels-display): Update all mode lines if needed (bug#18510). Remove call to erc-modified-channels-object @@ -54,11 +39,11 @@ (erc-modified-channels-update): Don't force-mode-line-update here any more. -2014-09-26 Kelvin White +2014-11-09 Kelvin White * erc.el (erc-format-nick): Fix code regression - Bug #18551 -2014-09-25 Kelvin White +2014-11-09 Kelvin White * erc.el: Follow Emacs version instead of tracking it seperately. (erc-quit/part-reason-default) : Clean up quit/part message @@ -68,27 +53,27 @@ (erc-cmd-SV, erc-ctcp-query-VERSION, erc-version, erc-version-string): Change version string. -2014-08-13 Kelvin White +2014-11-09 Kelvin White * erc.el (erc-send-input): Disable display commands in current buffer (erc-format-target-and/or-network): Fix cases when buffer name is set -2014-08-12 Stefan Monnier +2014-11-09 Stefan Monnier * erc-stamp.el (erc-timestamp-intangible): Disable by default because `intangible' is evil. -2014-08-07 Kelvin White +2014-11-09 Kelvin White * erc.el (erc-channel-receive-names): Fix variable names (erc-format-target-and/or-network): Rename server-buffers to network name if possible -2014-07-08 Stefan Monnier +2014-11-09 Stefan Monnier * erc.el (erc-channel-receive-names): Reduce redundancy. -2014-06-19 Kelvin White +2014-11-09 Kelvin White * erc-backend.el: Handle user modes in relevant server responses * erc.el: Better user mode support. @@ -102,10 +87,20 @@ (erc-channel-receive-names): Update channel users. (erc-nick-at-point): Return correct user info. -2014-04-04 Stefan Monnier +2014-11-04 Stefan Monnier - * erc.el (erc-invite-only-mode, erc-toggle-channel-mode): Simplify. - (erc-load-script): Tighten a regexp. + * erc.el (erc-send-input): Bind `str' dynamically (bug#18936). + +2014-10-20 Glenn Morris + + * Version 24.4 released. + +2014-09-24 Stefan Monnier + + * erc-track.el (erc-modified-channels-display): Update all mode lines + if needed (bug#18510). Remove call to erc-modified-channels-object + where we ignored the return value. + (erc-modified-channels-update): Don't force-mode-line-update here any more. 2014-02-25 Julien Danjou @@ -454,9 +449,9 @@ 2011-11-28 Mike Kazantsev (tiny change) - * erc-dcc.el (erc-dcc-ctcp-query-send-regexp): Update regexp to + * erc-dcc.el (erc-dcc-ctcp-query-send-regexp): Updated regexp to match quoted filenames with spaces inside. - (erc-dcc-handle-ctcp-send): Update regexp match group numbers, + (erc-dcc-handle-ctcp-send): Updated regexp match group numbers, added processing of escaped quotes and backslashes if filename itself was in quotes. @@ -719,3 +714,4 @@ See ChangeLog.08 for earlier changes. ;; coding: utf-8 ;; add-log-time-zone-rule: t ;; End: + From ea283d21fc5697f112fa19b8fce1d5042b377132 Mon Sep 17 00:00:00 2001 From: Kelvin White Date: Sun, 9 Nov 2014 08:46:24 -0500 Subject: [PATCH 2/7] Update version to 24.5 --- lisp/erc/ChangeLog | 5 +++++ lisp/erc/erc-backend.el | 4 ++-- lisp/erc/erc-button.el | 2 +- lisp/erc/erc-join.el | 4 ++-- lisp/erc/erc-match.el | 2 +- lisp/erc/erc-stamp.el | 2 +- lisp/erc/erc.el | 4 ++-- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index cf3f05bcea0..3b056da2e5e 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,8 @@ +2014-11-09 Kelvin White + + * 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 * erc-track.el (erc-modified-channels-display): Update mode line diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index fb22f58822d..2c6b03720f0 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -333,7 +333,7 @@ Good luck." This will only be consulted if the coding system in `erc-server-coding-system' is `undecided'." :group 'erc-server - :version "24.1" + :version "24.5" :type '(repeat coding-system)) (defcustom erc-server-coding-system (if (and (fboundp 'coding-system-p) @@ -400,7 +400,7 @@ isn't displayed." (defcustom erc-server-timestamp-format "%Y-%m-%d %T" "Timestamp format used with server response messages. This string is processed using `format-time-string'." - :version "24.3" + :version "24.5" :type 'string :group 'erc-server) diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 6e2c60cf6fa..b83fd9eeeb9 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -183,7 +183,7 @@ PAR is a number of a regexp grouping whose text will be passed to 'nicknames, these are ignored, and CALLBACK will be called with the nickname matched as the argument." :group 'erc-button - :version "24.3" ; remove finger (bug#4443) + :version "24.5" ; remove finger (bug#4443) :type '(repeat (list :tag "Button" (choice :tag "Matches" diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el index e47e6e0c89e..0a24cb864da 100644 --- a/lisp/erc/erc-join.el +++ b/lisp/erc/erc-join.el @@ -83,7 +83,7 @@ If the value is `ident', autojoin after successful NickServ identification, or after `erc-autojoin-delay' seconds. Any other value means the same as `connect'." :group 'erc-autojoin - :version "24.1" + :version "24.5" :type '(choice (const :tag "On Connection" connect) (const :tag "When Identified" ident))) @@ -93,7 +93,7 @@ This only takes effect if `erc-autojoin-timing' is `ident'. If NickServ identification occurs before this delay expires, ERC autojoins immediately at that time." :group 'erc-autojoin - :version "24.1" + :version "24.5" :type 'integer) (defcustom erc-autojoin-domain-only t diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index b10da96f6f4..a8a4e58362c 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -237,7 +237,7 @@ current-nick, keyword, pal, dangerous-host, fool" useful for excluding all the things like MOTDs from the server and other miscellaneous functions." :group 'erc-match - :version "24.3" + :version "24.5" :type 'boolean) ;; Internal variables: diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el index 39ffbb4bf38..37982069abe 100644 --- a/lisp/erc/erc-stamp.el +++ b/lisp/erc/erc-stamp.el @@ -151,7 +151,7 @@ the minibuffer." "Whether the timestamps should be intangible, i.e. prevent the point from entering them and instead jump over them." :group 'erc-stamp - :version "25.1" + :version "24.5" :type 'boolean) (defface erc-timestamp-face '((t :weight bold :foreground "green")) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 37b24eaaa60..4acb7340fb2 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -104,7 +104,7 @@ (defgroup erc-lurker nil "Hide specified message types sent by lurkers" - :version "24.3" + :version "24.5" :group 'erc-ignore) (defgroup erc-query nil @@ -5291,7 +5291,7 @@ into the ERC buffer, that text is not sent to the IRC server. If the value is nil, `erc-send-current-line' always considers any submitted line to be intentional." :group 'erc - :version "24.4" + :version "24.5" :type '(choice number (other :tag "disabled" nil))) (defun erc-send-current-line () From d29658759a1343995f0d8b163d7fe445dd904b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Sun, 9 Nov 2014 14:47:02 +0100 Subject: [PATCH 3/7] * 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. Fixes: debbugs:18757 --- src/ChangeLog | 9 +++++++++ src/nsterm.h | 2 +- src/nsterm.m | 18 +++++++++--------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7b595b5f9e9..0f9ef11c9d7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2014-11-09 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-08 Jan Djärv * nsterm.m (init): Replace OSX 10.9 check with IMPL_COCOA. diff --git a/src/nsterm.h b/src/nsterm.h index cc5ec0d014b..1c3fda82649 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -422,7 +422,7 @@ typedef float EmacsCGFloat; - repeatScroll: (NSTimer *)sender; - condemn; - reprieve; -- judge; +- (bool)judge; @end diff --git a/src/nsterm.m b/src/nsterm.m index 605baff00b2..9415922c6c9 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3853,6 +3853,7 @@ ns_set_vertical_scroll_bar (struct window *window, 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); unblock_input (); @@ -3951,8 +3952,8 @@ ns_judge_scroll_bars (struct frame *f) { view = [subviews objectAtIndex: i]; if (![view isKindOfClass: [EmacsScroller class]]) continue; - [view judge]; - removed = YES; + if ([view judge]) + removed = YES; } if (removed) @@ -7189,9 +7190,10 @@ if (cols > 0 && rows > 0) } -- judge +-(bool)judge { NSTRACE (judge); + bool ret = condemned; if (condemned) { EmacsView *view; @@ -7200,11 +7202,14 @@ if (cols > 0 && rows > 0) view = (EmacsView *)FRAME_NS_VIEW (frame); if (view != nil) view->scrollbarsNeedingUpdate++; + if (window) + wset_vertical_scroll_bar (window, Qnil); + window = 0; [self removeFromSuperview]; [self release]; unblock_input (); } - return self; + return ret; } @@ -7259,11 +7264,6 @@ if (cols > 0 && rows > 0) #endif } - /* Events may come here even if the event loop is not running. - If we don't enter the event loop, the scroll bar will not update. - So send SIGIO to ourselves. */ - if (apploopnr == 0) raise (SIGIO); - return self; } From 2ae1e0d427eaf8583875a31525eca42c0a9ebb99 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 9 Nov 2014 17:57:37 +0200 Subject: [PATCH 4/7] Fix bug #18995 with compiling w32heap.c with -funroll-loops. src/w32heap.c (allocate_heap): Set the lower limit of heap at 8MB. --- src/ChangeLog | 5 +++++ src/w32heap.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0f9ef11c9d7..c03218c21f9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-11-09 Eli Zaretskii + + * w32heap.c (allocate_heap): Set the lower limit of heap at 8MB. + (Bug#18995) + 2014-11-09 Jan Djärv * nsterm.h (EmacsScroller): judge returns bool. diff --git a/src/w32heap.c b/src/w32heap.c index 8ab2f58c6e7..4367f710643 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -96,7 +96,7 @@ static char * allocate_heap (void) { #ifdef _WIN64 - size_t size = 0x4000000000ull; /* start by asking for 32GB */ + size_t size = 0x4000000000ull; /* start by asking for 256GB */ #else /* We used to start with 2GB here, but on Windows 7 that would leave too little room in the address space for threads started by @@ -106,7 +106,7 @@ allocate_heap (void) #endif void *ptr = NULL; - while (!ptr && size > 0x00100000) + while (!ptr && size >= 0x00800000) { reserved_heap_size = size; ptr = VirtualAlloc (NULL, From ea75a0e069998158b47b774aae263529568f8b1c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 9 Nov 2014 18:40:43 +0200 Subject: [PATCH 5/7] Fix bug #18982 with assertion violations when reverting buffers. src/fileio.c (Finsert_file_contents): Invalidate buffer caches also when the inserted text does not need decoding. --- src/ChangeLog | 3 +++ src/fileio.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c03218c21f9..719ccec467d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2014-11-09 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) diff --git a/src/fileio.c b/src/fileio.c index fba64010b54..8570a1604a3 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4308,8 +4308,11 @@ by calling `format-decode', which see. */) coding_system = CODING_ID_NAME (coding.id); } else if (inserted > 0) - adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted, - inserted); + { + invalidate_buffer_caches (current_buffer, PT, PT + inserted); + adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted, + inserted); + } /* Call after-change hooks for the inserted text, aside from the case of normal visiting (not with REPLACE), which is done in a new buffer From 03400ec3333041b38153e002d0a242b09a55b23b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 9 Nov 2014 22:44:51 +0200 Subject: [PATCH 6/7] Fix bug #18955 with failure generating macuvs.h on MS-Windows. admin/unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use unmsys--file-name. --- admin/ChangeLog | 5 +++++ admin/unidata/Makefile.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 7a86773c04f..6dfd0ebafc2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2014-11-09 Eli Zaretskii + + * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use + unmsys--file-name. (Bug#18955) + 2014-11-09 Glenn Morris * admin.el (make-manuals-dist-output-variables) diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index 3074864bb68..26c91bd3dcf 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in @@ -37,7 +37,7 @@ all: ${top_srcdir}/src/macuvs.h ${DSTDIR}/charprop.el ${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt ${EMACS} -batch -l "${srcdir}/uvs.el" \ - --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: From edfdb22f674312389ccf5d5e37efa4d3f1516994 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 9 Nov 2014 23:12:37 -0800 Subject: [PATCH 7/7] * lisp/startup.el (command-line): Handle nil elements in load-path. --- lisp/ChangeLog | 4 ++++ lisp/startup.el | 1 + 2 files changed, 5 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3ecb7536e0..33777c5afa4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-11-10 Glenn Morris + + * startup.el (command-line): Handle nil elements in load-path. + 2014-11-08 Glenn Morris * emacs-lisp/bytecomp.el (byte-compile-report-error): diff --git a/lisp/startup.el b/lisp/startup.el index 54ed53e69c8..17930b4a7b0 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1319,6 +1319,7 @@ the `--debug-init' option to view a complete error backtrace." (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))