master 200627c255: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 200627c255c4bf3f050f7f75fb3e4e100fe97bfa
Merge: e09bbfc37d 0090318c61
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    0090318c61 * lib-src/seccomp-filter.c (main): Use faccessat2 only if ...
    3bb01a499b Fix regression in derived-mode-init-mode-variables
---
 lib-src/seccomp-filter.c   | 2 ++
 lisp/emacs-lisp/derived.el | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib-src/seccomp-filter.c b/lib-src/seccomp-filter.c
index d368cbb46c..b515851010 100644
--- a/lib-src/seccomp-filter.c
+++ b/lib-src/seccomp-filter.c
@@ -240,7 +240,9 @@ main (int argc, char **argv)
      should be further restricted using mount namespaces.  */
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (access));
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (faccessat));
+#ifdef __NR_faccessat2
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (faccessat2));
+#endif
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (stat));
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (stat64));
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (lstat));
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index b9958f4951..8912eb10cc 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -404,7 +404,7 @@ the first time the mode is used."
       t
     (eval `(defvar ,(derived-mode-abbrev-table-name mode)
             (progn
-              (define-abbrev-table (derived-mode-abbrev-table-name mode) nil)
+              (define-abbrev-table (derived-mode-abbrev-table-name ',mode) nil)
               (make-abbrev-table))
             ,(format "Abbrev table for %s." mode)))))