Mercurial > hg > xemacs-beta
comparison src/objects-x.c @ 578:190b164ddcac
[xemacs-hg @ 2001-05-25 11:26:50 by ben]
device-msw.c, eldap.c, emodules.c, hpplay.c, process-unix.c, sound.h, tooltalk.c, win32.c: Revert Martin's attempted compile-warnings fix. It does fix
the warnings, but not the right way. We are trying to eliminate
the raw use of `char' and `unsigned char' absolutely everywhere.
There is never an occasion to reintroduce these.
buffer.h: Instead, we fix these macros so they don't care about the type of
their lvalues. We already do this for the non-C-string
equivalents of these, and it's correct because it should be OK to
pass in an SBufbyte *, for example. In any case, we do not need
any type-correctness checking here -- errors will be caught for
sure as soon as we remove the -Wno-sign-compare switch.
mule-charset.c: Use invalid_argument, not generic signal_error (Qerror, ).
alloc.c, chartab.c, console-gtk.c, console-msw.c, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console.c, console.h, device-x.c, device.c, elhash.c, eval.c, faces.c, faces.h, fns.c, glyphs.c, glyphs.h, gui.c, gui.h, lisp.h, lread.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, process-unix.c, rangetab.c, search.c, specifier.c, toolbar.c, window.c, window.h:
Rename Error_behavior to Error_Behavior, to be consistent with
general naming practices (Lisp_Object, Char_Binary, etc.).
author | ben |
---|---|
date | Fri, 25 May 2001 11:27:01 +0000 |
parents | 183866b06e0b |
children | b39c14581166 |
comparison
equal
deleted
inserted
replaced
577:910449c92002 | 578:190b164ddcac |
---|---|
224 return status; | 224 return status; |
225 } | 225 } |
226 | 226 |
227 static int | 227 static int |
228 x_parse_nearest_color (struct device *d, XColor *color, Lisp_Object name, | 228 x_parse_nearest_color (struct device *d, XColor *color, Lisp_Object name, |
229 Error_behavior errb) | 229 Error_Behavior errb) |
230 { | 230 { |
231 Display *dpy = DEVICE_X_DISPLAY (d); | 231 Display *dpy = DEVICE_X_DISPLAY (d); |
232 Colormap cmap = DEVICE_X_COLORMAP (d); | 232 Colormap cmap = DEVICE_X_COLORMAP (d); |
233 Visual *visual = DEVICE_X_VISUAL (d); | 233 Visual *visual = DEVICE_X_VISUAL (d); |
234 int result; | 234 int result; |
257 return result; | 257 return result; |
258 } | 258 } |
259 | 259 |
260 static int | 260 static int |
261 x_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name, | 261 x_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name, |
262 Lisp_Object device, Error_behavior errb) | 262 Lisp_Object device, Error_Behavior errb) |
263 { | 263 { |
264 XColor color; | 264 XColor color; |
265 int result; | 265 int result; |
266 | 266 |
267 result = x_parse_nearest_color (XDEVICE (device), &color, name, errb); | 267 result = x_parse_nearest_color (XDEVICE (device), &color, name, errb); |
362 /* font instances */ | 362 /* font instances */ |
363 /************************************************************************/ | 363 /************************************************************************/ |
364 | 364 |
365 static int | 365 static int |
366 x_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, | 366 x_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, |
367 Lisp_Object device, Error_behavior errb) | 367 Lisp_Object device, Error_Behavior errb) |
368 { | 368 { |
369 Display *dpy = DEVICE_X_DISPLAY (XDEVICE (device)); | 369 Display *dpy = DEVICE_X_DISPLAY (XDEVICE (device)); |
370 XFontStruct *xf; | 370 XFontStruct *xf; |
371 const Extbyte *extname; | 371 const Extbyte *extname; |
372 | 372 |
772 else | 772 else |
773 return Qnil; | 773 return Qnil; |
774 } | 774 } |
775 | 775 |
776 static Lisp_Object | 776 static Lisp_Object |
777 x_font_instance_truename (Lisp_Font_Instance *f, Error_behavior errb) | 777 x_font_instance_truename (Lisp_Font_Instance *f, Error_Behavior errb) |
778 { | 778 { |
779 struct device *d = XDEVICE (f->device); | 779 struct device *d = XDEVICE (f->device); |
780 | 780 |
781 if (NILP (FONT_INSTANCE_X_TRUENAME (f))) | 781 if (NILP (FONT_INSTANCE_X_TRUENAME (f))) |
782 { | 782 { |