(bookmark-automatically-show-annotations): new var.

(bookmark-jump): only show annotation if above var is non-nil.

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 79b2904898ad526289483a88d6124f37e8cfd79f..645a55688ce86af88e41fe72cd521ee2baee641b 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -5,7 +5,7 @@
 ;; Author: Karl Fogel <kfogel@cyclic.com>
 ;; Maintainer: Karl Fogel <kfogel@cyclic.com>
 ;; Created: July, 1993
-;; Author's Update Number: 2.6.9
+;; Author's Update Number: 2.6.10
 ;; Keywords: bookmarks, placeholders, annotations
 
 ;;; Summary:
@@ -252,6 +252,10 @@ name.  Otherwise they will be displayed in LIFO order (that is, most
 recently set ones come first, oldest ones come last).")
 
 
+(defvar bookmark-automatically-show-annotations t
+  "*Nil means don't show annotations when jumping to a bookmark.")
+
+
 (defvar bookmark-search-size 16
   "Length of the context strings recorded on either side of a bookmark.")
 
@@ -980,9 +984,10 @@ of the old one in the permanent bookmark record."
     (and cell
          (switch-to-buffer (car cell))
          (goto-char (cdr cell))
-        ;; if there is an annotation for this bookmark,
-        ;; show it in a buffer.
-        (bookmark-show-annotation str))))
+        (if bookmark-automatically-show-annotations
+             ;; if there is an annotation for this bookmark,
+             ;; show it in a buffer.
+             (bookmark-show-annotation str)))))
 
 
 (defun bookmark-jump-noselect (str)