Mercurial > emacs
diff src/font.h @ 91813:ca1e1298a3d8
(smerge-auto-combine-max-separation): New var.
(smerge-auto-combine): New fun.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 13 Feb 2008 15:10:57 +0000 |
| parents | 1ab24b8a7398 |
| children | 0dac12128e1c |
line wrap: on
line diff
--- a/src/font.h Tue Feb 12 23:41:59 2008 +0000 +++ b/src/font.h Wed Feb 13 15:10:57 2008 +0000 @@ -233,17 +233,17 @@ /* Check macros for various font-related objects. */ #define CHECK_FONT(x) \ - do { if (! FONTP (x)) x = wrong_type_argument (Qfont, x); } while (0) + do { if (! FONTP (x)) wrong_type_argument (Qfont, x); } while (0) #define CHECK_FONT_SPEC(x) \ - do { if (! FONT_SPEC_P (x)) x = wrong_type_argument (Qfont, x); } while (0) + do { if (! FONT_SPEC_P (x)) wrong_type_argument (Qfont, x); } while (0) #define CHECK_FONT_ENTITY(x) \ - do { if (! FONT_ENTITY_P (x)) x = wrong_type_argument (Qfont, x); } while (0) + do { if (! FONT_ENTITY_P (x)) wrong_type_argument (Qfont, x); } while (0) #define CHECK_FONT_OBJECT(x) \ - do { if (! FONT_OBJECT_P (x)) x = wrong_type_argument (Qfont, x); } while (0) + do { if (! FONT_OBJECT_P (x)) wrong_type_argument (Qfont, x); } while (0) #define CHECK_FONT_GET_OBJECT(x, font) \ do { \ - if (! FONT_OBJECT_P (x)) x = wrong_type_argument (Qfont, x); \ + if (! FONT_OBJECT_P (x)) wrong_type_argument (Qfont, x); \ if (! XSAVE_VALUE (x)->pointer) error ("Font already closed"); \ font = XSAVE_VALUE (x)->pointer; \ } while (0)