* lisp/ps-mule.el (ps-mule-plot-string): Don't inf-loop.

* lisp/image-mode.el (image-toggle-display-text)
(image-toggle-display-image): Stay away from evil `intangible'.

Fixes: debbugs:5108

lisp/ChangeLog

@@ -1,3 +1,9 @@
+2011-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* ps-mule.el (ps-mule-plot-string): Don't inf-loop (bug#5108).
+	* image-mode.el (image-toggle-display-text)
+	(image-toggle-display-image): Stay away from evil `intangible'.
+
 2011-09-19  Leo Liu  <sdl.web@gmail.com>
 
 	* replace.el (occur-revert-arguments): Make it permanent-local.

lisp/image-mode.el

@@ -465,7 +465,7 @@ Remove text properties that display the image."
 	(buffer-undo-list t)
 	(modified (buffer-modified-p)))
     (remove-list-of-text-properties (point-min) (point-max)
-				    '(display intangible read-nonsticky
+				    '(display read-nonsticky ;; intangible
 					      read-only front-sticky))
     (set-buffer-modified-p modified)
     (if (called-interactively-p 'any)
@@ -506,8 +506,8 @@ was inserted."
     (setq image (append image (image-transform-properties image)))
     (setq props
 	  `(display ,image
-		    intangible ,image
-		    rear-nonsticky (display intangible)
+		    ;; intangible ,image
+		    rear-nonsticky (display) ;; intangible
 		    read-only t front-sticky (read-only)))
 
     (let ((buffer-file-truename nil)) ; avoid changing dir mtime by lock_file

lisp/ps-mule.el

@@ -659,7 +659,7 @@ the sequence."
 	 width)
     (goto-char from)
     (while (not endpos)
-      (cond ((= (point) stop)
+      (cond ((>= (point) stop)
 	     (if (= stop to)
 		 (setq endpos stop)
 	       (when (< from stop)