]> git.eshelyaron.com Git - emacs.git/log
emacs.git
7 years agoTweak TLS error messaging on closed connections
Lars Ingebrigtsen [Tue, 24 Jan 2017 23:23:28 +0000 (00:23 +0100)]
Tweak TLS error messaging on closed connections

* src/gnutls.c (emacs_gnutls_handle_error): Demote the normal
peer-closed-connection "The TLS connection was non-properly
terminated" message to a lower level so that it isn't shown to
the user by default.

7 years agoAvoid having eww unexpectedly open external browsers
Lars Ingebrigtsen [Tue, 24 Jan 2017 22:39:05 +0000 (23:39 +0100)]
Avoid having eww unexpectedly open external browsers

* lisp/net/eww.el (eww-render): Instead of opening unsupported
content types like audio/mpeg directly in an external browser
(which can be very confusing especially when something
redirects to a file like that), just display a simple
interstitial that people can choose to click on or not
(bug#22671).

7 years agoWhen opening new eww buffers, use buffer names based on the host name
Lars Ingebrigtsen [Tue, 24 Jan 2017 21:40:57 +0000 (22:40 +0100)]
When opening new eww buffers, use buffer names based on the host name

* lisp/net/eww.el (eww-browse-url): When opening in a new
window, use a buffer name based on the host name (bug#23738).
(eww--dwim-expand-url): Refactored out into its own function
for easier reuse.

7 years agoxml: Fix parsing of default namespace with quoted names
David Engster [Tue, 24 Jan 2017 21:47:53 +0000 (22:47 +0100)]
xml: Fix parsing of default namespace with quoted names

* lisp/xml.el (xml-parse-attlist): Properly extract namespace when
  parsing is done with quoted symbol names (bug#23440).
* test/lisp/xml-tests.el (xml-parse-test--default-namespace-qnames)
  (xml-parse-test-default-namespace-qnames): Test for the above.

7 years agoFix rendering of some complex SVG images
Lars Ingebrigtsen [Tue, 24 Jan 2017 21:21:45 +0000 (22:21 +0100)]
Fix rendering of some complex SVG images

* lisp/net/shr.el (shr-parse-image-data): Don't transform
SVG->DOM->XML unless we're blocking images, as this is apt to
destroy the SVG (bug#24111).

7 years agoClarify the last clarification
Lars Ingebrigtsen [Tue, 24 Jan 2017 20:33:51 +0000 (21:33 +0100)]
Clarify the last clarification

* lisp/net/shr.el (shr-width): Clarify the interaction with
`shr-use-fonts' (bug#24928).

7 years agoshr-width doc clarification
Lars Ingebrigtsen [Tue, 24 Jan 2017 20:31:17 +0000 (21:31 +0100)]
shr-width doc clarification

* lisp/net/shr.el (shr-width): Clarify the interaction with
`shr-use-fonts' (bug#24928).

7 years agoAllow passing in max-width/height
Lars Ingebrigtsen [Tue, 24 Jan 2017 20:17:09 +0000 (21:17 +0100)]
Allow passing in max-width/height

* lisp/net/shr.el (shr-rescale-image): Allow passing in
max-width/height (bug#25287).

7 years ago* lisp/progmodes/vhdl-mode.el: Avoid add-to-list on local vars
Stefan Monnier [Tue, 24 Jan 2017 16:31:11 +0000 (11:31 -0500)]
* lisp/progmodes/vhdl-mode.el: Avoid add-to-list on local vars

Require `cl' for `pushnew'.
(vhdl-scan-project-contents, vhdl-compose-wire-components)
(vhdl-uniquify): Use `pushnew' instead of `add-to-list'.

7 years agoFix comment detection on open parens
Noam Postavsky [Sun, 18 Dec 2016 05:00:30 +0000 (00:00 -0500)]
Fix comment detection on open parens

Characters having both open paren syntax and comment start syntax were
being detected as open parens even when they should have been part a
comment starter (Bug#24870).

* src/syntax.c (in_2char_comment_start): New function, extracted from
`scan_sexps_forward'.
(scan_sexps_forward): Add check for a 2-char comment starter before the
loop.  Inside the loop, do that check after incrementing the 'from'
character index.  Move the single char comment syntax cases into the
switch instead of special casing them before.
* test/src/syntax-tests.el (parse-partial-sexp-paren-comments):
(parse-partial-sexp-continue-over-comment-marker): New tests.

7 years agoGive , and .@ doc strings. Fixes bug #24561.
Alan Mackenzie [Mon, 23 Jan 2017 19:00:49 +0000 (19:00 +0000)]
Give , and .@ doc strings.  Fixes bug #24561.

Also make *Help* links to ``' possible.  Also make usable as such doc strings
on the function-documentation property of a symbol.

* lisp/emacs-lisp/backquote.el (top-level): Give , and '@ doc strings on the
function-documentation property.  Also give these symbols a reader-construct
property.

* lisp/help-fns.el (describe-function): Allow the function-documentation
property to work.  Use princ rather than prin1 to print the function's name
when it has a reader-construct property.
(help-fns-signature): Don't insert `high-usage' for a reader-construct.
(describe-function-1): Adapt to process documentation on the
function-documentation property.  Print "a reader construct" when appropriate.

* lisp/help-mode.el (help-xref-symbol-regexp): Amend this regexp also to match
``'.

7 years ago; Fix previous commit
Mark Oteiza [Sun, 22 Jan 2017 15:18:42 +0000 (10:18 -0500)]
; Fix previous commit

* lisp/play/dunnet.el (dun-drop): Nix assignment of nonexistent binding.

7 years agoImprove uses of CHECK_LIST etc.
Paul Eggert [Sun, 22 Jan 2017 08:18:40 +0000 (00:18 -0800)]
Improve uses of CHECK_LIST etc.

* src/eval.c (FletX): Report an error for invalid constructs like
‘(let* (a . 0))’, so that ‘let*’ is more consistent with ‘let’.
(lambda_arity): Use plain CHECK_CONS.
* src/fns.c (CHECK_LIST_END): Move from here to lisp.h.
(Fcopy_alist): Remove unnecessary CHECK_LIST call, since
concat does that for us.
(Fnthcdr, Fmember, Fmemql, Fdelete, Fnreverse):
Use CHECK_LIST_END, not CHECK_LIST_CONS.  This hoists a
runtime check out of the loop.
(Fmemq): Simplify and use CHECK_LIST_END instead of CHECK_LIST.
(Fassq, Fassoc, Frassq, Frassoc):
Simplify and use CHECK_LIST_END instead of CAR.
(assq_no_quit, assoc_no_quit): Simplify and assume proper list.
(Fnconc): Use plain CHECK_CONS, and do-while instead of while loop.
* src/fontset.c (Fnew_fontset):
* src/frame.c (Fmodify_frame_parameters):
Use CHECK_LIST_END at end, rather than CHECK_LIST at start, for a
more-complete check.
* src/gfilenotify.c (Fgfile_add_watch):
Omit unnecessary CHECK_LIST, since Fmember does that for us.
* src/lisp.h (lisp_h_CHECK_LIST_CONS, CHECK_LIST_CONS):
Remove; no longer used.
(CHECK_LIST_END): New inline function.

7 years agoPrevent to use tabulated-list--near-rows unbound
Tino Calancha [Sun, 22 Jan 2017 05:23:45 +0000 (14:23 +0900)]
Prevent to use tabulated-list--near-rows unbound

* lisp/emacs-lisp/tabulated-list.el (tabulated-list-print-entry):
Make sure 'tabulated-list--near-rows' is bound before use it (Bug#25506).

7 years ago* lisp/simple.el (region-bounds): New function.
Juri Linkov [Sat, 21 Jan 2017 23:18:53 +0000 (01:18 +0200)]
* lisp/simple.el (region-bounds): New function.

(region-noncontiguous-p): Use it.
http://lists.gnu.org/archive/html/emacs-devel/2017-01/msg00044.html

7 years ago; * etc/NEWS: Describe how to disable double-buffering. (Bug#25474)
Eli Zaretskii [Sat, 21 Jan 2017 18:31:33 +0000 (20:31 +0200)]
; * etc/NEWS: Describe how to disable double-buffering.  (Bug#25474)

7 years agoFix low-level handling of (big) C macros.
Alan Mackenzie [Sat, 21 Jan 2017 15:14:15 +0000 (15:14 +0000)]
Fix low-level handling of (big) C macros.

In particular, ensure that a comment detected by its syntax is not a CPP
construct marked with generic comment delimiter syntax-table text
properties.

* lisp/progmodes/cc-engine.el (c-beginning-of-macro, c-end-of-macro): Set
c-macro-cache-syntactic to nil when the cached macro changes.
(c-syntactic-end-of-macro, c-no-comment-end-of-macro)
(c-state-semi-pp-to-literal, c-state-full-pp-to-literal)
(c-state-pp-to-literal, c-parse-ps-state-to-cache)
(c-state-cache-non-literal-place, c-literal-limits, c-literal-start)
(c-determine-limit): When checking a parse syntax for a comment, check that
we're not in a CPP construct marked by syntax-table generic comment delimiter
text property.
(c-state-pp-to-literal): Change from a defsubst to a defun.

* lisp/progmodes/cc-mode.el (c-neutralize-syntax-in-and-mark-CPP): Check a
parse syntax as described above under cc-engine.el.

7 years agoDon't wait for frame to become visible
Noam Postavsky [Sat, 14 Jan 2017 00:47:22 +0000 (19:47 -0500)]
Don't wait for frame to become visible

* src/xterm.c (x_make_frame_visible): Remove code that waits for the
frame to become visible.  We have to deal with invisible frames anyway,
the loop could sometimes before the frame turned visible, and for some
window managers (e.g., XMonad, i3wm) it caused Emacs to get stuck in a
busy loop (Bug#24091).

7 years agodiff-hunk-kill independent of point inside headers
Tino Calancha [Sat, 21 Jan 2017 02:54:55 +0000 (11:54 +0900)]
diff-hunk-kill independent of point inside headers

Make diff-apply-hunk and diff-hunk-kill independent of the point
position in a diff header (Bug#17544).
This change allows to apply hunks in order.  It also makes possible to
press M-k repeatedly to kill hunks in the order they appear in the buffer.
See discussion on #Bug25105.
* lisp/vc/diff-mode.el (diff-file-junk-re):
Move definition before it's used.
(diff--at-diff-header-p): New predicate; return non-nil when point
is inside a hunk header, a file header, or within a line
matching diff-file-junk-re.
(diff-beginning-of-hunk): Use it.
Check if the point is inside a diff header, in the middle of a hunk,
or before the first hunk.
(diff-apply-hunk): Call diff-beginning-of-hunk with non-nil arg
before apply the hunk.
(diff-hunk-kill, diff-file-kill):
Call diff-beginning-of-hunk with non-nil arg after kill the hunks.
(diff-post-command-hook): Call diff-beginning-of-hunk with non-nil argument.

7 years ago; Revert "Improve diff-mode navigation/manipulation"
Tino Calancha [Sat, 21 Jan 2017 02:54:38 +0000 (11:54 +0900)]
; Revert "Improve diff-mode navigation/manipulation"

This reverts commit 2c8a7e50d24daf19ea7d86f1cfeaa98a41c56085.
This change causes regressions:
https://lists.gnu.org/archive/html/emacs-devel/2016-11/msg00738.html
The following related commits are reverted as well:
61c6a10e3110490dadac4577cc540053341ff25c
a283d655db88cdcc8cb53d8e2578e1cdf751c84b
6b6abe0dba6a9a2e5f78aac3814421886e7a184f
e5ef59b87da5c2ddfa22f7342efe29b3eea6ed97
73349822cbd6e50526eda9c75453584d73dfca83

Fixes: debbugs:25105, 25400.
7 years agoFix free var FOO-mode-{syntax,abbrev}-table warnings
Noam Postavsky [Sat, 14 Jan 2017 06:47:52 +0000 (01:47 -0500)]
Fix free var FOO-mode-{syntax,abbrev}-table warnings

* lisp/emacs-lisp/derived.el (define-derived-mode): Unconditionally
defvar the syntax and abbrev tables so that the compiler will know that
they are dynamically bound variables (Bug#25446).

7 years agoCheck that variable lists are actually lists
Philipp Stephani [Wed, 18 Jan 2017 18:49:58 +0000 (19:49 +0100)]
Check that variable lists are actually lists

'let' and 'let*' document that their first argument has to be a list,
but don't check for that; instead, they allow (and silently ignore)
other types.  Introduce an explicit type check.

* src/eval.c (Flet, FletX): Check that the variable list is indeed a
list.
* test/src/eval-tests.el: Add unit tests.

7 years agoAvoid inefficient regex in diff-refine-hunk (Bug#25410)
Noam Postavsky [Fri, 13 Jan 2017 04:32:44 +0000 (23:32 -0500)]
Avoid inefficient regex in diff-refine-hunk (Bug#25410)

* lisp/vc/diff-mode.el (diff--forward-while-leading-char): New function.
(diff-refine-hunk): Use it instead of trying to match multiple lines
with a single lines.

7 years agoRemove lock file when auto-saving into the visited file
Eli Zaretskii [Wed, 18 Jan 2017 18:36:14 +0000 (20:36 +0200)]
Remove lock file when auto-saving into the visited file

* src/fileio.c (write_region): When auto-saving into the visited
file, unlock the file whenever we mark the buffer unmodified.
(Bug#25470)

7 years agoFix a bug with signaling a thread that waits for condvar
Eli Zaretskii [Wed, 18 Jan 2017 16:06:42 +0000 (18:06 +0200)]
Fix a bug with signaling a thread that waits for condvar

* src/thread.c (lisp_mutex_lock_for_thread): New function,
with all the guts of lisp_mutex_lock.
(lisp_mutex_lock): Call lisp_mutex_lock_for_thread.
(condition_wait_callback): Don't call post_acquire_global_lock
before locking the mutex, as that could cause a signaled thread to
exit prematurely, because the condvar's mutex is recorded to be
not owned by any thread, and with-mutex wants to unlock it as part
of unwinding the stack in response to the signal.

7 years agoRudimentary error handling for non-main threads
Eli Zaretskii [Wed, 18 Jan 2017 16:00:16 +0000 (18:00 +0200)]
Rudimentary error handling for non-main threads

* src/thread.c (last_thread_error): New static variable.
(syms_of_threads): Staticpro it.
(record_thread_error, Fthread_last_error): New functions.
(syms_of_threads): Defsubr Fthread_last_error.

* doc/lispref/threads.texi (Basic Thread Functions): Document
thread-last-error.

* test/src/thread-tests.el (thread-errors, thread-signal-early)
(threads-condvar-wait): Test the values returned by
thread-last-error.

7 years agoAdd info-lookup help for gdb-script-mode
Tom Tromey [Mon, 16 Jan 2017 22:59:06 +0000 (15:59 -0700)]
Add info-lookup help for gdb-script-mode

Bug#25464:
* lisp/info-look.el (info-lookup-guess-gdb-script-symbol): New
function.
Add help for gdb-script-mode.

7 years agoTreat ":root" as a css-selector
Tom Tromey [Tue, 17 Jan 2017 00:17:38 +0000 (17:17 -0700)]
Treat ":root" as a css-selector

* lisp/textmodes/css-mode.el (css--font-lock-keywords): Recognize bare
":root" as selector.

7 years agoFix JS regexp literal syntax propertization in expressions
Tom Tromey [Mon, 16 Jan 2017 21:02:45 +0000 (14:02 -0700)]
Fix JS regexp literal syntax propertization in expressions

Bug#25465:
* lisp/progmodes/js.el (js-syntax-propertize): Recognize a regexp
literal after "!", "&", and "|".
test/lisp/progmodes/js-tests.el (js-mode-regexp-syntax): New test.

7 years agoMark unused arguments and remove unused variables
Mark Oteiza [Tue, 17 Jan 2017 20:19:30 +0000 (15:19 -0500)]
Mark unused arguments and remove unused variables

* lisp/play/dunnet.el (dun-mode, dun-die, dun-inven, dun-try-take):
(dun-dig, dun-type, dun-n, dun-s, dun-e, dun-w, dun-ne, dun-se):
(dun-nw, dun-sw, dun-up, dun-down, dun-in, dun-out, dun-long):
(dun-swim, dun-score, dun-flush, dun-piss, dun-sleep, dun-drive):
(dun-superb, dun-power, dun-unix-parse, dun-bin, dun-fascii):
(dun-ftpquit, dun-ftphelp, dun-uexit, dun-pwd, dun-dos-parse):
(dun-dos-invd, dun-dos-spawn, dun-dos-exit, dun-dos-nil):
(dungeon-nil): Mark arguments as unused.
(dun-drop, dun-objnum-from-args, dun-get-path, dun-ftp):
(dun-restore): Remove unused variable.

7 years agoFix auto-save-file-name problem in Tramp on MS Windows
Michael Albinus [Tue, 17 Jan 2017 16:35:23 +0000 (17:35 +0100)]
Fix auto-save-file-name problem in Tramp on MS Windows

* lisp/files.el (make-auto-save-file-name): Use `file-remote-p'
rather than an ange-ftp regexp.

* lisp/net/tramp.el (tramp-handle-make-auto-save-file-name):
Fix a problem when running on MS Windows.

* test/lisp/net/tramp-tests.el (tramp-test31-make-auto-save-file-name):
Adapt test.

7 years ago; Spelling fixes
Paul Eggert [Tue, 17 Jan 2017 15:45:39 +0000 (07:45 -0800)]
; Spelling fixes

7 years agoMerge from origin/emacs-25
Paul Eggert [Tue, 17 Jan 2017 15:34:25 +0000 (07:34 -0800)]
Merge from origin/emacs-25

42614fa Update remaining copyright years with admin.el M-x set-copyright
f17a006 * lisp/ffap.el (ffap-lax-url): Bump :version after recent cha...

7 years ago; Merge from origin/emacs-25
Paul Eggert [Tue, 17 Jan 2017 15:32:13 +0000 (07:32 -0800)]
; Merge from origin/emacs-25

The following commit was skipped:

8dd624c Document that functions in 'ffap-alist' can use the match data

7 years agoNix some uses of eval
Mark Oteiza [Tue, 17 Jan 2017 05:48:00 +0000 (00:48 -0500)]
Nix some uses of eval

* lisp/play/dunnet.el: Fix triple negative.
(dun-doverb): Use funcall instead of eval.
(dun-echo): Just call dun-mprinc.
(dun-save-val): Just bind value without eval.

7 years ago; * lisp/play/dunnet.el: Fix file footer.
Mark Oteiza [Tue, 17 Jan 2017 04:35:05 +0000 (23:35 -0500)]
; * lisp/play/dunnet.el: Fix file footer.

7 years agoFix comment in css-mode.el
Tom Tromey [Tue, 17 Jan 2017 00:21:55 +0000 (17:21 -0700)]
Fix comment in css-mode.el

* lisp/textmodes/css-mode.el: Remove obsolete comment.

7 years agoImprove ffap-gopher-at-point handling of long lines
Noam Postavsky [Sun, 8 Jan 2017 23:19:32 +0000 (18:19 -0500)]
Improve ffap-gopher-at-point handling of long lines

* lisp/ffap.el (ffap-gopher-regexp): Only match the KEY part.  Note
setting to nil is now supported.
(ffap--gopher-var-on-line): New function.
(ffap-gopher-at-point): Use it instead of the old ffap-gopher-regexp
which could overflow the regexp stack on long lines (Bug#25391).  Use
`let-alist' instead of calling `set' on local variables.
* test/lisp/ffap-tests.el (ffap-gopher-at-point): New test.

7 years agoFix NS main thread check (bug#25265)
Alan Third [Sat, 14 Jan 2017 16:57:46 +0000 (16:57 +0000)]
Fix NS main thread check (bug#25265)

* src/nsterm.m (ns_read_socket, ns_select): Replace mainThread with
isMainThread.

7 years agoCorrect c-parse-state-get-strategy for moving HERE backward into a macro.
Alan Mackenzie [Sat, 14 Jan 2017 12:38:43 +0000 (12:38 +0000)]
Correct c-parse-state-get-strategy for moving HERE backward into a macro.

* list/progmodes/c-engine.el (c-parse-state-get-strategy): When HERE is below
its previous value, we chose strategy 'forward, and the new HERE is in a
(different) macro, ensure the returned START-POINT is not above the start of
the macro.

7 years agoInclude "Date:" in mail messages filed by 'sendmail-send-it'
Eli Zaretskii [Sat, 14 Jan 2017 08:55:16 +0000 (10:55 +0200)]
Include "Date:" in mail messages filed by 'sendmail-send-it'

* lisp/mail/sendmail.el (mail-do-fcc): Insert a 'Date:' header
into the filed message.  In the outgoing message, sendmail will
add the date, but the composed message body doesn't have it.
(Bug#25436)

7 years agoRemove leftover references to log-view-message-face
Dmitry Gutov [Sat, 14 Jan 2017 03:56:37 +0000 (06:56 +0300)]
Remove leftover references to log-view-message-face

* lisp/vc/vc-bzr.el (vc-bzr-log-view-mode): Use log-view-message.

* lisp/vc/vc-git.el (vc-git-root-log-format): Same.

* lisp/vc/vc-hg.el (vc-hg-root-log-format): Same.

7 years agoRecord autoloads till emacs dump
Phillip Lord [Fri, 13 Jan 2017 13:57:51 +0000 (13:57 +0000)]
Record autoloads till emacs dump

* admin/ldefs-clean.el (ldefs-clean-up): Record autoloads till emacs dump
* lisp/ldefs-boot-auto.el (batch-byte-compile): Update

Previously, autoloads were collected till loaddefs.el was generated as
part of the build. However, bootstrap-emacs does not load
loaddefs (rather it is dumped), hence we must record autoloads until the
full emacs binary is dumped.

7 years agoAdd chained indentation to js-mode
Tom Tromey [Fri, 13 Jan 2017 06:15:00 +0000 (23:15 -0700)]
Add chained indentation to js-mode

Bug#20896
* lisp/progmodes/js.el (js-chain-indent): New variable.
(js--skip-term-backward, js--skip-terms-backward)
(js--chained-expression-p): New functions.
(js--proper-indentation): Call js--chained-expression-p.
* test/manual/indent/js-chain.js: New file.
* test/manual/indent/js.js: Add (non-)chained indentation test.

7 years agoFix js-mode indentation bug
Tom Tromey [Tue, 10 Jan 2017 05:15:57 +0000 (22:15 -0700)]
Fix js-mode indentation bug

Bug#15582:
* lisp/progmodes/js.el (js--find-newline-backward): New function.
(js--continued-expression-p): Use it.
* test/manual/indent/js.js: Add new test.

7 years agoFix definition of EMACS in test/manual/indent/Makefile
Tom Tromey [Fri, 13 Jan 2017 06:20:02 +0000 (23:20 -0700)]
Fix definition of EMACS in test/manual/indent/Makefile

* test/manual/indent/Makefile (EMACS): Add one more "..".

7 years agoAdd .jsx to auto-mode-alist
Tom Tromey [Tue, 10 Jan 2017 03:44:19 +0000 (20:44 -0700)]
Add .jsx to auto-mode-alist

Bug#25389:
* lisp/files.el (auto-mode-alist): Add entry for .jsx.

7 years agoFix two js-mode filling bugs
Tom Tromey [Tue, 10 Jan 2017 03:42:43 +0000 (20:42 -0700)]
Fix two js-mode filling bugs

Bug#19399 and Bug#22431:
* lisp/progmodes/js.el (js-mode): Set comment-line-break-function and
c-block-comment-start-regexp.
* test/lisp/progmodes/js-tests.el: New file.

7 years agoFix last change
Eli Zaretskii [Fri, 13 Jan 2017 16:17:12 +0000 (18:17 +0200)]
Fix last change

* test/src/thread-tests.el (threads-condvar-wait): Revert
previous change.  Make sure no other threads from previous
tests are running, to avoid interfering with our thread counts.

7 years agoFix the new condvar test
Eli Zaretskii [Fri, 13 Jan 2017 16:05:38 +0000 (18:05 +0200)]
Fix the new condvar test

* test/src/thread-tests.el (threads-condvar-wait): Enlarge the
time we sleep in the main thread to let the other thread
process notifications.

7 years agoMinor improvements in the new condvar test
Eli Zaretskii [Fri, 13 Jan 2017 14:13:30 +0000 (16:13 +0200)]
Minor improvements in the new condvar test

* test/src/thread-tests.el (threads-test-condvar-wait): Use
with-mutex instead of emulating it inline.
(threads-condvar-wait): Improve comments.  Check that the new
thread is alive before waiting for it to become blocked on the
conditional variable.

7 years agoFix a bug in waiting for condition variable
Eli Zaretskii [Fri, 13 Jan 2017 09:48:51 +0000 (11:48 +0200)]
Fix a bug in waiting for condition variable

* src/thread.c (lisp_mutex_lock, lisp_mutex_unlock)
(lisp_mutex_unlock_for_wait, condition_wait_callback)
(condition_notify_callback): Improve commentary.
(condition_wait_callback): Call post_acquire_global_lock before
attempting to lock the mutex, to make sure the lock's owner is
recorded correctly.

* test/src/thread-tests.el (threads-condvar-wait): New test.

7 years agoFix last change of dd80ee6 (was: mm-uu.el: Don't dissect patch part)
Katsumi Yamaoka [Fri, 13 Jan 2017 07:42:35 +0000 (07:42 +0000)]
Fix last change of dd80ee6 (was: mm-uu.el: Don't dissect patch part)

7 years agomm-uu.el: Don't dissect patch part
Katsumi Yamaoka [Fri, 13 Jan 2017 07:22:30 +0000 (07:22 +0000)]
mm-uu.el: Don't dissect patch part

This fixes a bug that the patch part is broken in the article
<87inpjzhpb.fsf@users.sourceforge.net> in the bug-gnu-emacs list.

* lisp/gnus/mm-uu.el (mm-uu-dissect-text-parts):
Don't dissect patch part.

7 years agoFix extracting async def type and name in python mode imenu
Dmitry Lazurkin [Wed, 4 Jan 2017 18:46:21 +0000 (21:46 +0300)]
Fix extracting async def type and name in python mode imenu

* lisp/progmodes/python.el (python-imenu--get-defun-type-name):
New function.
(python-imenu--build-tree): Use python-imenu--get-defun-type-name for
extract async or simple def type and name at current
position (Bug#24820).
* test/lisp/progmodes/python-tests.el (python-imenu-create-index-1):
(python-imenu-create-flat-index-1): Add async def's.

7 years agoRemove garbage from Content-Transfer-Encoding value (bug#25420)
Katsumi Yamaoka [Thu, 12 Jan 2017 23:32:41 +0000 (23:32 +0000)]
Remove garbage from Content-Transfer-Encoding value (bug#25420)

* lisp/mail/ietf-drums.el (ietf-drums-strip-cte): New function.
(ietf-drums-remove-garbage): New function.
(ietf-drums-remove-whitespace): Remove CR as well.

* lisp/mail/mail-parse.el (mail-header-strip-cte):
Alias to ietf-drums-strip-cte.

* lisp/gnus/gnus-art.el (article-decode-charset):
* lisp/gnus/gnus-sum.el (gnus-summary-enter-digest-group):
* lisp/gnus/mm-decode.el (mm-dissect-buffer):
* lisp/gnus/nndoc.el (nndoc-decode-content-transfer-encoding)
(nndoc-rfc822-forward-generate-article):
* lisp/mh-e/mh-mime.el (mh-decode-message-body):
Replace mail-header-strip with mail-header-strip-cte.

7 years agoRestore behavior of ‘./autogen.sh autoconf git’
Paul Eggert [Thu, 12 Jan 2017 23:04:38 +0000 (15:04 -0800)]
Restore behavior of ‘./autogen.sh autoconf git’

* autogen.sh: Do both autoconf and git setup when invoked
as ‘./autogen.sh autoconf git’.  Avoid unnecessary newline in chatter.
Mention new --no-check option in usage message.  (Bug#25359)

7 years ago* autogen.sh: Simplify argument parsing.
Glenn Morris [Thu, 12 Jan 2017 19:06:03 +0000 (14:06 -0500)]
* autogen.sh: Simplify argument parsing.

7 years ago* autogen.sh: Add --no-check option. (Bug#25359)
Glenn Morris [Wed, 11 Jan 2017 20:01:28 +0000 (15:01 -0500)]
* autogen.sh: Add --no-check option.  (Bug#25359)

7 years agoConvert some network test failures to skipping
Glenn Morris [Wed, 11 Jan 2017 19:35:51 +0000 (14:35 -0500)]
Convert some network test failures to skipping

These tests intermittently fail on hydra.nixos.org for unclear
reasons related to starting the external process.
This isn't an Emacs issue, and the failures cause noise on
the emacs-buildstatus list.  (Bug#24503)
* test/lisp/net/network-stream-tests.el (echo-server-nowait)
(connect-to-tls-ipv4-nowait): Skip rather than fail if the
external process fails to start properly.

7 years agoAdd DNS keywords and remove duplications
Alexander Kuleshov [Fri, 23 Dec 2016 10:53:41 +0000 (16:53 +0600)]
Add DNS keywords and remove duplications

* lisp/textmodes/dns-mode.el (dns-mode-types): Add two TLSA and
NSEC" DNS related keywords and remove duplication of "NSAP".

7 years agoHandle syntactic WS cache properties more accurately at buffer changes.
Alan Mackenzie [Wed, 11 Jan 2017 18:25:39 +0000 (18:25 +0000)]
Handle syntactic WS cache properties more accurately at buffer changes.

This fixes bug #25362.

* lisp/progmodes/cc-engine.el (c-sws-lit-type, c-sws-lit-limits)
(c-invalidate-sws-region-before, c-invalidate-sws-region-after-del)
(c-invalidate-sws-region-after-ins): New variables and functions.
(c-invalidate-sws-region-after): Change from a defsubst to a defun.
Also pass
it the standard OLD-LEN argument.  Call both
c-invalidate-sws-region-after-{ins,del} to check for "dangerous" WS
cache
properties.

* lisp/progmodes/cc-langs.el (c-block-comment-ender-regexp): New language
variable.

* lisp/progmodes/cc-mode.el (c-before-change): Call
c-invalidate-sws-region-before.
(c-after-change): Pass old-len to c-invalidate-sws-region-after.

7 years agoSupport stat 8.26 in Tramp
Michael Albinus [Wed, 11 Jan 2017 16:13:41 +0000 (17:13 +0100)]
Support stat 8.26 in Tramp

* lisp/net/tramp-sh.el (tramp-get-remote-stat): Use QUOTING_STYLE
environment variable of newer coreutils.  (Bug#23422)

7 years agoMerge from gnulib
Paul Eggert [Tue, 10 Jan 2017 15:48:37 +0000 (07:48 -0800)]
Merge from gnulib

This incorporates:
2017-01-09 maint: time stamp -> timestamp
2017-01-07 stdioext: Port to Minix 3.2 and newer
2017-01-06 glob, intprops, xalloc: work around Clang bug
2017-01-02 revert copyright-year change to synced files
* doc/misc/texinfo.tex, lib/fpending.c, lib/intprops.h, lib/mktime.c:
* lib/stat-time.h, lib/stdio-impl.h, lib/time.in.h, lib/timespec.h:
* lib/utimens.c, lib/xalloc-oversized.h:
Copy from gnulib.

7 years agoDon't use unsafe encoding for the bookmark file
Eli Zaretskii [Tue, 10 Jan 2017 15:47:10 +0000 (17:47 +0200)]
Don't use unsafe encoding for the bookmark file

* lisp/bookmark.el (bookmark-write-file): Handle the case when the
explicitly specified encoding of the bookmark file cannot encode the
additional bookmarks just added.  (Bug#25365)

7 years agoRemove unused ldefs-boot.el
Phillip Lord [Mon, 9 Jan 2017 08:56:03 +0000 (08:56 +0000)]
Remove unused ldefs-boot.el

 * lisp/ldefs-boot.el: Remove

This file was not removed as reported in c27b645956a11, but accidentally
left.

7 years agoUse expanded stack during regex matches
Noam Postavsky [Sun, 1 Jan 2017 19:09:13 +0000 (14:09 -0500)]
Use expanded stack during regex matches

While the stack is increased in main(), to allow the regex stack
allocation to use alloca we also need to modify regex.c to actually take
advantage of the increased stack, and not limit stack allocations to
SAFE_ALLOCA bytes.

* src/regex.c (MATCH_MAY_ALLOCATE): Remove obsolete comment about
allocations in signal handlers which no longer happens and correct
description about when and why MATCH_MAY_ALLOCATE should be defined.
(emacs_re_safe_alloca): New variable.
(REGEX_USE_SAFE_ALLOCA): Use it as the limit of stack allocation instead
of MAX_ALLOCA.
(emacs_re_max_failures): Rename from `re_max_failures' to avoid
confusion with glibc's `re_max_failures'.
* src/emacs.c (main): Increase the amount of fixed 'extra' bytes we add
to the stack.  Instead of changing emacs_re_max_failures based on the
new stack size, just change emacs_re_safe_alloca; emacs_re_max_failures
remains constant regardless, since if we run out stack space SAFE_ALLOCA
will fall back to heap allocation.

Co-authored-by: Eli Zaretskii <eliz@gnu.org>
7 years agoFix computation of regex stack limit
Noam Postavsky [Sat, 5 Nov 2016 20:51:53 +0000 (16:51 -0400)]
Fix computation of regex stack limit

The regex stack limit was being computed as the number of stack entries,
whereas it was being compared with the current size as measured in
bytes.  This could cause indefinite looping when nearing the stack limit
if re_max_failures happened not to be a multiple of sizeof
fail_stack_elt_t (Bug #24751).

* src/regex.c (GROW_FAIL_STACK): Compute both current stack size and
limit as numbers of stack entries.

7 years agoRemove apploopnr
Alan Third [Sun, 8 Jan 2017 09:47:51 +0000 (09:47 +0000)]
Remove apploopnr

* src/nsterm.m (ns_select, ns_read_socket): Remove apploopnr and only
allow app loop to run in main thread.

7 years agoRemove unused configure output variable
Glenn Morris [Sun, 8 Jan 2017 18:19:48 +0000 (10:19 -0800)]
Remove unused configure output variable

* configure.ac (GNULIB_MK):
* Makefile.in (gnulib_mk): Remove, no longer used.

7 years agoFix automake dependencies
Glenn Morris [Sun, 8 Jan 2017 18:16:16 +0000 (10:16 -0800)]
Fix automake dependencies

* Makefile.in (AUTOMAKE_INPUTS): Add nt/gnulib.mk.  (Bug#25372)
All platforms need this file to exist.

7 years agoRemove unnecessary blankp code
Paul Eggert [Sun, 8 Jan 2017 18:06:41 +0000 (10:06 -0800)]
Remove unnecessary blankp code

* src/character.c (blankp): Remove redundant code that slows Emacs
down a bit.  The caller already does the test.

7 years ago* lisp/textmodes/rst.el: Fix rst-forward-indented-block.
Stefan Merten [Sun, 8 Jan 2017 10:09:10 +0000 (11:09 +0100)]
* lisp/textmodes/rst.el: Fix rst-forward-indented-block.

* rst.el (rst-cvs-header, rst-svn-rev, rst-svn-timestamp)
(rst-official-version, rst-official-cvs-rev)
(rst-package-emacs-version-alist): Maintain version numbers.
(rst-forward-indented-block): Fix. Start searching at next
line again. Fixes fontification of comments continuing on the
same line they started.

7 years agoRemove @SET_MAKE@ from manually-maintained files
Paul Eggert [Sun, 8 Jan 2017 02:15:17 +0000 (18:15 -0800)]
Remove @SET_MAKE@ from manually-maintained files

Emacs now assumes GNU Make, so @SET_MAKE@ is no longer needed.
* Makefile.in, lwlib/Makefile.in, nextstep/Makefile.in:
* src/Makefile.in: Remove @SET_MAKE@.

7 years agoFix a problem with `start-file-process' in Tramp
Michael Albinus [Sat, 7 Jan 2017 17:51:30 +0000 (18:51 +0100)]
Fix a problem with `start-file-process' in Tramp

* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
`start-file-process' shall work when `non-essential' is
non-nil, but there is already an established connection.
<https://github.com/company-mode/company-mode/issues/462>

7 years agoFix selecting SQLite database files with sql-mode (Bug#23566)
Rolf Ade [Tue, 3 Jan 2017 01:05:37 +0000 (20:05 -0500)]
Fix selecting SQLite database files with sql-mode (Bug#23566)

* lisp/progmodes/sql.el (sql-sqlite-login-params): Allow any name as
SQLite database file name, by default.
(sql-get-login-ext): Fixed read-file-name arguments to provide
path completion even if a database name pattern is customized and to
allow creation of new SQLite database files.

Copyright-paperwork-exempt: yes

7 years agoSpecify encoding of the bookmark file
Eli Zaretskii [Sat, 7 Jan 2017 12:33:41 +0000 (14:33 +0200)]
Specify encoding of the bookmark file

* lisp/bookmark.el (bookmark-insert-file-format-version-stamp):
Accept an argument CODING and include a 'coding:' cookie in the
bookmark file preamble.
(bookmark-upgrade-file-format-from-0): Call
'bookmark-insert-file-format-version-stamp' with the file buffer's
encoding, as detected when it was read.
(bookmark-file-coding-system): New variable.
(bookmark-load): Set bookmark-file-coding-system to the encoding
of the loaded file.
(bookmark-write-file): Bind coding-system-for-write to either the
user setting via "C-x RET c" or to the existing file encoding,
defaulting to 'utf-8-emacs'.  Update the value of
bookmark-file-coding-system.  (Bug#25365)

7 years agoAvoid infloop in 'ispell-region'
Eli Zaretskii [Sat, 7 Jan 2017 11:02:50 +0000 (13:02 +0200)]
Avoid infloop in 'ispell-region'

* lisp/textmodes/ispell.el (ispell-begin-skip-region-regexp):
Protect against 'ispell-skip-region-alist' being nil.  Reported by
Ernest Adrogué <nfdisco@gmail.com>, see
http://lists.gnu.org/archive/html/help-gnu-emacs/2017-01/msg00007.html.

7 years agoAdd support for Unicode whitespace in [:blank:]
Philipp Stephani [Fri, 6 Jan 2017 14:56:51 +0000 (15:56 +0100)]
Add support for Unicode whitespace in [:blank:]

See Bug#25366.

* src/character.c (blankp): New function for checking Unicode
horizontal whitespace.
* src/regex.c (ISBLANK): Use 'blankp' for non-ASCII horizontal
whitespace.
(BIT_BLANK): New bit for range table.
(re_wctype_to_bit, execute_charset): Use it.
* test/lisp/subr-tests.el (subr-tests--string-match-p--blank): Add
unit test for [:blank:] character class.
* test/src/regex-tests.el (test): Adapt unit test.
* doc/lispref/searching.texi (Char Classes): Document new Unicode
behavior for [:blank:].

7 years ago(feedmail-deduce-address-list): Avoid add-to-list on local variables.
Stefan Monnier [Fri, 6 Jan 2017 02:02:48 +0000 (21:02 -0500)]
(feedmail-deduce-address-list): Avoid add-to-list on local variables.

Author:

* lisp/mail/feedmail.el (feedmail-deduce-address-list):
Avoid add-to-list on local variables.

7 years agoFix isearch handling of C-u C-u...
Noam Postavsky [Sat, 31 Dec 2016 05:31:49 +0000 (00:31 -0500)]
Fix isearch handling of C-u C-u...

* lisp/isearch.el: Add `isearch-scroll' property to
universal-argument-more so that `isearch-allow-scroll' will apply to it
as well.
(isearch-pre-command-hook): Let `isearch-allow-prefix' apply to
`universal-argument-more' as well (Bug#25302).

7 years agoShorten autogen.sh script
Paul Eggert [Thu, 5 Jan 2017 20:04:00 +0000 (12:04 -0800)]
Shorten autogen.sh script

* autogen.sh: Use a shorter script, as some 'sed' implementations
mishandle long scripts.

7 years agoYet another fix for autogen.sh
Eli Zaretskii [Thu, 5 Jan 2017 19:36:58 +0000 (21:36 +0200)]
Yet another fix for autogen.sh

* autogen.sh (gnulib.mk): Make the Sed script more portable.

* nt/Makefile.in (${srcdir}/gnulib.mk): Adapt the Sed command to
the changes in autogen.sh.

7 years ago* autogen.sh (gnulib.mk): Another attempt to fix macOS build.
Eli Zaretskii [Thu, 5 Jan 2017 17:48:49 +0000 (19:48 +0200)]
* autogen.sh (gnulib.mk): Another attempt to fix macOS build.

7 years agoFix dependencies of nt/gnulib.mk
Eli Zaretskii [Thu, 5 Jan 2017 16:04:54 +0000 (18:04 +0200)]
Fix dependencies of nt/gnulib.mk

* Makefile.in ($(srcdir)/nt/gnulib.mk): Avoid circular dependency
of nt/gnulib.mk on lib/Makefile.in.

7 years agoUnbreak macOS build
Eli Zaretskii [Thu, 5 Jan 2017 15:55:43 +0000 (17:55 +0200)]
Unbreak macOS build

* autogen.sh (gnulib.mk): Don't use non-portable extensions of GNU
Sed.

7 years agoFix term.el handling of ^Z-sequences spanning chunks
Johan Claesson [Wed, 28 Dec 2016 17:56:11 +0000 (12:56 -0500)]
Fix term.el handling of ^Z-sequences spanning chunks

Bash will after each command send ?\032 and the current directory "/tmp"
to inform term.el.  Bash output is buffered in 4096 bytes chunks.  If a
command outputs roughly 4096 bytes then the end of the first chunk will
be "/tm" (Bug#13350).

* lisp/term.el (term-emulate-terminal): Change the regexp to find the
end of the ?\032 sequence to use \n instead of $, the latter can match
end of string as well.

Copyright-paperwork-exempt: yes

7 years agoTurn on lexical-binding in mb-depth.el
Mark Oteiza [Thu, 5 Jan 2017 03:31:26 +0000 (22:31 -0500)]
Turn on lexical-binding in mb-depth.el

* lisp/mb-depth.el: Turn on lexical-binding.
(minibuffer-depth-setup): Bind things used multiple times.

7 years agoRevert "Rework NS event handling (bug#25265)"
Alan Third [Wed, 4 Jan 2017 12:41:29 +0000 (12:41 +0000)]
Revert "Rework NS event handling (bug#25265)"

This reverts commit e0e5b0f4a4ce1d19ee0240c514dedd873d4165dc.

7 years agoUpdate remaining copyright years with admin.el M-x set-copyright
Glenn Morris [Wed, 4 Jan 2017 19:10:34 +0000 (14:10 -0500)]
Update remaining copyright years with admin.el M-x set-copyright

* etc/refcards/ru-refcard.tex (cyear): Set to 2017.

7 years ago* lisp/ffap.el (ffap-lax-url): Bump :version after recent change.
Glenn Morris [Wed, 4 Jan 2017 18:32:18 +0000 (13:32 -0500)]
* lisp/ffap.el (ffap-lax-url): Bump :version after recent change.

7 years agoPort recent autogen.sh changes to Darwin
Paul Eggert [Wed, 4 Jan 2017 08:44:45 +0000 (00:44 -0800)]
Port recent autogen.sh changes to Darwin

Problem reported by Sam Steingold (Bug#25347).
* autogen.sh: Don't assume 'sed -f-' reads a script from stdin, as
POSIX does not require it and it does not work on Darwin.

7 years agoAvoid add-to-list on local variables
Stefan Monnier [Wed, 4 Jan 2017 05:40:45 +0000 (00:40 -0500)]
Avoid add-to-list on local variables

* lisp/gnus/nnir.el: Use lexical-binding and cl-lib.
(nnir-retrieve-headers): Use pcase.
(nnir-search-thread): Avoid add-to-list on local variables.

* lisp/gnus/smime.el: Use lexical-binding and cl-lib.
(smime-verify-region): Avoid add-to-list on local variables.

* lisp/mail/undigest.el: Use lexical-binding and cl-lib.
(rmail-digest-parse-mime, rmail-digest-rfc1153)
(rmail-digest-parse-rfc934): Avoid add-to-list on local variable.

* lisp/net/ldap.el (ldap-search): Move init into declaration.

* lisp/net/newst-backend.el (newsticker--cache-add):
Avoid add-to-list on local variables; Simplify code with `assq'.

* lisp/net/zeroconf.el: Use lexical-binding and cl-lib.
(dbus-debug): Remove declaration, unused.
(zeroconf-service-add-hook, zeroconf-service-remove-hook)
(zeroconf-service-browser-handler, zeroconf-publish-service):
Avoid add-to-list and *-hook on local variables.

* lisp/org/org-archive.el (org-all-archive-files):
* lisp/org/org-agenda.el (org-agenda-get-restriction-and-command):
Avoid add-to-list on local variables.

* lisp/org/ox-publish.el (org-publish--run-functions): New function.
(org-publish-projects): Use it to avoid run-hooks on a local variable.
(org-publish-cache-file-needs-publishing): Avoid add-to-list on
local variables.

* lisp/progmodes/ada-prj.el: Use setq instead of (set '...).
(ada-prj-load-from-file): Avoid add-to-list on local variables.

* lisp/progmodes/ada-xref.el (ada-initialize-runtime-library): Simplify.
(ada-gnat-parse-gpr, ada-parse-prj-file-1)
(ada-xref-find-in-modified-ali): Avoid add-to-list on local variables.

* lisp/progmodes/idlw-shell.el (idlwave-shell-update-bp-overlays):
Avoid add-to-list on local variables.

7 years agoTurn on lexical-binding in md4.el
Mark Oteiza [Tue, 3 Jan 2017 23:34:13 +0000 (18:34 -0500)]
Turn on lexical-binding in md4.el

* lisp/md4.el: Turn on lexical-binding.
* test/lisp/md4-tests.el: New file.

7 years agoLots of refactorings and a few minor improvements.
Stefan Merten [Tue, 3 Jan 2017 22:15:13 +0000 (23:15 +0100)]
Lots of refactorings and a few minor improvements.

User visible improvements and changes:
* Improve and debug `rst-forward-section` and `rst-backward-section`.
* Auto-enumeration may be used with all styles for list insertion.
* Improve and debug `rst-toc-insert`.
* Adapt change in Emacs to use customization group `text` instead of `wp`.
* Bind `n` and `p` in `rst-toc-mode`.
* `z` in `toc-mode` returns to the previous window configuration.
* Require Emacs version >= 24.1.

Lots of refactorings including:
* Silence byte compiler.
* Use lexical binding.
* Use `cl-lib`.
* Add tests and raise test coverage.

7 years ago(cl-defstruct): Improve error message for slots w/o value (bug#25312)
Stefan Monnier [Tue, 3 Jan 2017 21:07:44 +0000 (16:07 -0500)]
(cl-defstruct): Improve error message for slots w/o value (bug#25312)

* lisp/emacs-lisp/cl-macs.el (cl-defstruct): Don't signal an error but
emit a warning for those coders who forgot to put a default value in
their slot.

7 years agoSmall patch for ffap.el
Philipp Stephani [Tue, 3 Jan 2017 16:24:23 +0000 (16:24 +0000)]
Small patch for ffap.el

* lisp/ffap.el (ffap-alist): Document that ffap sets the match data
while walking 'ffap-alist'.

7 years agoDocument that functions in 'ffap-alist' can use the match data
Philipp Stephani [Tue, 3 Jan 2017 16:19:36 +0000 (17:19 +0100)]
Document that functions in 'ffap-alist' can use the match data

* lisp/ffap.el (ffap-alist): Document that ffap sets the match data
while walking 'ffap-alist'.

7 years agoGenerate nt/gnulib.mk from lib/gnulib.mk
Eli Zaretskii [Tue, 3 Jan 2017 15:46:40 +0000 (17:46 +0200)]
Generate nt/gnulib.mk from lib/gnulib.mk

This was proposed by Paul Eggert <eggert@cs.ucla.edu>,
with the purpose of avoiding manual maintenance of
nt/gnulib.mk.

* nt/gnulib-modules-to-delete.cfg: New file.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1): New variables.
(${srcdir}/gnulib.mk): Rules to generate gnulib.mk from
lib/gnulib.mk and list of modules in gnulib-modules-to-delete.cfg.

* make-dist (nt): Add gnulib-modules-to-delete.cfg to the list of
files to link.
* configure.ac (GNULIB_MK): Compute the value according to $opsys.
* autogen.sh: Create nt/gnulib.mk if it doesn't exist, before
running autoreconf.
* Makefile.in (gnulib_mk): New variable.
($(srcdir)/nt/gnulib.mk): Rule to produce it.
(AUTOMAKE_INPUTS): Use $(gnulib_mk) instead of a literal file
name.
* .gitignore: Add nt/gnulib.mk.

* src/w32.c (acl_errno_valid): Implement it here, as we no longer
build the acl-permissions module from Gnulib.

7 years agoHandle multibyte chars spanning chunks in term.el
Noam Postavsky [Thu, 29 Dec 2016 01:13:20 +0000 (20:13 -0500)]
Handle multibyte chars spanning chunks in term.el

* lisp/term.el (term-terminal-undecoded-bytes): New variable.
(term-mode): Make it buffer local.  Don't make `term-terminal-parameter'
buffer-local twice.
(term-emulate-terminal): Check for bytes of incompletely decoded
characters, and save them until the next call when they can be fully
decoded (Bug#25288).