Merge remote-tracking branch 'origin/master' into njsf-cov

diff --git a/m4/sxe-option-groups.m4 b/m4/sxe-option-groups.m4
index 67e960e..68dde84 100644 (file)
--- a/m4/sxe-option-groups.m4
+++ b/m4/sxe-option-groups.m4
@@ -173,9 +173,18 @@ OG_ERROR_ADDITIONAL_VERBOSITY($1)
         popdef([og_group])
 ])
 
+dnl helper for OG_MULTIARG_HELP_STINGS
+dnl mimicking AS_HELP_STRING here
+dnl we can't use AS_HELP_STRING (or m4_text_wrap) directly because
+dnl we need $1 and $2 expanded and indirected, a bit like a lisp `
+AC_DEFUN([_OG_MULTIARG_ITEM_EXPL], [dnl
+[                          ][- $1 for $2]
+])dnl _OG_MULTIARG_ITEM_EXPL
+
 dnl automatically generated help string
 AC_DEFUN([OG_MULTIARG_HELP_STRINGS], [dnl
-       pushdef([OG_MULTIARG_ITEM], AS_HELP_STRING([], - $[1] for $[3]))
+       pushdef([OG_MULTIARG_ITEM],
+               _OG_MULTIARG_ITEM_EXPL($[1], $[3]))
        pushdef([OG_MULTIARG_MUTEX], [])
 AS_HELP_STRING([], [Explanation of the items:])
 $1

diff --git a/src/map.c b/src/map.c
index a771287..db4f1c7 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -3214,6 +3214,7 @@ __perm_nseq(Lisp_Object seqs[], size_t nseqs, Lisp_Object fun, size_t arity,
                                __advance_multi_index_2(idx, 2, nseqsz);
                        }
                }
+               break;
 
        case 3:
                if (LIKELY(!NILP(fun) && gf == NULL)) {
@@ -3248,7 +3249,7 @@ __perm_nseq(Lisp_Object seqs[], size_t nseqs, Lisp_Object fun, size_t arity,
                                __advance_multi_index_2(idx, 3, nseqsz);
                        }
                }
-
+               break;
 
        default:
                if (LIKELY(!NILP(fun) && gf == NULL)) {
@@ -3293,6 +3294,7 @@ __perm_nseq(Lisp_Object seqs[], size_t nseqs, Lisp_Object fun, size_t arity,
                                __advance_multi_index_2(idx, nseqs, nseqsz);
                        }
                }
+               break;
        }
        UNGCPRO;