diff src/image.c @ 109853:fe07c47cf7a7

merge and fixes
author Joakim <joakim@localhost.localdomain>
date Thu, 13 May 2010 15:13:52 +0200
parents 28a8c62b8ee7
children ecac5346ac63
line wrap: on
line diff
--- a/src/image.c	Wed May 12 14:32:06 2010 +0200
+++ b/src/image.c	Thu May 13 15:13:52 2010 +0200
@@ -7961,7 +7961,7 @@
 
 DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0,0,0,
        doc: /* Return image file types supported by ImageMagick.
-             Since ImageMagic recognizes a lot of file-types that clash with Emacs,
+             Since ImageMagick recognizes a lot of file-types that clash with Emacs,
             such as .c, we want to be able to alter the list at the lisp level.  */)
   ()
 {