diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-03-07 05:00:18 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-03-07 05:00:18 +0000 |
| commit | 79363d93603102d19aacf30b576e3720b07443ae (patch) | |
| tree | bcfdeec5fb6d2bd4ed4c3b7935fb979e9fc0f447 /lisp/info.el | |
| parent | f7ae31df1dca38d27765672078d86103cb20cb65 (diff) | |
| download | emacs-79363d93603102d19aacf30b576e3720b07443ae.tar.gz | |
* 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.
Diffstat (limited to 'lisp/info.el')
| -rw-r--r-- | lisp/info.el | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/lisp/info.el b/lisp/info.el index 4d7e7da3b15..d85c0df8b17 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -4373,8 +4373,7 @@ BUFFER is the buffer speedbar is requesting buttons for." (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 @@ BUFFER is the buffer speedbar is requesting buttons for." (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) |