diff options
| author | Andreas Schwab | 2010-09-04 12:43:43 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-09-04 12:43:43 +0200 |
| commit | 5e5992c20ef5f5d0ea67d23839a298b8dae91eff (patch) | |
| tree | 9f4524bc4cf7d620b0ec652582d10a6d0e0e1b2a /src | |
| parent | b7d187f836b71bfead1f99110842def6e9fcb596 (diff) | |
| download | emacs-5e5992c20ef5f5d0ea67d23839a298b8dae91eff.tar.gz emacs-5e5992c20ef5f5d0ea67d23839a298b8dae91eff.zip | |
* image.c (Fimagemagick_types): Doc fix.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/image.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d1d03ba6411..404c19c8faa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * image.c (imagemagick_image_p): Replace bcopy by memcpy. | 3 | * image.c (imagemagick_image_p): Replace bcopy by memcpy. |
| 4 | (imagemagick_load_image): Fix type mismatch. | 4 | (imagemagick_load_image): Fix type mismatch. |
| 5 | (Fimagemagick_types): Likewise. | 5 | (Fimagemagick_types): Likewise. Doc fix. |
| 6 | 6 | ||
| 7 | 2010-09-02 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2010-09-02 Jan Djärv <jan.h.d@swipnet.se> |
| 8 | 8 | ||
diff --git a/src/image.c b/src/image.c index 3eec0cbc802..a6d5a9fd246 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7825,8 +7825,8 @@ static struct image_type imagemagick_type = | |||
| 7825 | 7825 | ||
| 7826 | DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0, | 7826 | DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0, |
| 7827 | doc: /* Return image file types supported by ImageMagick. | 7827 | doc: /* Return image file types supported by ImageMagick. |
| 7828 | Since ImageMagick recognizes a lot of file-types that clash with Emacs, | 7828 | Since ImageMagick recognizes a lot of file-types that clash with Emacs, |
| 7829 | such as .c, we want to be able to alter the list at the lisp level. */) | 7829 | such as .c, we want to be able to alter the list at the lisp level. */) |
| 7830 | (void) | 7830 | (void) |
| 7831 | { | 7831 | { |
| 7832 | Lisp_Object typelist = Qnil; | 7832 | Lisp_Object typelist = Qnil; |