Mercurial > hg > xemacs-beta

comparison src/buffer.c @ 5934:e2fae7783046 cygwin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lots of use of EMACS_INT, a few others, to eliminate all pointer truncation warnings
author Henry Thompson <ht@markup.co.uk>
date Sat, 12 Dec 2015 19:08:46 +0000
parents 8139bdf8db04
children
comparison
equal deleted inserted replaced
5933:c1e8f3294298 5934:e2fae7783046
737 struct buffer *def = XBUFFER (Vbuffer_defaults); 737 struct buffer *def = XBUFFER (Vbuffer_defaults);
738 738
739 b->local_var_flags = 0; 739 b->local_var_flags = 0;
740 /* For each slot that has a default value, 740 /* For each slot that has a default value,
741 copy that into the slot. */ 741 copy that into the slot. */
742 /* HST added (int) -- dangerous?? */
742 #define MARKED_SLOT(slot) \ 743 #define MARKED_SLOT(slot) \
743 { int mask = XFIXNUM (buffer_local_flags.slot); \ 744 { int mask = (int)XFIXNUM (buffer_local_flags.slot); \
744 if ((mask > 0 || mask == -1 || mask == -3) \ 745 if ((mask > 0 || mask == -1 || mask == -3) \
745 && (first_time \ 746 && (first_time \
746 || NILP (Fget (XBUFFER (Vbuffer_local_symbols)->slot, \ 747 || NILP (Fget (XBUFFER (Vbuffer_local_symbols)->slot, \
747 Qpermanent_local, Qnil)))) \ 748 Qpermanent_local, Qnil)))) \
748 b->slot = def->slot; \ 749 b->slot = def->slot; \
887 } 888 }
888 889
889 /* Add on all the variables stored in special slots. */ 890 /* Add on all the variables stored in special slots. */
890 { 891 {
891 struct buffer *syms = XBUFFER (Vbuffer_local_symbols); 892 struct buffer *syms = XBUFFER (Vbuffer_local_symbols);
893 /* HST added (int) -- dangerous?? */
892 #define MARKED_SLOT(slot) \ 894 #define MARKED_SLOT(slot) \
893 { int mask = XFIXNUM (buffer_local_flags.slot); \ 895 { int mask = (int)XFIXNUM (buffer_local_flags.slot); \
894 if (mask == 0 || mask == -1 \ 896 if (mask == 0 || mask == -1 \
895 || ((mask > 0) && (buf->local_var_flags & mask))) \ 897 || ((mask > 0) && (buf->local_var_flags & mask))) \
896 result = Fcons (Fcons (syms->slot, buf->slot), result); \ 898 result = Fcons (Fcons (syms->slot, buf->slot), result); \
897 } 899 }
898 #include "bufslots.h" 900 #include "bufslots.h"