[Emacs-diffs] /srv/bzr/emacs/trunk r111160: * lisp/info.el (Info-copy-current-node-name, Info-breadcrumbs)

[Juri Linkov]

------------------------------------------------------------
revno: 111160
fixes bug: http://debbugs.gnu.org/13016
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Sun 2012-12-09 01:12:08 +0200
message:
  * lisp/info.el (Info-copy-current-node-name, Info-breadcrumbs)
  (Info-fontify-node, Info-bookmark-make-record): Remove the
  file extension from Info-current-file.
modified:
  lisp/ChangeLog
  lisp/info.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-07 16:48:42 +0000
+++ b/lisp/ChangeLog    2012-12-08 23:12:08 +0000
@@ -1,3 +1,9 @@
+2012-12-08  Juri Linkov  <address@hidden>
+
+       * info.el (Info-copy-current-node-name, Info-breadcrumbs)
+       (Info-fontify-node, Info-bookmark-make-record): Remove the
+       file extension from Info-current-file (Bug#13016).
+
 2012-12-07  Stefan Monnier  <address@hidden>
 
        * hi-lock.el (hi-lock-unface-buffer): If there's no matching regexp at

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2012-12-07 15:31:43 +0000
+++ b/lisp/info.el      2012-12-08 23:12:08 +0000
@@ -4034,7 +4034,9 @@
   (unless Info-current-node
     (user-error "No current Info node"))
   (let ((node (if (stringp Info-current-file)
-                 (concat "(" (file-name-nondirectory Info-current-file) ") "
+                 (concat "(" (file-name-sans-extension
+                              (file-name-nondirectory Info-current-file))
+                         ") "
                          Info-current-node))))
     (if (zerop (prefix-numeric-value arg))
         (setq node (concat "(info \"" node "\")")))
@@ -4421,7 +4423,8 @@
               (if (not (equal node "Top")) node
                 (format "(%s)Top"
                         (if (stringp Info-current-file)
-                            (file-name-nondirectory Info-current-file)
+                            (file-name-sans-extension
+                             (file-name-nondirectory Info-current-file))
                           ;; Some legacy code can still use a symbol.
                           Info-current-file)))))
          (setq line (concat
@@ -4533,7 +4536,8 @@
              (if (re-search-forward
                   (format "File: %s\\([^,\n\t]+\\),"
                           (if (stringp Info-current-file)
-                              (file-name-nondirectory Info-current-file)
+                              (file-name-sans-extension
+                               (file-name-nondirectory Info-current-file))
                             Info-current-file))
                   header-end t)
                  (put-text-property (match-beginning 1) (match-end 1)
@@ -5071,7 +5075,8 @@
   "This implements the `bookmark-make-record-function' type (which see)
 for Info nodes."
   (let* ((file (and (stringp Info-current-file)
-                   (file-name-nondirectory Info-current-file)))
+                   (file-name-sans-extension
+                    (file-name-nondirectory Info-current-file))))
         (bookmark-name (if file
                            (concat "(" file ") " Info-current-node)
                          Info-current-node))