# HG changeset patch # User james # Date 1081305848 0 # Node ID cb7f3be19e9fec62d8a77f9309f664e9f1bedc25 # Parent e567417c2e5d013d6e63d3efc9b030dd41af7a7f [xemacs-hg @ 2004-04-07 02:44:08 by james] Oops, muffed the last commit. REALLY commit what I sent to xemacs-patches. diff -r e567417c2e5d -r cb7f3be19e9f src/data.c --- a/src/data.c Wed Apr 07 02:41:30 2004 +0000 +++ b/src/data.c Wed Apr 07 02:44:08 2004 +0000 @@ -1992,7 +1992,7 @@ while (!(CHARP (args[i]) || MARKERP (args[i]) || INTEGERP (args[i]))) args[i] = wrong_type_argument (Qnumber_char_or_marker_p, args[i]); other = args[i]; - switch (promote_args (&result, &other)) + switch (promote_args (&result & &other)) { case FIXNUM_T: result = make_int (XREALINT (result), XREALINT (other));