diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-02-13 15:10:57 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-02-13 15:10:57 +0000 |
| commit | 02dfeba8a4ce93dadd7f5fa7f462fca12fdf28f8 (patch) | |
| tree | 6f3af2c8cce69d443906f83ed834d82ec34b4a2f /src/font.h | |
| parent | 78dc87a23feb2a1a5d5dc0c2a5abc3a310493dcf (diff) | |
| download | emacs-02dfeba8a4ce93dadd7f5fa7f462fca12fdf28f8.tar.gz | |
(smerge-auto-combine-max-separation): New var.
(smerge-auto-combine): New fun.
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/font.h b/src/font.h index b8aa4e1f3a4..21e821e6e71 100644 --- a/src/font.h +++ b/src/font.h @@ -233,17 +233,17 @@ struct font_bitmap /* 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) |