branch master updated: * info/window.c (window_make_modeline): Include any numbered version suffix in the displayed manual name, so automake-1.16.info.gz displays as (automake-1.16) not (automake-1).

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 326566d692 * info/window.c (window_make_modeline): Include any 
numbered version suffix in the displayed manual name, so automake-1.16.info.gz 
displays as (automake-1.16) not (automake-1).
326566d692 is described below

commit 326566d692e3c915ae36a8dca48244767b63f656
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Nov 23 20:29:49 2023 +0000

    * info/window.c (window_make_modeline): Include any numbered
    version suffix in the displayed manual name, so
    automake-1.16.info.gz displays as (automake-1.16) not (automake-1).
---
 ChangeLog     | 6 ++++++
 info/window.c | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5ae66d4f9f..f3abb608e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-11-23  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * info/window.c (window_make_modeline): Include any numbered
+       version suffix in the displayed manual name, so
+       automake-1.16.info.gz displays as (automake-1.16) not (automake-1).
+
 2023-11-23  Gavin Smith <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/XS/configure.ac (perl_conf_LDFLAGS) [MS-Windows]:
diff --git a/info/window.c b/info/window.c
index 9b3fb986a5..dd0718b2f5 100644
--- a/info/window.c
+++ b/info/window.c
@@ -920,6 +920,15 @@ window_make_modeline (WINDOW *window)
     /* Omit any extension like ".info.gz" from file name. */
     dot = strcspn (name, ".");
 
+    /* But include any numbered version suffix in a file name
+       like "automake-1.16.info". */
+    while (name[dot] == '.' && isdigit (name[dot+1]))
+      {
+        do
+          dot++;
+        while (isdigit (name[dot]));
+      }
+
     if (name && strcmp ("", name))
       {
         sprintf (modeline + strlen (modeline), "(");