diff options
| author | Chong Yidong | 2012-12-07 23:31:43 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-12-07 23:31:43 +0800 |
| commit | 75498db059d2719ee30c4bd0d39f8fbcf07582be (patch) | |
| tree | 02f24e04a58b64f34b5bfacd54edf947adb8d17a | |
| parent | 3f1071c747c11c38ab01b41e990d5284242833a9 (diff) | |
| download | emacs-75498db059d2719ee30c4bd0d39f8fbcf07582be.tar.gz emacs-75498db059d2719ee30c4bd0d39f8fbcf07582be.zip | |
* info.el (Info-set-mode-line): Remove file extension from Info-current-file
if there is one.
Fixes: debbugs:13016
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/info.el | 4 |
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 @@ | |||
| 1 | 2012-12-07 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * info.el (Info-set-mode-line): Remove the file extension from | ||
| 4 | Info-current-file if there is one (Bug#13016). | ||
| 5 | |||
| 1 | 2012-12-07 Glenn Morris <rgm@gnu.org> | 6 | 2012-12-07 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * mail/rmail.el (rmail-mime-decoded): New permanent local. | 8 | * 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 (\\\",\\\\)." | |||
| 1668 | " (" | 1668 | " (" |
| 1669 | (if (stringp Info-current-file) | 1669 | (if (stringp Info-current-file) |
| 1670 | (replace-regexp-in-string | 1670 | (replace-regexp-in-string |
| 1671 | "%" "%%" (file-name-nondirectory Info-current-file)) | 1671 | "%" "%%" |
| 1672 | (file-name-sans-extension | ||
| 1673 | (file-name-nondirectory Info-current-file))) | ||
| 1672 | (format "*%S*" Info-current-file)) | 1674 | (format "*%S*" Info-current-file)) |
| 1673 | ") " | 1675 | ") " |
| 1674 | (if Info-current-node | 1676 | (if Info-current-node |