1 files changed, 8 insertions, 5 deletions

diff --git a/src/image.c b/src/image.c
index 73490fe2865..b6cdb6c8290 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,5 +1,6 @@
 /* Functions for image support on window system.
-   Copyright (C) 1989, 1992-2012 Free Software Foundation, Inc.
+
+Copyright (C) 1989, 1992-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -771,10 +772,9 @@ parse_image_spec (Lisp_Object spec, struct image_keyword *keywords,
       /* Record that we recognized the keyword.  If a keywords
          was found more than once, it's an error.  */
       keywords[i].value = value;
-      ++keywords[i].count;
-
       if (keywords[i].count > 1)
         return 0;
+      ++keywords[i].count;
 
       /* Check type of value against allowed type.  */
       switch (keywords[i].type)
@@ -1754,6 +1754,7 @@ lookup_image (struct frame *f, Lisp_Object spec)
              `:ascent ASCENT', `:margin MARGIN', `:relief RELIEF',
              `:background COLOR'.  */
           Lisp_Object ascent, margin, relief, bg;
+          int relief_bound;
 
           ascent = image_spec_value (spec, QCascent, NULL);
           if (INTEGERP (ascent))
@@ -1771,7 +1772,8 @@ lookup_image (struct frame *f, Lisp_Object spec)
             }
 
           relief = image_spec_value (spec, QCrelief, NULL);
-          if (INTEGERP (relief))
+          relief_bound = INT_MAX - max (img->hmargin, img->vmargin);
+          if (RANGED_INTEGERP (- relief_bound, relief, relief_bound))
             {
               img->relief = XINT (relief);
               img->hmargin += eabs (img->relief);
@@ -7986,7 +7988,8 @@ their descriptions (http://www.imagemagick.org/script/formats.php).
 You can also try the shell command: `identify -list format'.
 
 Note that ImageMagick recognizes many file-types that Emacs does not
-recognize as images, such as C.  See `imagemagick-types-inhibit'.  */)
+recognize as images, such as C.  See `imagemagick-types-enable'
+and `imagemagick-types-inhibit'.  */)
   (void)
 {
   Lisp_Object typelist = Qnil;