Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc .gitlab-ci.yml
index e5ebd6a92a1f647a16c16962c881c7c57f7d5ca7,bab2573c883eee3b7958e6cc805913e2a17ca0ce..bc099a720a87a2f9ef7c14fd4196745b17f77cd4
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -91,40 -91,8 +91,40 @@@ test-filenotify-gio
      - ./autogen.sh autoconf
      - ./configure --without-makeinfo --with-file-notification=gfile
      - make bootstrap
-     - make -C test autorevert-tests filenotify-tests
+     - make -k -C test autorevert-tests filenotify-tests
  
 +test-native-bootstrap-speed0:
 +  # Test a full native bootstrap
 +  # Run for now only speed 0 to limit memory usage and compilation time.
 +  stage: test
 +  # Uncomment the following to run it only when sceduled.
 +  # only:
 +  #   - schedules
 +  script:
 +    - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libgccjit-6-dev
 +    - ./autogen.sh autoconf
 +    - ./configure --without-makeinfo --with-nativecomp
 +    - make bootstrap NATIVE_FULL_AOT=1 BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 0)"' -j2
 +  timeout: 8 hours
 +
 +test-native-bootstrap-speed1:
 +  stage: test
 +  script:
 +    - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libgccjit-6-dev
 +    - ./autogen.sh autoconf
 +    - ./configure --without-makeinfo --with-nativecomp
 +    - make bootstrap BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 1)"'
 +  timeout: 8 hours
 +
 +test-native-bootstrap-speed2:
 +  stage: test
 +  script:
 +    - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libgccjit-6-dev
 +    - ./autogen.sh autoconf
 +    - ./configure --without-makeinfo --with-nativecomp
 +    - make bootstrap
 +  timeout: 8 hours
 +
  test-gnustep:
    stage: test
    # This tests the GNUstep build process

diff --cc etc/NEWS
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/gnus/gnus.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/progmodes/elisp-mode.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge