[no subject]

[Patrice Dumas]

branch: master
commit 24e412a93fe65242b2a1905d7b93e317050399f8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Sep 28 22:15:18 2024 +0200

    * tp/Texinfo/XS/main/extra.c (lookup_extra_misc_args),
    tp/Texinfo/XS/main/manipulate_tree.c (associate_info_references),
    tp/Texinfo/XS/main/tree.c (destroy_associated_info): add missing
    KEY_PAIR union name k.
    
    Reorder ChangeLog to correspond to commits order.
---
 ChangeLog                            | 31 ++++++++++++++++++++-----------
 tp/Texinfo/XS/main/extra.c           |  2 +-
 tp/Texinfo/XS/main/manipulate_tree.c |  6 +++---
 tp/Texinfo/XS/main/tree.c            |  2 +-
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9cd8e87f45..9b1bb791b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,11 @@
-2024-09-28  Gavin Smith <gavinsmith0123@gmail.com>
-
-       Tweak config paths for Info
+2024-09-28  Patrice Dumas  <pertusus@free.fr>
 
-       * info/infomap.c (locate_init_file):
-       Check ~/.infokey before checking XDG_CONFIG_HOME,
-       simililar to how GNU Emacs does it.   Do not use /etc/xdg as
-       a default for XDG_CONFIG_DIRS.  Check in $sysconfdir/xdg/texinfo
-       before XDG_CONFIG_DIRS, as with recent changes to texi2any.
-       * info/Makefile.am (AM_CPPFLAGS): propagate sysconfdir
+       * tp/Texinfo/XS/main/extra.c (lookup_extra_misc_args),
+       tp/Texinfo/XS/main/manipulate_tree.c (associate_info_references),
+       tp/Texinfo/XS/main/tree.c (destroy_associated_info): add missing
+       KEY_PAIR union name k.
 
-       * NEWS, doc/info-stnd.texi (Custom Key Bindings): update.
+       Reorder ChangeLog to correspond to commits order.
 
 2024-05-31  Patrice Dumas  <pertusus@free.fr>
 
@@ -182,9 +178,22 @@
        no additional information nor contents nor args.
 
        * tp/Texinfo/XS/main/convert_utils.c
-       (find_root_command_next_heading_command): add a but message if normal
+       (find_root_command_next_heading_command): add a bug message if normal
        text appears directly in top level (should be in a paragraph).
 
+2024-09-28  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Tweak config paths for Info
+
+       * info/infomap.c (locate_init_file):
+       Check ~/.infokey before checking XDG_CONFIG_HOME,
+       simililar to how GNU Emacs does it.   Do not use /etc/xdg as
+       a default for XDG_CONFIG_DIRS.  Check in $sysconfdir/xdg/texinfo
+       before XDG_CONFIG_DIRS, as with recent changes to texi2any.
+       * info/Makefile.am (AM_CPPFLAGS): propagate sysconfdir
+
+       * NEWS, doc/info-stnd.texi (Custom Key Bindings): update.
+
 2024-05-31  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_split_delimiters): remove undefined
diff --git a/tp/Texinfo/XS/main/extra.c b/tp/Texinfo/XS/main/extra.c
index 01d8f68a58..a9499ad3b6 100644
--- a/tp/Texinfo/XS/main/extra.c
+++ b/tp/Texinfo/XS/main/extra.c
@@ -362,7 +362,7 @@ lookup_extra_misc_args (const ELEMENT *e, const char *key)
       fatal (msg);
       free (msg);
     }
-  return k->list;
+  return k->k.list;
 }
 
 ELEMENT *
diff --git a/tp/Texinfo/XS/main/manipulate_tree.c 
b/tp/Texinfo/XS/main/manipulate_tree.c
index 6890f08183..58ccfe6c19 100644
--- a/tp/Texinfo/XS/main/manipulate_tree.c
+++ b/tp/Texinfo/XS/main/manipulate_tree.c
@@ -285,7 +285,7 @@ associate_info_references (ASSOCIATED_INFO *info, 
ASSOCIATED_INFO *new_info)
           }
         case extra_container:
           {
-            const ELEMENT *f = k_ref->element;
+            const ELEMENT *f = k_ref->k.element;
             KEY_PAIR *k = lookup_associated_info (new_info, key);
             ELEMENT *new_extra_element = k->k.element;
             for (j = 0; j < f->contents.number; j++)
@@ -325,8 +325,8 @@ associate_info_references (ASSOCIATED_INFO *info, 
ASSOCIATED_INFO *new_info)
           int j;
           KEY_PAIR *k = get_associated_info_key (new_info, key, k_ref->type);
           ELEMENT_LIST *new_extra_misc_args = new_list();
-          k->k.list = new_extra_mk.isc_args;
-          for (j = 0; j < k_ref->list->number; j++)
+          k->k.list = new_extra_misc_args;
+          for (j = 0; j < k_ref->k.list->number; j++)
             {
               const ELEMENT *e = k_ref->k.list->list[j];
               ELEMENT *new_e;
diff --git a/tp/Texinfo/XS/main/tree.c b/tp/Texinfo/XS/main/tree.c
index 6566a88da3..06bef2872f 100644
--- a/tp/Texinfo/XS/main/tree.c
+++ b/tp/Texinfo/XS/main/tree.c
@@ -162,7 +162,7 @@ destroy_associated_info (ASSOCIATED_INFO *a)
           for (j = 0; j < l->number; j++)
             destroy_element (l->list[j]);
 
-          destroy_list (a->info[i].list);
+          destroy_list (a->info[i].k.list);
           }
           break;