* info.el (Info-set-mode-line): Remove file extension from Info-current-file

if there is one.

Fixes: debbugs:13016

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36fc8eea448daf5e7af899a1bd77cab76f103bbb..ee55187957751b498df395f0ae24644e25ff8a00 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-07  Chong Yidong  <cyd@gnu.org>
+
+       * info.el (Info-set-mode-line): Remove the file extension from
+       Info-current-file if there is one (Bug#13016).
+
 2012-12-07  Glenn Morris  <rgm@gnu.org>
 
        * mail/rmail.el (rmail-mime-decoded): New permanent local.

diff --git a/lisp/info.el b/lisp/info.el
index 6624c0d61b27c0cd6a55feecfc6b19d0ed8e596f..abceb73bea062842f5683e64220346ba15e5acc9 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1668,7 +1668,9 @@ escaped (\\\",\\\\)."
                 " ("
                 (if (stringp Info-current-file)
                     (replace-regexp-in-string
-                     "%" "%%" (file-name-nondirectory Info-current-file))
+                     "%" "%%"
+                     (file-name-sans-extension
+                      (file-name-nondirectory Info-current-file)))
                   (format "*%S*" Info-current-file))
                 ") "
                 (if Info-current-node