diff lisp/info.el @ 92550:4170d4a36502

* bookmark.el (bookmark-map, bookmark-read-annotation-mode-map): Move initialization into declaration. (bookmark-get-info-node, bookmark-set-info-node): Remove. (bookmark-make, bookmark-make-cell-for-text-file): Remove `info-node' arg. (bookmark-info-current-node): Remove. (bookmark-jump-noselect): Rename from bookmark-jump-internal. Add relocation fallback. Set bookmark-current-bookmark. (bookmark-default-handler): Rename from bookmark-jump-noselect. Remove relocation fallback. Don't set bookmark-current-bookmark. (bookmark-set): Let it be used even if there's no buffer-file-name as long as there is a bookmark-make-cell-function. * info.el (Info-bookmark-jump): Remove relocation fallback. Don't set bookmark-current-bookmark.

--- a/lisp/info.el	Fri Mar 07 04:45:09 2008 +0000
+++ b/lisp/info.el	Fri Mar 07 05:00:18 2008 +0000
@@ -4373,8 +4373,7 @@
          (forward-str            (bookmark-get-front-context-string bmk))
          (behind-str             (bookmark-get-rear-context-string bmk))
          (place                  (bookmark-get-position bmk))
-	 (info-node              (bookmark-get-info-node bmk))
-	 (orig-file              file))
+	 (info-node              (bookmark-get-info-node bmk)))
     (if (setq file (bookmark-file-or-variation-thereof file))
         (save-excursion
           (save-window-excursion
@@ -4391,24 +4390,7 @@
             (if behind-str
                 (if (search-backward behind-str (point-min) t)
                     (goto-char (match-end 0))))
-            ;; added by db
-            (setq bookmark-current-bookmark bmk)
-	    `((buffer ,(current-buffer)) (position ,(point)))))
-
-      ;; Else unable to find the marked file, so ask if user wants to
-      ;; relocate the bookmark, else remind them to consider deletion.
-      (ding)
-      (if (y-or-n-p (concat (file-name-nondirectory orig-file)
-                            " nonexistent.  Relocate \""
-                            bmk
-                            "\"? "))
-          (progn
-            (bookmark-relocate bmk)
-            ;; gasp!  It's a recursive function call in Emacs Lisp!
-            (bookmark-jump-noselect bmk))
-        (message
-         "Bookmark not relocated; consider removing it \(%s\)." bmk)
-        nil))))
+	    `((buffer ,(current-buffer)) (position ,(point))))))))
 
 (provide 'info)