diff options
| author | Karoly Lorentey | 2004-04-27 15:53:30 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-04-27 15:53:30 +0000 |
| commit | 6c8caecfb9c96879b8ea6f1e08314408be40a832 (patch) | |
| tree | cec3e345d246fe9b789786da588c5c6334215679 /src/data.c | |
| parent | ced7ed5611e2a6e60a5ac7a97e165545843d0fa9 (diff) | |
| parent | c4c07982c1a6b3ddd9339ecdb9af1876f70d8792 (diff) | |
| download | emacs-6c8caecfb9c96879b8ea6f1e08314408be40a832.tar.gz emacs-6c8caecfb9c96879b8ea6f1e08314408be40a832.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-241
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-242
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-243
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-244
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-245
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-246
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248
src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-250
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-251
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-252
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-253
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-254
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-255
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-153
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/data.c b/src/data.c index c3cf05e0f10..a5f28375635 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -1946,8 +1946,8 @@ or a byte-code object. IDX starts at 0. */) | |||
| 1946 | if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) | 1946 | if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
| 1947 | args_out_of_range (array, idx); | 1947 | args_out_of_range (array, idx); |
| 1948 | 1948 | ||
| 1949 | val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR]; | 1949 | val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR]; |
| 1950 | return (val & (1 << (idxval % BITS_PER_CHAR)) ? Qt : Qnil); | 1950 | return (val & (1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR)) ? Qt : Qnil); |
| 1951 | } | 1951 | } |
| 1952 | else if (CHAR_TABLE_P (array)) | 1952 | else if (CHAR_TABLE_P (array)) |
| 1953 | { | 1953 | { |
| @@ -2074,13 +2074,13 @@ bool-vector. IDX starts at 0. */) | |||
| 2074 | if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) | 2074 | if (idxval < 0 || idxval >= XBOOL_VECTOR (array)->size) |
| 2075 | args_out_of_range (array, idx); | 2075 | args_out_of_range (array, idx); |
| 2076 | 2076 | ||
| 2077 | val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR]; | 2077 | val = (unsigned char) XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR]; |
| 2078 | 2078 | ||
| 2079 | if (! NILP (newelt)) | 2079 | if (! NILP (newelt)) |
| 2080 | val |= 1 << (idxval % BITS_PER_CHAR); | 2080 | val |= 1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR); |
| 2081 | else | 2081 | else |
| 2082 | val &= ~(1 << (idxval % BITS_PER_CHAR)); | 2082 | val &= ~(1 << (idxval % BOOL_VECTOR_BITS_PER_CHAR)); |
| 2083 | XBOOL_VECTOR (array)->data[idxval / BITS_PER_CHAR] = val; | 2083 | XBOOL_VECTOR (array)->data[idxval / BOOL_VECTOR_BITS_PER_CHAR] = val; |
| 2084 | } | 2084 | } |
| 2085 | else if (CHAR_TABLE_P (array)) | 2085 | else if (CHAR_TABLE_P (array)) |
| 2086 | { | 2086 | { |