[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 25e638f726 34/50: Backport commit 1137219c9 from Em
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org 25e638f726 34/50: Backport commit 1137219c9 from Emacs |
Date: |
Tue, 4 Oct 2022 21:58:01 -0400 (EDT) |
branch: externals/org
commit 25e638f7266d783dcbf159735b77bd542cfb04aa
Author: Stefan Kangas <stefan@marxist.se>
Commit: Kyle Meyer <kyle@kyleam.com>
Backport commit 1137219c9 from Emacs
Make compat alias image-refresh obsolete
1137219c97dda512a309ce4bfad5abde0d2be206
Stefan Kangas
Tue Aug 9 14:04:39 2022 +0200
[ km: This was independently covered on the main branch with
e73c5b7d0. I'm applying it here too for bookkeeping/traceability
purposes. ]
---
lisp/org-plot.el | 2 +-
lisp/org.el | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index c2da24266a..831c84befc 100644
--- a/lisp/org-plot.el
+++ b/lisp/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.el b/lisp/org.el
index b0428be68a..28d4dfeb5b 100644
--- a/lisp/org.el
+++ b/lisp/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
- [elpa] externals/org 07b6a0e044 48/50: compat: Use org- wrapper for string-equal-ignore-case compatibility, (continued)
- [elpa] externals/org 07b6a0e044 48/50: compat: Use org- wrapper for string-equal-ignore-case compatibility, ELPA Syncer, 2022/10/04
- [elpa] externals/org 1adbaca75a 26/50: Backport commit 563bf2fae from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org aeb934b598 41/50: Merge branch 'km/from-emacs-28', ELPA Syncer, 2022/10/04
- [elpa] externals/org abc34b458f 43/50: org-mouse: Make recently ported change compatible with Emacs < 29, ELPA Syncer, 2022/10/04
- [elpa] externals/org 1f8cc85542 50/50: org-agenda: Replace 29.1 version keywords with package-version, ELPA Syncer, 2022/10/04
- [elpa] externals/org 42c418693f 42/50: Merge branch 'km/from-emacs-master', ELPA Syncer, 2022/10/04
- [elpa] externals/org 8ac9203d5c 20/50: Backport commit 979308b4c from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 4f8ea50604 18/50: Backport commit d21412df0 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org e614a763ca 27/50: Backport commit 70341cab3 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 19c3969e75 29/50: Backport commit 2682ea1b3 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 25e638f726 34/50: Backport commit 1137219c9 from Emacs,
ELPA Syncer <=
- [elpa] externals/org 9c2bc2877f 37/50: Backport commit 06d716147 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org c2c8e66e5d 38/50: Backport commit b7e867b84 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 6dd736ab35 44/50: ol-eshell: Make recently ported change compatible with Emacs < 29, ELPA Syncer, 2022/10/04