Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

2 files changed, 26 insertions, 7 deletions

diff --git a/lib-src/etags.c b/lib-src/etags.c
index e5ff7bd10fc..7b1a7fc1851 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -373,6 +373,7 @@ static void readline (linebuffer *, FILE *);
 static long readline_internal (linebuffer *, FILE *, char const *);
 static bool nocase_tail (const char *);
 static void get_tag (char *, char **);
+static void get_lispy_tag (char *);
 
 static void analyze_regex (char *);
 static void free_regexps (void);
@@ -5347,7 +5348,7 @@ L_getit (void)
       /* Ok, then skip "(" before name in (defstruct (foo)) */
       dbp = skip_spaces (dbp);
   }
-  get_tag (dbp, NULL);
+  get_lispy_tag (dbp);
 }
 
 static void
@@ -5549,14 +5550,14 @@ Scheme_functions (FILE *inf)
       if (strneq (bp, "(def", 4) || strneq (bp, "(DEF", 4))
         {
           bp = skip_non_spaces (bp+4);
-          /* Skip over open parens and white space.  Don't continue past
-             '\0'. */
-          while (*bp && notinname (*bp))
+          /* Skip over open parens and white space.
+             Don't continue past '\0' or '='. */
+          while (*bp && notinname (*bp) && *bp != '=')
             bp++;
-          get_tag (bp, NULL);
+          get_lispy_tag (bp);
         }
       if (LOOKING_AT (bp, "(SET!") || LOOKING_AT (bp, "(set!"))
-        get_tag (bp, NULL);
+        get_lispy_tag (bp);
     }
 }
 
@@ -6591,6 +6592,22 @@ get_tag (register char *bp, char **namepp)
     *namepp = savenstr (bp, cp - bp);
 }
 
+/* Similar to get_tag, but include '=' as part of the tag. */
+static void
+get_lispy_tag (register char *bp)
+{
+  register char *cp = bp;
+
+  if (*bp != '\0')
+    {
+      /* Go till you get to white space or a syntactic break */
+      for (cp = bp + 1; !notinname (*cp) || *cp == '='; cp++)
+        continue;
+      make_tag (bp, cp - bp, true,
+                lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
+    }
+}
+
 /*
  * Read a line of text from `stream' into `lbp', excluding the
  * newline or CR-NL, if any.  Return the number of characters read from
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 6b2cc110403..ecd6447ab78 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -667,7 +667,9 @@ close_emacs_globals (ptrdiff_t num_symbols)
            "#ifndef DEFINE_SYMBOLS\n"
            "extern\n"
            "#endif\n"
-           "struct Lisp_Symbol alignas (GCALIGNMENT) lispsym[%td];\n"),
+           "struct {\n"
+           "  struct Lisp_Symbol alignas (GCALIGNMENT) s;\n"
+           "} lispsym[%td];\n"),
           num_symbols);
 }