# HG changeset patch
# User Karl Fogel <kfogel@red-bean.com>
# Date 795710798 0
# Node ID ebee80744a0629204f5dd20ad12e72ead198cfbc
# Parent  ee94cf4fd05a39aefb99e4181636ebeda93f4e2c
(bookmark-automatically-show-annotations): new var.
(bookmark-jump): only show annotation if above var is non-nil.

diff -r ee94cf4fd05a -r ebee80744a06 lisp/bookmark.el
--- a/lisp/bookmark.el	Mon Mar 20 05:09:18 1995 +0000
+++ b/lisp/bookmark.el	Mon Mar 20 14:46:38 1995 +0000
@@ -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 @@
 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 @@
     (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)