GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
#include <ctype.h>
-#define abs(X) ((X) < 0 ? -(X) : (X))
-
/* Number of pt per inch (from the TeXbook). */
#define PT_PER_INCH 72.27
struct frame *f;
GC gc;
{
- BLOCK_INPUT;
+ eassert (interrupt_input_blocked);
IF_DEBUG (xassert (--ngcs >= 0));
XFreeGC (FRAME_X_DISPLAY (f), gc);
- UNBLOCK_INPUT;
}
#endif /* HAVE_X_WINDOWS */
struct frame *f;
GC gc;
{
- BLOCK_INPUT;
IF_DEBUG (xassert (--ngcs >= 0));
xfree (gc);
- UNBLOCK_INPUT;
}
#endif /* WINDOWSNT */
struct frame *f;
GC gc;
{
- BLOCK_INPUT;
+ eassert (interrupt_input_blocked);
IF_DEBUG (xassert (--ngcs >= 0));
XFreeGC (FRAME_MAC_DISPLAY (f), gc);
- UNBLOCK_INPUT;
}
#endif /* MAC_OS */
face->overstrike = needs_overstrike;
if (face->gc)
{
+ BLOCK_INPUT;
x_free_gc (f, face->gc);
face->gc = 0;
+ UNBLOCK_INPUT;
}
}
else
\f
+#if 0 /* Seems to be unused. */
static Lisp_Object
internal_resolve_face_name (nargs, args)
int nargs;
Lisp_Object *args;
{
- Fget (args[0], args[1]);
+ return Fget (args[0], args[1]);
}
static Lisp_Object
{
return Qnil;
}
+#endif
/* Resolve face name FACE_NAME. If FACE_NAME is a string, intern it
to make it a symbol. If FACE_NAME is an alias for another face,
{
Lisp_Object lface;
+ face = resolve_face_name (face, 1);
+
if (!NILP (frame))
{
CHECK_LIVE_FRAME (frame);
free_face_fontset (f, face);
if (face->gc)
{
+ BLOCK_INPUT;
x_free_gc (f, face->gc);
face->gc = 0;
+ UNBLOCK_INPUT;
}
free_face_colors (f, face);
CHECK_LIVE_FRAME (frame);
f = XFRAME (frame);
- if ((CONSP (color1) && !parse_rgb_list (color1, &cdef1))
- || !STRINGP (color1)
- || !defined_color (f, SDATA (color1), &cdef1, 0))
+ if (!(CONSP (color1) && parse_rgb_list (color1, &cdef1))
+ && !(STRINGP (color1) && defined_color (f, SDATA (color1), &cdef1, 0)))
signal_error ("Invalid color", color1);
- if ((CONSP (color2) && !parse_rgb_list (color2, &cdef2))
- || !STRINGP (color2)
- || !defined_color (f, SDATA (color2), &cdef2, 0))
+ if (!(CONSP (color2) && parse_rgb_list (color2, &cdef2))
+ && !(STRINGP (color2) && defined_color (f, SDATA (color2), &cdef2, 0)))
signal_error ("Invalid color", color2);
return make_number (color_distance (&cdef1, &cdef2));
struct face *face = c->faces_by_id[i];
if (face && face->gc)
{
+ BLOCK_INPUT;
x_free_gc (c->f, face->gc);
face->gc = 0;
+ UNBLOCK_INPUT;
}
}
#endif /* HAVE_WINDOW_SYSTEM */
staticpro (&QCforeground);
QCbackground = intern (":background");
staticpro (&QCbackground);
- QCstipple = intern (":stipple");;
+ QCstipple = intern (":stipple");
staticpro (&QCstipple);
QCwidth = intern (":width");
staticpro (&QCwidth);