From: Chong Yidong <cyd@gnu.org>
Date: Fri, 7 Dec 2012 15:31:43 +0000 (+0800)
Subject: * info.el (Info-set-mode-line): Remove file extension from Info-current-file
X-Git-Tag: emacs-24.3.90~173^2~9^2~15
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=75498db059d2719ee30c4bd0d39f8fbcf07582be;p=emacs.git

* 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 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