Improve the Info mode line further

* lisp/info.el (Info-set-mode-line): Improve the Info mode line
further (bug#13776).

diff --git a/lisp/info.el b/lisp/info.el
index 55893218562129e987f730064369dafc69c376a2..62202d342c5b3792557bd27a2c875f609079f21d 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1735,10 +1735,12 @@ escaped (\\\",\\\\)."
                  (if (stringp Info-current-file)
                       (string-replace
                       "%" "%%"
-                      (file-name-sans-extension
-                       (file-name-nondirectory Info-current-file)))
+                       ;; Remove trailing ".info" and ".info.gz", etc.
+                      (replace-regexp-in-string
+                        "\\..*\\'" ""
+                        (file-name-nondirectory Info-current-file)))
                    (format "*%S*" Info-current-file))
-                  'help-echo "Info file name")
+                  'help-echo "Manual name")
                 ") ")
                (if Info-current-node
                    (propertize (string-replace