[Emacs-diffs] /srv/bzr/emacs/trunk r100842: Do not set bookmark context for images (Bug#6650).

[Chong Yidong]

------------------------------------------------------------
revno: 100842
author: Thierry Volpiatto <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-07-17 17:35:19 -0400
message:
  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).
modified:
  lisp/ChangeLog
  lisp/image-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-07-17 20:21:51 +0000
+++ b/lisp/ChangeLog    2010-07-17 21:35:19 +0000
@@ -1,3 +1,8 @@
+2010-07-17  Thierry Volpiatto  <address@hidden>
+
+       * image-mode.el (image-bookmark-make-record): Do not set context
+       in an image (Bug#6650).
+
 2010-07-17  Chong Yidong  <address@hidden>
 
        * simple.el (select-active-region): New function.

=== modified file 'lisp/image-mode.el'
--- a/lisp/image-mode.el        2010-07-14 15:57:54 +0000
+++ b/lisp/image-mode.el        2010-07-17 21:35:19 +0000
@@ -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)