From: Stefan Kangas <stefan@marxist.se>
Date: Tue, 9 Aug 2022 12:04:12 +0000 (+0200)
Subject: Make compat alias image-refresh obsolete
X-Git-Tag: emacs-29.0.90~1447^2~284
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1137219c97dda512a309ce4bfad5abde0d2be206;p=emacs.git

Make compat alias image-refresh obsolete

* lisp/image.el (image-refresh): Make compat alias obsolete.
Update callers.
---

diff --git a/lisp/image.el b/lisp/image.el
index 02e5c85fafd..de2afdc2c7b 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -32,7 +32,6 @@
   :group 'multimedia)
 
 (declare-function image-flush "image.c" (spec &optional frame))
-(defalias 'image-refresh 'image-flush)
 
 (defconst image-type-header-regexps
   `(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)
@@ -1304,6 +1303,8 @@ changing the displayed image size does not affect the saved image."
     (setf (image-property image :flip)
           (not (image-property image :flip)))))
 
+(define-obsolete-function-alias 'image-refresh #'image-flush "29.1")
+
 (provide 'image)
 
 ;;; image.el ends here
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index c2da24266ab..831c84befcb 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -622,7 +622,7 @@ manner suitable for prepending to a user-specified script."
   (dolist (img-overlay org-inline-image-overlays)
     (when (string= img-file (plist-get (cdr (overlay-get img-overlay 'display)) :file))
       (when (file-exists-p img-file)
-        (image-refresh (overlay-get img-overlay 'display))))))
+        (image-flush (overlay-get img-overlay 'display))))))
 
 ;;-----------------------------------------------------------------------------
 ;; facade functions
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 8bb69e98ce8..68f522b060a 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -16487,7 +16487,7 @@ INCLUDE-LINKED is passed to `org-display-inline-images'."
     (org-toggle-inline-images)))
 
 ;; For without-x builds.
-(declare-function image-refresh "image" (spec &optional frame))
+(declare-function image-flush "image" (spec &optional frame))
 
 (defcustom org-display-remote-inline-images 'skip
   "How to display remote inline images.
@@ -16628,7 +16628,7 @@ buffer boundaries with possible narrowing."
 				(org-element-property :begin link)
 				'org-image-overlay)))
 		      (if (and (car-safe old) refresh)
-			  (image-refresh (overlay-get (cdr old) 'display))
+                          (image-flush (overlay-get (cdr old) 'display))
 			(let ((image (org--create-inline-image file width)))
 			  (when image
 			    (let ((ov (make-overlay