aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2010-05-22 12:48:01 -0400
committerChong Yidong2010-05-22 12:48:01 -0400
commit110683addccf829fa2b98fa279246f60a228d4fa (patch)
treecd79923115846b4f226a3d2d32f767bbf7feee9c /src
parent4e3028f8f788c646a184f74f13c6e8ec0bc61b81 (diff)
downloademacs-110683addccf829fa2b98fa279246f60a228d4fa.tar.gz
emacs-110683addccf829fa2b98fa279246f60a228d4fa.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/image.c12
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f0613a57405..489505f3cf3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-05-22 Chong Yidong <cyd@stupidchicken.com>
2
3 * image.c (Fimage_flush): Rename from image-refresh.
4
12010-05-21 Chong Yidong <cyd@stupidchicken.com> 52010-05-21 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * xdisp.c (redisplay_internal): Clear caches even if redisplaying 7 * xdisp.c (redisplay_internal): Clear caches even if redisplaying
diff --git a/src/image.c b/src/image.c
index 5d4f50ee85e..b9620e10948 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1689,11 +1689,13 @@ which is then usually a filename. */)
1689} 1689}
1690 1690
1691 1691
1692DEFUN ("image-refresh", Fimage_refresh, Simage_refresh, 1692DEFUN ("image-flush", Fimage_flush, Simage_flush,
1693 1, 2, 0, 1693 1, 2, 0,
1694 doc: /* Refresh the image with specification SPEC on frame FRAME. 1694 doc: /* Fush the image with specification SPEC on frame FRAME.
1695If SPEC specifies an image file, the displayed image is updated with 1695This removes the image from the Emacs image cache. If SPEC specifies
1696the current contents of that file. 1696an image file, the next redisplay of this image will read from the
1697current contents of that file.
1698
1697FRAME nil or omitted means use the selected frame. 1699FRAME nil or omitted means use the selected frame.
1698FRAME t means refresh the image on all frames. */) 1700FRAME t means refresh the image on all frames. */)
1699 (spec, frame) 1701 (spec, frame)
@@ -8526,7 +8528,7 @@ non-numeric, there is no explicit limit on the size of images. */);
8526 8528
8527 defsubr (&Sinit_image_library); 8529 defsubr (&Sinit_image_library);
8528 defsubr (&Sclear_image_cache); 8530 defsubr (&Sclear_image_cache);
8529 defsubr (&Simage_refresh); 8531 defsubr (&Simage_flush);
8530 defsubr (&Simage_size); 8532 defsubr (&Simage_size);
8531 defsubr (&Simage_mask_p); 8533 defsubr (&Simage_mask_p);
8532 defsubr (&Simage_metadata); 8534 defsubr (&Simage_metadata);