comparison src/toolbar.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 8ae895c67ce7
comparison
equal deleted inserted replaced
577:910449c92002 578:190b164ddcac
948 } while (0) 948 } while (0)
949 949
950 /* Returns Q_style if key was :style, Qt if ok otherwise, Qnil if error. */ 950 /* Returns Q_style if key was :style, Qt if ok otherwise, Qnil if error. */
951 static Lisp_Object 951 static Lisp_Object
952 check_toolbar_button_keywords (Lisp_Object button, Lisp_Object key, 952 check_toolbar_button_keywords (Lisp_Object button, Lisp_Object key,
953 Lisp_Object val, Error_behavior errb) 953 Lisp_Object val, Error_Behavior errb)
954 { 954 {
955 if (!KEYWORDP (key)) 955 if (!KEYWORDP (key))
956 { 956 {
957 maybe_signal_error_2 (Qinvalid_argument, "Not a keyword", key, button, 957 maybe_signal_error_2 (Qinvalid_argument, "Not a keyword", key, button,
958 Qtoolbar, errb); 958 Qtoolbar, errb);
992 */ 992 */
993 (button, noerror)) 993 (button, noerror))
994 { 994 {
995 Lisp_Object *elt, glyphs, value; 995 Lisp_Object *elt, glyphs, value;
996 int len; 996 int len;
997 Error_behavior errb = decode_error_behavior_flag (noerror); 997 Error_Behavior errb = decode_error_behavior_flag (noerror);
998 998
999 if (!VECTORP (button)) 999 if (!VECTORP (button))
1000 CTB_ERROR ("toolbar button descriptors must be vectors"); 1000 CTB_ERROR ("toolbar button descriptors must be vectors");
1001 elt = XVECTOR_DATA (button); 1001 elt = XVECTOR_DATA (button);
1002 1002