Commit f902a6b8 authored by Paul Eggert's avatar Paul Eggert
Browse files

; Merge from origin/emacs-25

The following commits were skipped:

ff3fc21e Port to glibc 2.24 (pre-release) + ppc64
eb9d461a * lisp/net/shr.el (shr-fill-line): Withdraw the last commit (...
4157159a * lisp/net/shr.el (shr-fill-line): Preserve text properties i...
parents a855bf48 ff3fc21e
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment