Mercurial > hg > xemacs-beta

comparison src/fns.c @ 578:190b164ddcac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 d5e8f5ad5043
children b39c14581166
comparison
equal deleted inserted replaced
577:910449c92002 578:190b164ddcac
2047 /* Called on a malformed property list. BADPLACE should be some 2047 /* Called on a malformed property list. BADPLACE should be some
2048 place where truncating will form a good list -- i.e. we shouldn't 2048 place where truncating will form a good list -- i.e. we shouldn't
2049 result in a list with an odd length. */ 2049 result in a list with an odd length. */
2050 2050
2051 static Lisp_Object 2051 static Lisp_Object
2052 bad_bad_bunny (Lisp_Object *plist, Lisp_Object *badplace, Error_behavior errb) 2052 bad_bad_bunny (Lisp_Object *plist, Lisp_Object *badplace, Error_Behavior errb)
2053 { 2053 {
2054 if (ERRB_EQ (errb, ERROR_ME)) 2054 if (ERRB_EQ (errb, ERROR_ME))
2055 return Fsignal (Qmalformed_property_list, list2 (*plist, *badplace)); 2055 return Fsignal (Qmalformed_property_list, list2 (*plist, *badplace));
2056 else 2056 else
2057 { 2057 {
2074 truncate along the entire list will break the circularity, because 2074 truncate along the entire list will break the circularity, because
2075 it will create a terminus and the list currently doesn't have one. 2075 it will create a terminus and the list currently doesn't have one.
2076 */ 2076 */
2077 2077
2078 static Lisp_Object 2078 static Lisp_Object
2079 bad_bad_turtle (Lisp_Object *plist, Lisp_Object *badplace, Error_behavior errb) 2079 bad_bad_turtle (Lisp_Object *plist, Lisp_Object *badplace, Error_Behavior errb)
2080 { 2080 {
2081 if (ERRB_EQ (errb, ERROR_ME)) 2081 if (ERRB_EQ (errb, ERROR_ME))
2082 return Fsignal (Qcircular_property_list, list1 (*plist)); 2082 return Fsignal (Qcircular_property_list, list1 (*plist));
2083 else 2083 else
2084 { 2084 {
2103 */ 2103 */
2104 2104
2105 static int 2105 static int
2106 advance_plist_pointers (Lisp_Object *plist, 2106 advance_plist_pointers (Lisp_Object *plist,
2107 Lisp_Object **tortoise, Lisp_Object **hare, 2107 Lisp_Object **tortoise, Lisp_Object **hare,
2108 Error_behavior errb, Lisp_Object *retval) 2108 Error_Behavior errb, Lisp_Object *retval)
2109 { 2109 {
2110 int i; 2110 int i;
2111 Lisp_Object *tortsave = *tortoise; 2111 Lisp_Object *tortsave = *tortoise;
2112 2112
2113 /* Note that our "fixing" may be more brutal than necessary, 2113 /* Note that our "fixing" may be more brutal than necessary,
2185 A pointer to PLIST is passed in so that PLIST can be successfully 2185 A pointer to PLIST is passed in so that PLIST can be successfully
2186 "fixed" even if the error is at the beginning of the plist. */ 2186 "fixed" even if the error is at the beginning of the plist. */
2187 2187
2188 Lisp_Object 2188 Lisp_Object
2189 external_plist_get (Lisp_Object *plist, Lisp_Object property, 2189 external_plist_get (Lisp_Object *plist, Lisp_Object property,
2190 int laxp, Error_behavior errb) 2190 int laxp, Error_Behavior errb)
2191 { 2191 {
2192 Lisp_Object *tortoise = plist; 2192 Lisp_Object *tortoise = plist;
2193 Lisp_Object *hare = plist; 2193 Lisp_Object *hare = plist;
2194 2194
2195 while (!NILP (*tortoise)) 2195 while (!NILP (*tortoise))
2219 /* Set PLIST's value for PROPERTY to VALUE, given a possibly 2219 /* Set PLIST's value for PROPERTY to VALUE, given a possibly
2220 malformed or circular plist. Analogous to external_plist_get(). */ 2220 malformed or circular plist. Analogous to external_plist_get(). */
2221 2221
2222 void 2222 void
2223 external_plist_put (Lisp_Object *plist, Lisp_Object property, 2223 external_plist_put (Lisp_Object *plist, Lisp_Object property,
2224 Lisp_Object value, int laxp, Error_behavior errb) 2224 Lisp_Object value, int laxp, Error_Behavior errb)
2225 { 2225 {
2226 Lisp_Object *tortoise = plist; 2226 Lisp_Object *tortoise = plist;
2227 Lisp_Object *hare = plist; 2227 Lisp_Object *hare = plist;
2228 2228
2229 while (!NILP (*tortoise)) 2229 while (!NILP (*tortoise))
2246 *plist = Fcons (property, Fcons (value, *plist)); 2246 *plist = Fcons (property, Fcons (value, *plist));
2247 } 2247 }
2248 2248
2249 int 2249 int
2250 external_remprop (Lisp_Object *plist, Lisp_Object property, 2250 external_remprop (Lisp_Object *plist, Lisp_Object property,
2251 int laxp, Error_behavior errb) 2251 int laxp, Error_Behavior errb)
2252 { 2252 {
2253 Lisp_Object *tortoise = plist; 2253 Lisp_Object *tortoise = plist;
2254 Lisp_Object *hare = plist; 2254 Lisp_Object *hare = plist;
2255 2255
2256 while (!NILP (*tortoise)) 2256 while (!NILP (*tortoise))