GitLab

* doc/emacs/maintaining.texi (Pulling / Pushing): Expand and
improve the documentation of 'vc-push'.

* lisp/vc/vc.el (vc-pull, vc-push): Doc fix.

* test/lisp/url/url-parse-tests.el: Add tests covering url-generic-parse-url.
* test/lisp/url/url-expand-tests.el: Add tests covering url-expand-file-name.
* lisp/url/url-parse.el (url-generic-parse-url): Keep empty fragment
information in URL-struct.
* lisp/url/url-parse.el (url-path-and-query): Do not artificially turn empty
path and query into nil path and query, respectively.
* lisp/url/url-expand.el (url-expander-remove-relative-links): Do not turn
empty path into an absolute ("/") path.
* lisp/url/url-expand.el (url-expand-file-name): Properly resolve
fragment-only URIs. Do not just return them unchanged.
* lisp/url/url-expand.el (url-default-expander): An empty path in the relative
reference URI should not drop the last segment.

Backport:

(cherry picked from commit b792ecea)

* lisp/url/url-http.el (url-user-agent): Move from here...
* lisp/url/url-vars.el (url-user-agent): ...to here.  This is to
keep all the URL defcustoms in one place, and also have it defined
whenever the URL library is loaded.

* doc/misc/url.texi (Customization): Document 'url-user-agent'.

* doc/misc/url.texi (Tramp): New node, describes the URL schemes
supported via Tramp.
(Supported URL Types, file/ftp, rlogin/telnet/tn3270): Mention
Tramp.

* lisp/progmodes/sh-script.el (sh-mode, sh-set-shell): Document
the 'sh-shell' file-local variable.
(top level): Add an auto-load form to avoid byte-compiler warning
about 'comint-send-string'.

* doc/misc/ses.texi (Printer functions): Fix whitespace between
sentences and punctuation.  Add an index entry for
'ses-define-local-printer'.

* doc/misc/ert.texi (Running Tests in Batch Mode): Document
'ert-summarize-tests-batch-and-exit'.

* src/eval.c (unbind_to) <SPECPDL_LET>: Avoid assertion violation
if we get here with an object that is not a symbol.  (Bug#14412)

	* lisp/net/browse-url.el (browse-url-filename-alist): Match colons
	only in the first component.  (bug#5362)

Merge conflict, but I think I resolved it.

    Follow meta refresh tags in eww

    * eww.el (eww-tag-meta): Follow meta refresh tags (bug#22234).

Backport:

* lisp/url/url-auth.el (url-basic-auth): Allow explicit
user/passwords in URLs (bug#19046).

Backport:

(cherry picked from commit b563715a)

* lisp/url/url-handlers.el: Add autoload cookie so that
`package-list-packages' doesn't bug out (bug#21927) (tiny change)

Backport:

(cherry picked from commit 7a7b5b49)

* lisp/startup.el (normal-top-level): On MS-Windows, convert
backslashes to forward slashes while decoding default-directory
of the initially-created buffers.

* eww.el (eww-decode-url-file-name): Use the base coding
system to check for encodability.

Backport:

(cherry picked from commit a8627008)

* eww.el (eww-setup-buffer): Always save history, even when
called from outside the eww buffer (bug#19638).

Backport:

(cherry picked from commit 2a0f18d9)

* eww.el (eww-mode): Most web pages are left-to-right, so make
that the default (bug#19801).

* shr.el (shr-tag-html): Respect "dir" attributes
(left-to-right, right-to-left).

Backport:

(cherry picked from commit 9e089ec8)

* eww.el (eww-update-field): Make toggling checkboxes work
again (bug#21881).

Backport:

(cherry picked from commit 5e56f606)

* lisp/url/url-cookie.el (url-cookie-store): Refuse to store
cookies with empty names (bug#21936).

Backport:

(cherry picked from commit 9f0fd7cb)

Fixes: 22117

* shr.el (shr-descend): Stop rendering before we run out of
specpdl room (bug#22117).

Backport:

(cherry picked from commit 248da292)

Backport:

(cherry picked from commit fe4606f9)

* shr.el (shr-table-body): New function to find the real body
of a table.
(shr-tag-table): Use it to render several <tbody> tags in a
table (bug#22170).

Backport:

(cherry picked from commit cdaf3302)

(eww-make-unique-file-name): Make unique file names by making
files like foo(2).jpg instead of foo(1)(2).jpg.

Backport:

(cherry picked from commit edfdd0a6)

* eww.el (eww-decode-url-file-name): New function.
(eww-download-callback): Use it to decode file names before
saving them.

Backport:

(cherry picked from commit af22a010)

* doc/misc/emacs-gnutls.texi (Help For Users): Document
FreeBSD bundle.

* lisp/net/gnutls.el (gnutls-trustfiles): Add FreeBSD cert bundle.

Backport:

(cherry picked from commit 60c0f1a1)

* shr.el (shr-tag-svg): Ignore SVG images that have no width
or height, because these can't be displayed by ImageMagick,
anyway.

Backport:

(cherry picked from commit 821107d5)

* shr.el (shr-tag-table): Allow rendering body-less tables
that have headers.

Backport:

(cherry picked from commit b05471e4)

* lisp/mail/emacsbug.el (report-emacs-bug): Report the system on
which Emacs was built.  This is important information for
investigating bug reports reported by users who don't build their
Emacs.

* lisp/international/ucs-normalize.el (eval-when-compile): Make
sure char-code-property-alist includes elements that allow access
to 'decomposition' and 'canonical-combining-class' Unicode
properties, as compiling ucs-normalize.el requires that.
* lisp/loadup.el (featurep 'ns): Load ucs-normalize and ns-win
only of charprop.el was already loaded.

* src/Makefile.in ($(lispsource)/international/ucs-normalize.elc):
New order-only dependency.

; This reverts commit d107eda4.

; A follow-up to this will be made to ucs-normalize.el etc. to ensure that building from scratch works.

* test/automated/tramp-tests.el (tramp-test29-vc-registered):
Move `bzr' case down.  Skip test when `vc-create-repo' fails.
Remove instrumentation.

; This reverts commit 09053075.

; This caused a build from scratch to fail.

* lisp/gnus/gnus-group.el (gnus-group-prepare-flat):
Make gnus-union use `equal' to compare items in lists.

* lisp/gnus/gnus-util.el (gnus-union):
Make it behave like cl-union partially.

* src/dired.c (file_name_completion): Don't assume Lisp_Object is
an integer type, fixing a problem introduced in the recent fix for
Bug#22169.

* doc/lispref/processes.texi (Asynchronous Processes): Mention the
defaults for process filter and sentinel.  Provide cross-references.
(Process Information): Provide cross-references to where filters
and sentinels are described.
(Filter Functions): Add an index entry for "default filter".
(Sentinels): Add a few status messages not documented previously.
Resolve the "killed" confusion.  Document and describe the default
sentinel.  (Bug#22220)

* src/dired.c (file_name_completion): Reject false matches due to
file-name-coding-systems that decompose characters when encoding
file names, by comparing decoded file names as well.  (Bug#22169)
(syms_of_dired) <Qdecomposed_characters>: New DEFSYM.

* lisp/international/ucs-normalize.el (utf-8-hfs): Give it a
non-nil 'decomposed-characters' property.