master 51222153df1: Remove spurious "nil" from Gnus mode line

[Eric Abrahamsen]

branch: master
commit 51222153df13c44f2dc74e17da21d95a29f91776
Author: Manuel Giraud <manuel@ledu-giraud.fr>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>

    Remove spurious "nil" from Gnus mode line
    
    Bug#67322
    
    * lisp/gnus/gnus.el (gnus-mode-line-buffer-identification): Handle a
    nil return value from `gnus-emacs-version'.
---
 lisp/gnus/gnus.el | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index ffe81e5c585..6bf66233101 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -319,7 +319,8 @@ be set in `.emacs' instead."
            (not (stringp str))
            (not (string-match "^Gnus:" str)))
        (list str)
-      (let ((load-path (append (mm-image-load-path) load-path)))
+      (let ((load-path (append (mm-image-load-path) load-path))
+            (gnus-emacs-version (gnus-emacs-version)))
        ;; Add the Gnus logo.
        (add-text-properties
         0 5
@@ -328,13 +329,15 @@ be set in `.emacs' instead."
                '((:type svg :file "gnus-pointer.svg"
                          :ascent center)
                   (:type xpm :file "gnus-pointer.xpm"
-                           :ascent center)
+                        :ascent center)
                  (:type xbm :file "gnus-pointer.xbm"
                         :ascent center))
                t)
-              'help-echo (format
-                          "This is %s, %s."
-                          gnus-version (gnus-emacs-version)))
+              'help-echo (if gnus-emacs-version
+                              (format
+                              "This is %s, %s."
+                              gnus-version gnus-emacs-version)
+                            (format "This is %s." gnus-version)))
         str)
        (list str)))))