Merge from emacs-24; up to 2012-12-31T11:35:13Z!rudalics@gmx.at

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 @@
+2013-07-20  Glenn Morris  <rgm@gnu.org>
+
+        * image.c (Fimage_flush): Fix doc typo.
+
 2013-07-20  Paul Eggert  <eggert@cs.ucla.edu>
 
         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.  */)
 
 DEFUN ("image-flush", Fimage_flush, Simage_flush,
        1, 2, 0,
-       doc: /* Fush the image with specification SPEC on frame FRAME.
+       doc: /* Flush the image with specification SPEC on frame FRAME.
 This removes the image from the Emacs image cache.  If SPEC specifies
 an image file, the next redisplay of this image will read from the
 current contents of that file.