* 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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 54b8e1ff7a258fc2e71fd8b216c7d67ab4d0f847..258b0067d98b3ea0b4d4b9007ae856d1d44edb7d 100644 (file)
--- a/lisp/ChangeLog
+++ b/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.

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index cffa2592aa135f551793ad81b3e46f66cb52b475..0995048fce50204fe5b5c0d4b3197acf45886bab 100644 (file)
--- a/lisp/image-mode.el
+++ b/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

diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index d95719ba55293c3fad7e333ea2b05e3536fa07cc..c0e4d68107be5abf51c6a8e25bf2fb589ac558dd 100644 (file)
--- a/lisp/ps-mule.el
+++ b/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)