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

diff --cc .gitlab-ci.yml
index 4522bb6bb4ec2624b2dc64ba258ac39cbde3d1fa,566efb1409d19101e737ddabaf664e673798735e..099b947dff158ad98dcf26d05abab38fa284cca9
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -69,34 -66,28 +69,60 @@@ test-filenotify-gio
      - make bootstrap
      - make -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 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 NATIVE_FAST_BOOT=1 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 NATIVE_FAST_BOOT=1
 +  timeout: 8 hours
++
+ test-gnustep:
+   stage: test
+   # This tests the GNUstep build process
+   only:
+     changes:
+       - .gitlab-ci.yml
+       - configure.ac
+       - src/nsfns.m
+       - src/nsfont.m
+       - src/nsgui.h
+       - src/nsimage.m
+       - src/nsmenu.m
+       - src/nsselect.m
+       - src/nsterm.h
+       - src/nsterm.m
+       - src/nsxwidget.h
+       - src/nsxwidget.m
+       - src/macfont.h
+       - src/macfont.m
+   script:
+     - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 gnustep-devel
+     - ./autogen.sh autoconf
+     - ./configure --without-makeinfo --with-ns
+     - make bootstrap
+     - make install

diff --cc configure.ac
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
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/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge