# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1279402519 14400
# Node ID c581eca79ab59e5b6c4463053e1b6a69515c5819
# Parent  406b2d52ff00557d46a65c715f49c4c172f6a223
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 -r 406b2d52ff00 -r c581eca79ab5 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jul 17 16:21:51 2010 -0400
+++ b/lisp/ChangeLog	Sat Jul 17 17:35:19 2010 -0400
@@ -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 -r 406b2d52ff00 -r c581eca79ab5 lisp/image-mode.el
--- a/lisp/image-mode.el	Sat Jul 17 16:21:51 2010 -0400
+++ b/lisp/image-mode.el	Sat Jul 17 17:35:19 2010 -0400
@@ -522,9 +522,9 @@
 (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)