GitLab

* lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter):
Delete empty lines.  (Bug#33735)
(tramp-sh-inotifywait-process-filter): Use `string-match'.
(tramp-set-remote-path): Check for PIPE_BUF but PATH_MAX.

* test/lisp/filenotify-tests.el: Handle $REMOTE_FILE_NOTIFY_LIBRARY.
(file-notify--deftest-remote): Suppress vc-handled-backends.
(file-notify-test08-backup): Do not expect failure on hydra.
(Bug#33735).

Don't require tramp-sh, bug#33781 is fixed.

to display actions of pop-to-buffer, and `(window-min-height . 10)'
to display alist.  (Bug#32825)

to kill the buffer.  Add prefix arg M-0 to delete the selected window.
(Bug#32790)

(switch-to-buffer): Use it.  (Bug#32790)
(switch-to-buffer-preserve-window-point):  Mention it in docstring.

* lisp/windmove.el (windmove-display-in-direction): Mention it in docstring.

* doc/lispref/windows.texi (Switching Buffers):
Document switch-to-buffer-obey-display-actions.

(hi-lock-face-defaults): Add them.
(hi-green-b, hi-red-b): Tone down foreground colors.

081fb694 (origin/emacs-26) Check result from c-backward-token-2 to avo...
f4ea7464 cl-make-random-state was not copying its arg

The following commits were skipped:

fda43a7b Skip a vc-bzr test if run as root
4370b8eb ; Copyright year fix No need to merge to master
305aca0a Backport: Handle unread-command-events consistently (bug#23980)

4c6c327d Restrict downcasing in elisp xref tests (bug#25534)
ab8ed418 Avoid test failures if directory name looks like a regexp

The following commit was skipped:

80e98568 Fix Bug#33524

58252797 * doc/lispintro/emacs-lisp-intro.texi (Finding More): Fix xref.

The following commit was skipped:

e8bb0420 More porting to GCC 8 of --enable-gcc-warnings

(map--plist-p, map--plist-delete): New functions.
(map-elt, map-delete, map-length, map-into, map-put!, map-insert)
(map-apply, map-do): Handle the plist case.

* test/lisp/emacs-lisp/map-tests.el (with-maps-do): Add sample plist.
(test-map-put!): The behavior of map-put! is not the same for plists as
for alists.

Remove expected failure.

This fixes bug #33784.

* lisp/progmodes/cc-fonts.el (c-get-fontification-context): While moving back
over enclosing parentheses, check that c-backward-token-2 actually moves.

* lisp/net/tramp-sh.el (tramp-set-remote-path): Use a temporary
file for setting $PATH, if it exceeds PATH_MAX on the remote system.
(tramp-send-command-and-read): Ignore errors if NOERROR.  (Bug#33781)

* test/lisp/net/tramp-tests.el (tramp-test34-remote-path): New test.

* test/lisp/progmodes/flymake-tests.el
(flymake-tests--wait-for-backends): Skip rather than fail if
backends are slow to respond.  This always seems like a temporary
system glitch and not something that should be reported as a failure.

* lisp/gnus/gnus-sum.el (gnus-summary-mode-group): New defvar for
  passing gnus-newsgroup-name (a local variable) into the body of
  gnus-summary-mode, so that it's available to gnus-summary-mode-hook.

unconditionally.  (Bug#33798)

Problem reported by Xu Chunyang (Bug#33731).
* lisp/emacs-lisp/cl-extra.el (cl-make-random-state):
Use copy-sequence, not copy-tree, so that the record is copied.
* test/lisp/emacs-lisp/cl-extra-tests.el:
(cl-extra-test-cl-make-random-state): New test.

* doc/lispintro/emacs-lisp-intro.texi (Files List): Simplify.
* doc/lispref/os.texi (Time of Day): Mention format-time-string
as an alternative to current-time-string.
* lisp/arc-mode.el (archive-unixdate, archive-unixtime):
Port better to future versions of Emacs where (COUNT . HZ)
will take precedence to (HI . LO).
* lisp/arc-mode.el (archive-unixtime):
* lisp/calendar/todo-mode.el (todo-insert-item--basic)
(todo-item-done, todo-read-time):
Prefer format-time-string to substringing current-time-string.
* lisp/calc/calc-forms.el (calc-time, calcFunc-now):
Prefer decode-time to parsing the output of current-time-string.
* lisp/emacs-lisp/cl-extra.el (cl--random-time):
Prefer encode-time to hashing the output of current-time-string.
* lisp/gnus/gnus-score.el (gnus-score-headers)
(gnus-score-adaptive):
Avoid stringifying and then reparsing timestamp.
* src/timefns.c (Fencode_time): Omit redundant assignment.

* test/lisp/vc/vc-bzr-tests.el (vc-bzr-test-faulty-bzr-autoloads):
Skip this test when run as root.  This works around a race
condition in root-specific code in vc-mode-line when deleting a file.

; Do not merge to master, instead fix vc-mode-line there.

$PATH exceeds PATH_MAX on the remote system.

No need to merge to master

* src/keyboard.c (read_char): Events put into `unread-command-events'
with the form (t . EVENT) should always have the t stripped when read
out.
* test/src/keyboard-tests.el: New tests for `unread-command-events'.

(cherry picked from commit 1f3f4b12)

* test/lisp/filenotify-tests.el (file-notify--deftest-remote):
Add optional argument to skip test.
(file-notify-test07-many-events-remote): Skip on hydra.nixos.org.

(font-lock-initial-fontify, font-lock-compile-keywords):
Silence compiler warning.
(font-lock-ensure-function): Fix some problems in last commit.

The tests happen to not fail at the moment because find-library-name
now has an extra feature, find-library--from-load-history, which
happens to do a case-insensitive regexp match; but still it seems
better not to rely on this.

* test/lisp/progmodes/elisp-mode-tests.el (xref--case-insensitive):
New variable.
(xref-elisp-test-run, emacs-test-dir): Only downcase if the
filesystem seems to be case-insensitive.

* lisp/vc/diff-mode.el (diff-font-lock-keywords): Use diff-header face
for git index lines (like already used for bzr index lines).
Use diff-file-header face for binary file headers.
(diff-find-source-location): Use expand-file-name for vc-find-revision.
(diff--font-lock-prettify): Use diff-indicator-* faces for
left-fringe indicators.
(diff-syntax-fontify-props): Optimize to not use text-property-not-all
for font-lock-ensure.

* lisp/replace.el (occur-engine-line): Simplify to use font-lock-ensure
without text-property-not-all.

* lisp/vc/diff-mode.el (diff-hunk-text, diff-syntax-fontify-hunk):
Skip lines beginning with backslash like "\ No newline at end of file".
(diff-syntax-fontify-hunk): Use string-trim-right.
For one-line diffs use 1 explicitly in the list of line numbers.

Taken from <https://sources.debian.org/patches/emacs/1:26.1+1-1>
* test/lisp/ibuffer-tests.el (ibuffer-filter-inclusion-3):
* test/lisp/net/tramp-tests.el (tramp-test42-remote-load-path):
Regexp-quote file names to avoid failures with directory names
of the form "build/emacs-i87jK3/emacs-26.1+1/...".

* src/data.c (emacs_mpz_mul_2exp): 2nd arg is now a
nonnegative EMACS_INT not mp_bitcnt_t, to simplify checking.
(Fash): Support COUNT values that are bignums or that
exceed mp_bitcnt_t range.
* test/src/data-tests.el (data-tests-ash-lsh): Test this.

* lisp/progmodes/flymake-proc.el
(flymake-proc-create-temp-with-folder-structure):
Unquote file-name.  (Bug#33524)

* test/lisp/net/tramp-tests.el (tramp-test32-environment-variables):
Expect failure on hydra.nixos.org.

* test/lisp/filenotify-tests.el (file-notify-test04-autorevert):
Remote test now passes on hydra.nixos.org, since PATH
workaround for bug#33781.

* lisp/net/tramp-cache.el (tramp-connection-properties):
* lisp/net/tramp-sh.el (tramp-remote-path)
(tramp-remote-process-environment, tramp-sh-extra-args):
Reinsert autoload cookie.  (Bug#33781)

* test/lisp/net/tramp-tests.el: Do not require tramp-sh before
changing tramp-remote-path.

Functions to access the first or all but the first elements of
sequences have been repeatedly asked for (the last occurrence being
https://github.com/NicolasPetton/seq.el/issues/9).

* lisp/emacs-lisp/seq.el (seq-first, seq-rest): New functions.
* test/lisp/emacs-lisp/seq-tests.el (test-seq-first, test-seq-rest):
New tests for seq-first and seq-rest.

* lisp/emacs-lisp/ert.el (ert-summarize-tests-batch-and-exit):
Report the details of unexpected passes as well as failures.