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

diff --cc .gitlab-ci.yml
index 099b947dff158ad98dcf26d05abab38fa284cca9,f4e08d59dd07905e7821f0808f086ea174346a7b..6627f5f80544f4fa072ce014a4955ba841319711
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -37,16 -37,42 +37,43 @@@ before_script
  stages:
    - test
  
 -test-all:
 -  # This tests also file monitor libraries inotify and inotifywatch.
 -  stage: test
 -  only:
 -    changes:
 -      - "Makefile.in"
 -      - .gitlab-ci.yml
 -      - aclocal.m4
 -      - autogen.sh
 -      - configure.ac
 -      - lib/*.{h,c}
 -      - lisp/*.el
 -      - lisp/**/*.el
 -      - src/*.{h,c}
 -      - test/lisp/*.el
 -      - test/lisp/**/*.el
 -      - test/src/*.el
 -  except:
 -    changes:
 -      # gfilemonitor, kqueue
 -      - src/gfilenotify.c
 -      - src/kqueue.c
 -      # MS Windows
 -      - lisp/w32*.el
 -      - lisp/term/w32*.el
 -      - src/w32*.{h,c}
 -      # GNUstep
 -      - lisp/term/ns-win.el
 -      - src/ns*.{h,m}
 -      - src/macfont.{h,m}
 -  script:
 -    - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 inotify-tools
 -    - ./autogen.sh autoconf
 -    - ./configure --without-makeinfo
 -    - make bootstrap
 -    - make check-expensive
 +# FIXME: Commented for this branch till is known to be broken.
 +# test-all:
 +#   # This tests also file monitor libraries inotify and inotifywatch.
 +#   stage: test
++#   only:
++#     changes:
++#       - "Makefile.in"
++#       - .gitlab-ci.yml
++#       - aclocal.m4
++#       - autogen.sh
++#       - configure.ac
++#       - lib/*.{h,c}
++#       - lisp/*.el
++#       - lisp/**/*.el
++#       - src/*.{h,c}
++#       - test/lisp/*.el
++#       - test/lisp/**/*.el
++#       - test/src/*.el
++#   except:
++#     changes:
++#       # gfilemonitor, kqueue
++#       - src/gfilenotify.c
++#       - src/kqueue.c
++#       # MS Windows
++#       - lisp/w32*.el
++#       - lisp/term/w32*.el
++#       - src/w32*.{h,c}
++#       # GNUstep
++#       - lisp/term/ns-win.el
++#       - src/ns*.{h,m}
++#       - src/macfont.{h,m}
 +#   script:
 +#     - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 inotify-tools
 +#     - ./autogen.sh autoconf
 +#     - ./configure --without-makeinfo
 +#     - make bootstrap
 +#     - make check-expensive
  
  test-filenotify-gio:
    stage: test

diff --cc configure.ac
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 src/alloc.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge