aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/image.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4c6bfaa2b1a..e6b594258dc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-07-20 Glenn Morris <rgm@gnu.org>
2
3 * image.c (Fimage_flush): Fix doc typo.
4
12013-07-20 Paul Eggert <eggert@cs.ucla.edu> 52013-07-20 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Fix array bounds violation when pty allocation fails. 7 Fix array bounds violation when pty allocation fails.
diff --git a/src/image.c b/src/image.c
index 1e3944ac1a1..1f8cb520dca 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1569,7 +1569,7 @@ which is then usually a filename. */)
1569 1569
1570DEFUN ("image-flush", Fimage_flush, Simage_flush, 1570DEFUN ("image-flush", Fimage_flush, Simage_flush,
1571 1, 2, 0, 1571 1, 2, 0,
1572 doc: /* Fush the image with specification SPEC on frame FRAME. 1572 doc: /* Flush the image with specification SPEC on frame FRAME.
1573This removes the image from the Emacs image cache. If SPEC specifies 1573This removes the image from the Emacs image cache. If SPEC specifies
1574an image file, the next redisplay of this image will read from the 1574an image file, the next redisplay of this image will read from the
1575current contents of that file. 1575current contents of that file.