diff options
| author | Paul Eggert | 2011-04-01 13:19:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-01 13:19:36 -0700 |
| commit | 6ddae4efd9e8a3035eb610c39fb2c8f79e7f9893 (patch) | |
| tree | 1b704b34e4f2f2bd4a6f13e4d1dd058c61c8a6ff /src/image.c | |
| parent | 0b918413f336dbfa9a9c266ae857bce103556c57 (diff) | |
| parent | 034086489cff2a23cb4d9f8c536e18456be617ef (diff) | |
| download | emacs-6ddae4efd9e8a3035eb610c39fb2c8f79e7f9893.tar.gz emacs-6ddae4efd9e8a3035eb610c39fb2c8f79e7f9893.zip | |
Merge from mainline.
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/image.c b/src/image.c index 25929d1004c..b37ba398d83 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -831,9 +831,7 @@ parse_image_spec (Lisp_Object spec, struct image_keyword *keywords, | |||
| 831 | 831 | ||
| 832 | case IMAGE_FUNCTION_VALUE: | 832 | case IMAGE_FUNCTION_VALUE: |
| 833 | value = indirect_function (value); | 833 | value = indirect_function (value); |
| 834 | if (SUBRP (value) | 834 | if (!NILP (Ffunctionp (value))) |
| 835 | || COMPILEDP (value) | ||
| 836 | || (CONSP (value) && EQ (XCAR (value), Qlambda))) | ||
| 837 | break; | 835 | break; |
| 838 | return 0; | 836 | return 0; |
| 839 | 837 | ||