[Emacs-diffs] /srv/bzr/emacs/trunk r105843: * lisp/ps-mule.el (ps-mule-plot-string): Don't inf-loop.

[Stefan Monnier]

------------------------------------------------------------
revno: 105843
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5108
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-09-19 15:27:30 -0400
message:
  * 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'.
modified:
  lisp/ChangeLog
  lisp/image-mode.el
  lisp/ps-mule.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-19 18:57:55 +0000
+++ b/lisp/ChangeLog    2011-09-19 19:27:30 +0000
@@ -1,3 +1,9 @@
+2011-09-19  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * replace.el (occur-revert-arguments): Make it permanent-local.

=== modified file 'lisp/image-mode.el'
--- a/lisp/image-mode.el        2011-09-11 02:31:21 +0000
+++ b/lisp/image-mode.el        2011-09-19 19:27:30 +0000
@@ -465,7 +465,7 @@
        (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 @@
     (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

=== modified file 'lisp/ps-mule.el'
--- a/lisp/ps-mule.el   2011-04-19 13:44:55 +0000
+++ b/lisp/ps-mule.el   2011-09-19 19:27:30 +0000
@@ -659,7 +659,7 @@
         width)
     (goto-char from)
     (while (not endpos)
-      (cond ((= (point) stop)
+      (cond ((>= (point) stop)
             (if (= stop to)
                 (setq endpos stop)
               (when (< from stop)