Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/
Now on revision 102624.
------------------------------------------------------------
revno: 102624
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Thu 2010-12-09 19:47:49 -0800
message:
  * lisp/files.el (diff-no-select): Declare.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-12-10 03:39:18 +0000
+++ lisp/ChangeLog	2010-12-10 03:47:49 +0000
@@ -1,5 +1,7 @@
 2010-12-10  Glenn Morris  <rgm@gnu.org>
 
+	* files.el (diff-no-select): Declare.
+
 	* mail/emacsbug.el (report-emacs-bug): Use mail-user-agent properties.
 	(report-emacs-bug-create-existing-bugs-buffer): Avoid free variables.
 

=== modified file 'lisp/files.el'
--- lisp/files.el	2010-12-08 02:18:02 +0000
+++ lisp/files.el	2010-12-10 03:47:49 +0000
@@ -4500,6 +4500,9 @@
 		   (setq buffer-backed-up nil))))))
     setmodes))
 
+(declare-function diff-no-select "diff"
+		  (old new &optional switches no-async buf))
+
 (defvar save-some-buffers-action-alist
   `((?\C-r
      ,(lambda (buf)
------------------------------------------------------------
revno: 102623
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Thu 2010-12-09 19:39:18 -0800
message:
  Small emacsbug.el stuff.
  * lisp/mail/emacsbug.el (report-emacs-bug): Use mail-user-agent properties.
  (report-emacs-bug-create-existing-bugs-buffer): Avoid free variables.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-12-10 03:36:46 +0000
+++ lisp/ChangeLog	2010-12-10 03:39:18 +0000
@@ -1,5 +1,8 @@
 2010-12-10  Glenn Morris  <rgm@gnu.org>
 
+	* mail/emacsbug.el (report-emacs-bug): Use mail-user-agent properties.
+	(report-emacs-bug-create-existing-bugs-buffer): Avoid free variables.
+
 	* comint.el (comint-input-ring-file-name): Doc fix.
 
 2010-12-09  Eli Zaretskii  <eliz@gnu.org>

=== modified file 'lisp/mail/emacsbug.el'
--- lisp/mail/emacsbug.el	2010-12-08 03:47:27 +0000
+++ lisp/mail/emacsbug.el	2010-12-10 03:39:18 +0000
@@ -279,22 +279,11 @@
     (if can-xdg-email
 	(define-key (current-local-map) "\C-cm"
 	  'report-emacs-bug-insert-to-mailer))
-    ;; Could test major-mode instead.
-    (cond ((memq mail-user-agent '(message-user-agent gnus-user-agent))
-           (setq report-emacs-bug-send-command "message-send-and-exit"
-                 report-emacs-bug-send-hook 'message-send-hook))
-          ((eq mail-user-agent 'sendmail-user-agent)
-           (setq report-emacs-bug-send-command "mail-send-and-exit"
-                 report-emacs-bug-send-hook 'mail-send-hook))
-          ((eq mail-user-agent 'mh-e-user-agent)
-           (setq report-emacs-bug-send-command "mh-send-letter"
-                 report-emacs-bug-send-hook 'mh-before-send-letter-hook))
-	  ((eq mail-user-agent 'vm-user-agent)
-	   (setq report-emacs-bug-send-command "vm-mail-send-and-exit"
-		 report-emacs-bug-send-hook 'vm-mail-send-hook))
-	  ((eq mail-user-agent 'wl-user-agent)
-	   (setq report-emacs-bug-send-command "wl-draft-send-and-exit"
-		 report-emacs-bug-send-hook 'wl-draft-send-hook)))
+    (setq report-emacs-bug-send-command (get mail-user-agent 'sendfunc)
+	  report-emacs-bug-send-hook (get mail-user-agent 'hookvar))
+    (if report-emacs-bug-send-command
+	(setq report-emacs-bug-send-command
+	      (symbol-name report-emacs-bug-send-command)))
     (unless report-emacs-bug-no-explanations
       (with-output-to-temp-buffer "*Bug Help*"
 	(princ "While in the mail buffer:\n\n")
@@ -386,19 +375,22 @@
 
 ;; Querying the bug database
 
+(defvar report-emacs-bug-bug-alist nil)
+(make-variable-buffer-local 'report-emacs-bug-bug-alist)
+(defvar report-emacs-bug-choice-widget nil)
+(make-variable-buffer-local 'report-emacs-bug-choice-widget)
+
 (defun report-emacs-bug-create-existing-bugs-buffer (bugs keywords)
   (switch-to-buffer (get-buffer-create "*Existing Emacs Bugs*"))
   (setq buffer-read-only t)
   (let ((inhibit-read-only t))
     (erase-buffer)
-    (make-local-variable 'bug-alist)
-    (setq bug-alist bugs)
-    (make-local-variable 'bug-choice-widget)
+    (setq report-emacs-bug-bug-alist bugs)
     (widget-insert (propertize (concat "Already known bugs ("
 				       keywords "):\n\n")
 			       'face 'bold))
     (if bugs
-	(setq bug-choice-widget
+	(setq report-emacs-bug-choice-widget
 	      (apply 'widget-create 'radio-button-choice
 		     :value (caar bugs)
 		     (let (items)
@@ -423,10 +415,10 @@
       (widget-insert " ")
       (widget-create 'push-button
 		     :notify (lambda (&rest ignore)
-			       (let ((val (widget-value bug-choice-widget)))
+			       (let ((val (widget-value report-emacs-bug-choice-widget)))
 				 ;; TODO: Do something!
 				 (message "Appending to bug %s!"
-					  (nth 2 (assoc val bug-alist)))))
+					  (nth 2 (assoc val report-emacs-bug-bug-alist)))))
 		     "Append to chosen bug"))
     (widget-insert " ")
     (widget-create 'push-button
------------------------------------------------------------
revno: 102622
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Thu 2010-12-09 19:36:46 -0800
message:
  * lisp/comint.el (comint-input-ring-file-name): Doc fix.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-12-10 03:34:59 +0000
+++ lisp/ChangeLog	2010-12-10 03:36:46 +0000
@@ -1,3 +1,7 @@
+2010-12-10  Glenn Morris  <rgm@gnu.org>
+
+	* comint.el (comint-input-ring-file-name): Doc fix.
+
 2010-12-09  Eli Zaretskii  <eliz@gnu.org>
 
 	* menu-bar.el (menu-bar-frame-for-menubar, menu-bar-positive-p):

=== modified file 'lisp/comint.el'
--- lisp/comint.el	2010-11-18 03:54:14 +0000
+++ lisp/comint.el	2010-12-10 03:36:46 +0000
@@ -244,8 +244,8 @@
 (defcustom comint-input-ring-file-name nil
   "If non-nil, name of the file to read/write input history.
 See also `comint-read-input-ring' and `comint-write-input-ring'.
-
-This variable is buffer-local, and is a good thing to set in mode hooks."
+`comint-mode' makes this a buffer-local variable.  You probably want
+to set this in a mode hook, rather than customize the default value."
   :type '(choice (const :tag "nil" nil)
 		 file)
   :group 'comint)
------------------------------------------------------------
revno: 102621
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Thu 2010-12-09 19:34:59 -0800
message:
  Fix ChangeLog attribution.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-12-09 19:07:53 +0000
+++ lisp/ChangeLog	2010-12-10 03:34:59 +0000
@@ -19,10 +19,10 @@
 	* play/landmark.el (lm-print-y,s,noise-int, lm-print-y,s,noise):
 	Rename functions without commas, update callers.
 
-2010-12-08  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+2010-12-08  Jeff Dairiki  <dairiki@dairiki.org>  (tiny change)
 
-	* whitespace.el: New version 13.2.
-	(whitespace-cleanup-region): Tiny code fix.  (Bug#7582)
+	* whitespace.el (whitespace-cleanup-region):
+	Clean up spaces before tabs.  (Bug#7582)
 
 2010-12-08  Karl Fogel  <kfogel@red-bean.com>
------------------------------------------------------------
revno: 102620
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Thu 2010-12-09 23:20:33 +0000
message:
  shr.el (shr-tag-label): Add <label> support.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-12-09 11:11:11 +0000
+++ lisp/gnus/ChangeLog	2010-12-09 23:20:33 +0000
@@ -1,6 +1,7 @@
 2010-12-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* shr.el (shr-tag-script): Ignore <script>.
+	(shr-tag-label): Add <label> support.
 
 2010-12-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 

=== modified file 'lisp/gnus/shr.el'
--- lisp/gnus/shr.el	2010-12-09 10:43:50 +0000
+++ lisp/gnus/shr.el	2010-12-09 23:20:33 +0000
@@ -644,6 +644,10 @@
 (defun shr-tag-script (cont)
   )
 
+(defun shr-tag-label (cont)
+  (shr-generic cont)
+  (shr-ensure-paragraph))
+
 (defun shr-tag-p (cont)
   (shr-ensure-paragraph)
   (shr-indent)
------------------------------------------------------------
revno: 102619
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Thu 2010-12-09 21:07:53 +0200
message:
  Fix bug #1077 with popping new frames from a minibuffer-only frame.
  
   menu-bar.el (menu-bar-frame-for-menubar, menu-bar-positive-p):
   New functions.
   (menu-bar-showhide-menu) <menu-bar-mode, showhide-tool-bar>: Use
   them instead of `nil' and `>', respectively.
   (menu-bar-showhide-tool-bar-menu): Use menu-bar-frame-for-menubar
   instead of `nil'.
   (toggle-menu-bar-mode-from-frame): Use menu-bar-frame-for-menubar
   and menu-bar-positive-p instead of `nil' and `>', respectively.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-12-09 10:55:03 +0000
+++ lisp/ChangeLog	2010-12-09 19:07:53 +0000
@@ -1,3 +1,15 @@
+2010-12-09  Eli Zaretskii  <eliz@gnu.org>
+
+	* menu-bar.el (menu-bar-frame-for-menubar, menu-bar-positive-p):
+	New functions.
+	(menu-bar-showhide-menu) <menu-bar-mode, showhide-tool-bar>: Use
+	them instead of `nil' and `>', respectively.
+	(menu-bar-showhide-tool-bar-menu): Use menu-bar-frame-for-menubar
+	instead of `nil'.
+	(toggle-menu-bar-mode-from-frame): Use menu-bar-frame-for-menubar
+	and menu-bar-positive-p instead of `nil' and `>', respectively.
+	(Bug#1077)
+
 2010-12-09  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
 	* whitespace.el (whitespace-newline-mode): Code fix.

=== modified file 'lisp/menu-bar.el'
--- lisp/menu-bar.el	2010-10-31 14:40:01 +0000
+++ lisp/menu-bar.el	2010-12-09 19:07:53 +0000
@@ -1020,10 +1020,24 @@
 	      :visible (and (display-graphic-p) (fboundp 'x-show-tip))
 	      :button (:toggle . tooltip-mode)))
 
+(defun menu-bar-frame-for-menubar ()
+  "Return the frame suitable for updating the menu bar."
+  (or (and (framep menu-updating-frame)
+	   menu-updating-frame)
+      (selected-frame)))
+
+(defun menu-bar-positive-p (val)
+  "Return non-nil iff VAL is a positive number."
+  (and (numberp val)
+       (> val 0)))
+
 (define-key menu-bar-showhide-menu [menu-bar-mode]
   `(menu-item ,(purecopy "Menu-bar") toggle-menu-bar-mode-from-frame
 	      :help ,(purecopy "Turn menu-bar on/off")
-	      :button (:toggle . (> (frame-parameter nil 'menu-bar-lines) 0))))
+	      :button
+	      (:toggle . (menu-bar-positive-p
+			  (frame-parameter (menu-bar-frame-for-menubar)
+					   'menu-bar-lines)))))
 
 (defun menu-bar-set-tool-bar-position (position)
   (customize-set-variable 'tool-bar-mode t)
@@ -1060,7 +1074,9 @@
 		    :visible (display-graphic-p)
 		    :button
 		    (:radio . (and tool-bar-mode
-				   (eq (frame-parameter nil 'tool-bar-position)
+				   (eq (frame-parameter
+					(menu-bar-frame-for-menubar)
+					'tool-bar-position)
 				       'left)))))
 
       (define-key menu-bar-showhide-tool-bar-menu [showhide-tool-bar-right]
@@ -1070,7 +1086,9 @@
 		    :visible (display-graphic-p)
 		    :button
 		    (:radio . (and tool-bar-mode
-				   (eq (frame-parameter nil 'tool-bar-position)
+				   (eq (frame-parameter
+					(menu-bar-frame-for-menubar)
+					'tool-bar-position)
 				       'right)))))
 
       (define-key menu-bar-showhide-tool-bar-menu [showhide-tool-bar-bottom]
@@ -1080,7 +1098,9 @@
 		    :visible (display-graphic-p)
 		    :button
 		    (:radio . (and tool-bar-mode
-				   (eq (frame-parameter nil 'tool-bar-position)
+				   (eq (frame-parameter
+					(menu-bar-frame-for-menubar)
+					'tool-bar-position)
 				       'bottom)))))
 
       (define-key menu-bar-showhide-tool-bar-menu [showhide-tool-bar-top]
@@ -1090,7 +1110,9 @@
 		    :visible (display-graphic-p)
 		    :button
 		    (:radio . (and tool-bar-mode
-				   (eq (frame-parameter nil 'tool-bar-position)
+				   (eq (frame-parameter
+					(menu-bar-frame-for-menubar)
+					'tool-bar-position)
 				       'top)))))
 
       (define-key menu-bar-showhide-tool-bar-menu [showhide-tool-bar-none]
@@ -1110,8 +1132,10 @@
     `(menu-item ,(purecopy "Tool-bar") toggle-tool-bar-mode-from-frame
 		:help ,(purecopy "Turn tool-bar on/off")
 		:visible (display-graphic-p)
-		:button (:toggle . (> (frame-parameter nil 'tool-bar-lines) 0))))
-)
+		:button
+		(:toggle . (menu-bar-positive-p
+			    (frame-parameter (menu-bar-frame-for-menubar)
+					     'tool-bar-lines))))))
 
 (define-key menu-bar-options-menu [showhide]
   `(menu-item ,(purecopy "Show/Hide") ,menu-bar-showhide-menu))
@@ -2109,7 +2133,10 @@
 See `menu-bar-mode' for more information."
   (interactive (list (or current-prefix-arg 'toggle)))
   (if (eq arg 'toggle)
-      (menu-bar-mode (if (> (frame-parameter nil 'menu-bar-lines) 0) 0 1))
+      (menu-bar-mode
+       (if (menu-bar-positive-p
+	    (frame-parameter (menu-bar-frame-for-menubar) 'menu-bar-lines))
+	    0 1))
     (menu-bar-mode arg)))
 
 (declare-function x-menu-bar-open "term/x-win" (&optional frame))
------------------------------------------------------------
revno: 102618
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Thu 2010-12-09 11:11:11 +0000
message:
  mm-util.el (mm-ucs-to-char): Use eval-and-compile.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-12-09 10:43:50 +0000
+++ lisp/gnus/ChangeLog	2010-12-09 11:11:11 +0000
@@ -4,6 +4,8 @@
 
 2010-12-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* mm-util.el (mm-ucs-to-char): Use eval-and-compile.
+
 	* shr.el (shr-image-displayer): Work for images lined side by side.
 
 2010-12-08  Robert Pluim  <rpluim@gmail.com>

=== modified file 'lisp/gnus/mm-util.el'
--- lisp/gnus/mm-util.el	2010-12-07 05:06:56 +0000
+++ lisp/gnus/mm-util.el	2010-12-09 11:11:11 +0000
@@ -220,42 +220,43 @@
      (t 'identity))))
 
 ;; `ucs-to-char' is a function that Mule-UCS provides.
-(if (featurep 'xemacs)
-    (cond ((and (fboundp 'unicode-to-char) ;; XEmacs 21.5.
-		(subrp (symbol-function 'unicode-to-char)))
-	   (if (featurep 'mule)
-	       (defalias 'mm-ucs-to-char 'unicode-to-char)
-	     (defun mm-ucs-to-char (codepoint)
-	       "Convert Unicode codepoint to character."
-	       (or (unicode-to-char codepoint) ?#))))
-	  ((featurep 'mule)
-	   (defun mm-ucs-to-char (codepoint)
-	     "Convert Unicode codepoint to character."
-	     (if (fboundp 'ucs-to-char) ;; Mule-UCS is loaded.
-		 (progn
-		   (defalias 'mm-ucs-to-char
-		     (lambda (codepoint)
-		       "Convert Unicode codepoint to character."
-		       (condition-case nil
-			   (or (ucs-to-char codepoint) ?#)
-			 (error ?#))))
-		   (mm-ucs-to-char codepoint))
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (cond ((and (fboundp 'unicode-to-char) ;; XEmacs 21.5.
+		  (subrp (symbol-function 'unicode-to-char)))
+	     (if (featurep 'mule)
+		 (defalias 'mm-ucs-to-char 'unicode-to-char)
+	       (defun mm-ucs-to-char (codepoint)
+		 "Convert Unicode codepoint to character."
+		 (or (unicode-to-char codepoint) ?#))))
+	    ((featurep 'mule)
+	     (defun mm-ucs-to-char (codepoint)
+	       "Convert Unicode codepoint to character."
+	       (if (fboundp 'ucs-to-char) ;; Mule-UCS is loaded.
+		   (progn
+		     (defalias 'mm-ucs-to-char
+		       (lambda (codepoint)
+			 "Convert Unicode codepoint to character."
+			 (condition-case nil
+			     (or (ucs-to-char codepoint) ?#)
+			   (error ?#))))
+		     (mm-ucs-to-char codepoint))
+		 (condition-case nil
+		     (or (int-to-char codepoint) ?#)
+		   (error ?#)))))
+	    (t
+	     (defun mm-ucs-to-char (codepoint)
+	       "Convert Unicode codepoint to character."
 	       (condition-case nil
 		   (or (int-to-char codepoint) ?#)
 		 (error ?#)))))
-	  (t
-	   (defun mm-ucs-to-char (codepoint)
-	     "Convert Unicode codepoint to character."
-	     (condition-case nil
-		 (or (int-to-char codepoint) ?#)
-	       (error ?#)))))
-  (if (let ((char (make-char 'japanese-jisx0208 36 34)))
-	(eq char (decode-char 'ucs char)))
-      ;; Emacs 23.
-      (defalias 'mm-ucs-to-char 'identity)
-    (defun mm-ucs-to-char (codepoint)
-      "Convert Unicode codepoint to character."
-      (or (decode-char 'ucs codepoint) ?#))))
+    (if (let ((char (make-char 'japanese-jisx0208 36 34)))
+	  (eq char (decode-char 'ucs char)))
+	;; Emacs 23.
+	(defalias 'mm-ucs-to-char 'identity)
+      (defun mm-ucs-to-char (codepoint)
+	"Convert Unicode codepoint to character."
+	(or (decode-char 'ucs codepoint) ?#)))))
 
 ;; Fixme:  This seems always to be used to read a MIME charset, so it
 ;; should be re-named and fixed (in Emacs) to offer completion only on
------------------------------------------------------------
revno: 102617
committer: Vinicius Jose Latorre  <viniciusjl@ig.com.br
branch nick: trunk
timestamp: Thu 2010-12-09 08:55:03 -0200
message:
  Tiny code fix.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-12-09 05:55:25 +0000
+++ lisp/ChangeLog	2010-12-09 10:55:03 +0000
@@ -1,3 +1,7 @@
+2010-12-09  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+	* whitespace.el (whitespace-newline-mode): Code fix.
+
 2010-12-09  Glenn Morris  <rgm@gnu.org>
 
 	* play/landmark.el (lm-print-y,s,noise-int, lm-print-y,s,noise):

=== modified file 'lisp/whitespace.el'
--- lisp/whitespace.el	2010-12-08 19:25:11 +0000
+++ lisp/whitespace.el	2010-12-09 10:55:03 +0000
@@ -1103,7 +1103,7 @@
   :init-value nil
   :global     nil
   :group      'whitespace
-  (let ((whitespace-style '(newline-mark newline)))
+  (let ((whitespace-style '(face newline-mark newline)))
     (whitespace-mode whitespace-newline-mode)
     ;; sync states (running a batch job)
     (setq whitespace-newline-mode whitespace-mode)))
------------------------------------------------------------
revno: 102616
author: Lars Magne Ingebrigtsen <larsi@gnus.org>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Thu 2010-12-09 10:43:50 +0000
message:
  shr.el (shr-tag-script): Ignore <script>.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-12-09 06:40:56 +0000
+++ lisp/gnus/ChangeLog	2010-12-09 10:43:50 +0000
@@ -1,3 +1,7 @@
+2010-12-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* shr.el (shr-tag-script): Ignore <script>.
+
 2010-12-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* shr.el (shr-image-displayer): Work for images lined side by side.

=== modified file 'lisp/gnus/shr.el'
--- lisp/gnus/shr.el	2010-12-09 06:40:56 +0000
+++ lisp/gnus/shr.el	2010-12-09 10:43:50 +0000
@@ -641,6 +641,9 @@
 (defun shr-tag-style (cont)
   )
 
+(defun shr-tag-script (cont)
+  )
+
 (defun shr-tag-p (cont)
   (shr-ensure-paragraph)
   (shr-indent)
------------------------------------------------------------
revno: 102615
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Thu 2010-12-09 06:40:56 +0000
message:
  shr.el (shr-image-displayer): Work for images lined side by side.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-12-08 22:16:36 +0000
+++ lisp/gnus/ChangeLog	2010-12-09 06:40:56 +0000
@@ -1,3 +1,7 @@
+2010-12-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* shr.el (shr-image-displayer): Work for images lined side by side.
+
 2010-12-08  Robert Pluim  <rpluim@gmail.com>
 
 	* gnus-demon.el (gnus-demon-init): Call run-with-timer with an integer

=== modified file 'lisp/gnus/shr.el'
--- lisp/gnus/shr.el	2010-12-07 22:12:50 +0000
+++ lisp/gnus/shr.el	2010-12-09 06:40:56 +0000
@@ -524,7 +524,7 @@
   "Return a function to display an image.
 CONTENT-FUNCTION is a function to retrieve an image for a cid url that
 is an argument.  The function to be returned takes three arguments URL,
-START, and END."
+START, and END.  Note that START and END should be merkers."
   `(lambda (url start end)
      (when url
        (if (string-match "\\`cid:" url)
@@ -534,9 +534,8 @@
 		 (when image
 		   (goto-char start)
 		   (shr-put-image image
-				  (prog1
-				      (buffer-substring-no-properties start end)
-				    (delete-region start end))))))
+				  (buffer-substring-no-properties start end))
+		   (delete-region (point) end))))
 	 (url-retrieve url 'shr-image-fetched
 		       (list (current-buffer) start end)
 		       t)))))