[Emacs-diffs] Changes to emacs/lisp/bookmark.el

[Richard M . Stallman]

Index: emacs/lisp/bookmark.el
diff -c emacs/lisp/bookmark.el:1.77 emacs/lisp/bookmark.el:1.78
*** emacs/lisp/bookmark.el:1.77 Sat Aug  6 22:13:41 2005
--- emacs/lisp/bookmark.el      Tue Aug  9 02:54:39 2005
***************
*** 993,998 ****
--- 993,1000 ----
      (insert string)))
  
  
+ (defvar Info-current-file)
+ 
  (defun bookmark-buffer-file-name ()
    "Return the current buffer's file in a way useful for bookmarks.
  For example, if this is a Info buffer, return the Info file's name."
***************
*** 1102,1108 ****
                  ;; Info nodes must be visited with care.
                  (progn
                    (require 'info)
!                   (Info-find-node file info-node))
                ;; Else no Info.  Can do an ordinary find-file:
                (set-buffer (find-file-noselect file))
                (goto-char place))
--- 1104,1111 ----
                  ;; Info nodes must be visited with care.
                  (progn
                    (require 'info)
!                 (with-no-warnings
!                   (Info-find-node file info-node)))
                ;; Else no Info.  Can do an ordinary find-file:
                (set-buffer (find-file-noselect file))
                (goto-char place))