auto upstream

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36fc8eea448..ee551879577 100644
--- 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 6624c0d61b2..abceb73bea0 100644
--- 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