Do not set bookmark context for images (Bug#6650).

* lisp/image-mode.el (image-bookmark-make-record): Do not set context
in an image (Bug#6650).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7aca9ba3ef9aa85a49077722729f56979b08c377..a1bce7df5959f2e1f3af5c6c7dfe5d71374c9771 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-17  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+       * image-mode.el (image-bookmark-make-record): Do not set context
+       in an image (Bug#6650).
+
 2010-07-17  Chong Yidong  <cyd@stupidchicken.com>
 
        * simple.el (select-active-region): New function.

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index ca17569c91e116705d9062259a604af213516fcb..e202aca63b0159a7b9aa69d0faaf976022f542d8 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -522,9 +522,9 @@ the image file and `image-mode' showing the image as an image."
 (declare-function bookmark-default-handler "bookmark" (bmk))
 
 (defun image-bookmark-make-record ()
-  (nconc (bookmark-make-record-default)
-         `((image-type . ,image-type)
-           (handler    . image-bookmark-jump))))
+  `(,@(bookmark-make-record-default nil 'no-context 0)
+      (image-type . ,image-type)
+      (handler    . image-bookmark-jump)))
 
 ;;;###autoload
 (defun image-bookmark-jump (bmk)