diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/image.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 67c100600fa..6d71346dd78 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -63,6 +63,10 @@ | |||
| 63 | and not pointers. | 63 | and not pointers. |
| 64 | * lisp.h (__executable_start): New decl. | 64 | * lisp.h (__executable_start): New decl. |
| 65 | 65 | ||
| 66 | 2012-05-31 Glenn Morris <rgm@gnu.org> | ||
| 67 | |||
| 68 | * image.c (Fimagemagick_types): Doc fix. | ||
| 69 | |||
| 66 | 2012-05-30 Jim Meyering <meyering@redhat.com> | 70 | 2012-05-30 Jim Meyering <meyering@redhat.com> |
| 67 | 71 | ||
| 68 | * callproc.c (Fcall_process_region): Include directory component | 72 | * callproc.c (Fcall_process_region): Include directory component |
diff --git a/src/image.c b/src/image.c index a3b64b74997..b6cdb6c8290 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | /* Functions for image support on window system. | 1 | /* Functions for image support on window system. |
| 2 | Copyright (C) 1989, 1992-2012 Free Software Foundation, Inc. | 2 | |
| 3 | Copyright (C) 1989, 1992-2012 Free Software Foundation, Inc. | ||
| 3 | 4 | ||
| 4 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 5 | 6 | ||
| @@ -7987,7 +7988,8 @@ their descriptions (http://www.imagemagick.org/script/formats.php). | |||
| 7987 | You can also try the shell command: `identify -list format'. | 7988 | You can also try the shell command: `identify -list format'. |
| 7988 | 7989 | ||
| 7989 | Note that ImageMagick recognizes many file-types that Emacs does not | 7990 | Note that ImageMagick recognizes many file-types that Emacs does not |
| 7990 | recognize as images, such as C. See `imagemagick-types-inhibit'. */) | 7991 | recognize as images, such as C. See `imagemagick-types-enable' |
| 7992 | and `imagemagick-types-inhibit'. */) | ||
| 7991 | (void) | 7993 | (void) |
| 7992 | { | 7994 | { |
| 7993 | Lisp_Object typelist = Qnil; | 7995 | Lisp_Object typelist = Qnil; |