aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2016-05-23 12:51:44 -0400
committerGlenn Morris2016-05-23 12:51:44 -0400
commitd5f42ab6f06e1d468c6b92f2c1ef7b4d5f97ff84 (patch)
tree1d46444d40301989cef0479fb50295f2db864225
parent9c969e1f848e65b24e06d3919cde9a7ae668bfb8 (diff)
downloademacs-d5f42ab6f06e1d468c6b92f2c1ef7b4d5f97ff84.tar.gz
emacs-d5f42ab6f06e1d468c6b92f2c1ef7b4d5f97ff84.zip
* lisp/image.el (image--get-image): Remove nonsensical code.
; 1) put-image does not add a display property to its overlay ; 2) it does add a display text property ; 3) an overlay is not a cons whose car is 'image
-rw-r--r--lisp/image.el8
1 files changed, 1 insertions, 7 deletions
diff --git a/lisp/image.el b/lisp/image.el
index e855d5e97db..296d4300558 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -973,13 +973,7 @@ default is 20%."
973 0.8))) 973 0.8)))
974 974
975(defun image--get-image () 975(defun image--get-image ()
976 (let ((image (or (get-text-property (point) 'display) 976 (let ((image (get-text-property (point) 'display)))
977 ;; `put-image' uses overlays, so find an image in
978 ;; the overlays.
979 (catch 'found
980 (dolist (o (overlays-at (point)))
981 (if (overlay-get o 'display)
982 (throw 'found o)))))))
983 (when (or (not (consp image)) 977 (when (or (not (consp image))
984 (not (eq (car image) 'image))) 978 (not (eq (car image) 'image)))
985 (error "No image under point")) 979 (error "No image under point"))