Rename image-refresh to image-flush.

* image.c (Fimage_flush): Rename from image-refresh.

* image.el (image-refresh): Define as an alias for image-flush.

* image-mode.el (image-toggle-display-image): Caller changed.

* display.texi (Image Cache): Update documentation about image
caching.

3 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e59c4a45c29..72f00e60edf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.el (image-refresh): Define as an alias for image-flush.
+
+        * image-mode.el (image-toggle-display-image): Caller changed.
+
 2010-05-21  Juri Linkov  <juri@jurta.org>
 
         * progmodes/grep.el (grep-read-files): Fix multi-pattern aliases.
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index dfc96bb4a16..f1323563d5d 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -448,7 +448,7 @@ Remove text properties that display the image."
 
 (defvar archive-superior-buffer)
 (defvar tar-superior-buffer)
-(declare-function image-refresh "image.c" (spec &optional frame))
+(declare-function image-flush "image.c" (spec &optional frame))
 
 (defun image-toggle-display-image ()
   "Show the image of the image file.
@@ -477,7 +477,7 @@ was inserted."
          (inhibit-read-only t)
          (buffer-undo-list t)
          (modified (buffer-modified-p)))
-    (image-refresh image)
+    (image-flush image)
     (let ((buffer-file-truename nil)) ; avoid changing dir mtime by lock_file
       (add-text-properties (point-min) (point-max) props)
       (restore-buffer-modified-p modified))
diff --git a/lisp/image.el b/lisp/image.el
index 67c1ad946b1..b3a0f1a8a7d 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -30,6 +30,7 @@
   "Image support."
   :group 'multimedia)
 
+(defalias 'image-refresh 'image-flush)
 
 (defconst image-type-header-regexps
   `(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)