aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.h
diff options
context:
space:
mode:
authorPaul Eggert2012-08-23 21:37:57 -0700
committerPaul Eggert2012-08-23 21:37:57 -0700
commit37ef52bb653c99525c3ecf7cd1ca4ff15de7dec5 (patch)
treef72e329434e03df19b392a8f82d811e6cec7fa5b /src/buffer.h
parentca5256ad0a138d14329ca80a0a4fd952ca2cd092 (diff)
downloademacs-37ef52bb653c99525c3ecf7cd1ca4ff15de7dec5.tar.gz
emacs-37ef52bb653c99525c3ecf7cd1ca4ff15de7dec5.zip
* buffer.c, buffer.h: Use bool for boolean.
* buffer.c (reset_buffer_local_variables) (buffer_lisp_local_variables, Fset_buffer_modified_p) (Frestore_buffer_modified_p, Fset_buffer_multibyte): (overlays_at, overlays_in, mouse_face_overlay_overlaps) (overlay_touches_p, overlay_strings, Foverlay_put) (report_overlay_modification, call_overlay_mod_hooks): (mmap_enlarge, mmap_set_vars): * buffer.h (buffer_has_overlays, uppercasep, lowercasep): Use bool for booleans, instead of int. * buffer.c (compact_buffer, mmap_free_1): Return void, not int, since the 1-or-0 return value is always ignored anyway. (mmap_initialized_p): * buffer.h (struct buffer_text.inhibit_shrinking): Now bool, not int. * buffer.h, lisp.h: Adjust prototypes to match above changes.
Diffstat (limited to 'src/buffer.h')
-rw-r--r--src/buffer.h22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/buffer.h b/src/buffer.h
index 6c63c52dc47..c8b59ffde0b 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -471,7 +471,7 @@ struct buffer_text
471 /* Usually 0. Temporarily set to 1 in decode_coding_gap to 471 /* Usually 0. Temporarily set to 1 in decode_coding_gap to
472 prevent Fgarbage_collect from shrinking the gap and losing 472 prevent Fgarbage_collect from shrinking the gap and losing
473 not-yet-decoded bytes. */ 473 not-yet-decoded bytes. */
474 int inhibit_shrinking; 474 bool inhibit_shrinking;
475 }; 475 };
476 476
477/* Most code should use this macro to access Lisp fields in struct buffer. */ 477/* Most code should use this macro to access Lisp fields in struct buffer. */
@@ -1006,11 +1006,10 @@ extern struct buffer buffer_local_symbols;
1006 1006
1007extern void delete_all_overlays (struct buffer *); 1007extern void delete_all_overlays (struct buffer *);
1008extern void reset_buffer (struct buffer *); 1008extern void reset_buffer (struct buffer *);
1009extern int compact_buffer (struct buffer *); 1009extern void compact_buffer (struct buffer *);
1010extern void evaporate_overlays (ptrdiff_t); 1010extern void evaporate_overlays (ptrdiff_t);
1011extern ptrdiff_t overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr, 1011extern ptrdiff_t overlays_at (EMACS_INT, bool, Lisp_Object **,
1012 ptrdiff_t *len_ptr, ptrdiff_t *next_ptr, 1012 ptrdiff_t *, ptrdiff_t *, ptrdiff_t *, bool);
1013 ptrdiff_t *prev_ptr, int change_req);
1014extern ptrdiff_t sort_overlays (Lisp_Object *, ptrdiff_t, struct window *); 1013extern ptrdiff_t sort_overlays (Lisp_Object *, ptrdiff_t, struct window *);
1015extern void recenter_overlay_lists (struct buffer *, ptrdiff_t); 1014extern void recenter_overlay_lists (struct buffer *, ptrdiff_t);
1016extern ptrdiff_t overlay_strings (ptrdiff_t, struct window *, unsigned char **); 1015extern ptrdiff_t overlay_strings (ptrdiff_t, struct window *, unsigned char **);
@@ -1022,7 +1021,7 @@ extern Lisp_Object buffer_local_value_1 (Lisp_Object, Lisp_Object);
1022extern void record_buffer (Lisp_Object); 1021extern void record_buffer (Lisp_Object);
1023extern _Noreturn void buffer_slot_type_mismatch (Lisp_Object, int); 1022extern _Noreturn void buffer_slot_type_mismatch (Lisp_Object, int);
1024extern void fix_overlays_before (struct buffer *, ptrdiff_t, ptrdiff_t); 1023extern void fix_overlays_before (struct buffer *, ptrdiff_t, ptrdiff_t);
1025extern void mmap_set_vars (int); 1024extern void mmap_set_vars (bool);
1026 1025
1027/* Get overlays at POSN into array OVERLAYS with NOVERLAYS elements. 1026/* Get overlays at POSN into array OVERLAYS with NOVERLAYS elements.
1028 If NEXTP is non-NULL, return next overlay there. 1027 If NEXTP is non-NULL, return next overlay there.
@@ -1067,7 +1066,7 @@ set_buffer_intervals (struct buffer *b, INTERVAL i)
1067 1066
1068/* Non-zero if current buffer has overlays. */ 1067/* Non-zero if current buffer has overlays. */
1069 1068
1070BUFFER_INLINE int 1069BUFFER_INLINE bool
1071buffer_has_overlays (void) 1070buffer_has_overlays (void)
1072{ 1071{
1073 return current_buffer->overlays_before || current_buffer->overlays_after; 1072 return current_buffer->overlays_before || current_buffer->overlays_after;
@@ -1243,7 +1242,7 @@ downcase (int c)
1243} 1242}
1244 1243
1245/* 1 if C is upper case. */ 1244/* 1 if C is upper case. */
1246BUFFER_INLINE int uppercasep (int c) { return downcase (c) != c; } 1245BUFFER_INLINE bool uppercasep (int c) { return downcase (c) != c; }
1247 1246
1248/* Upcase a character C known to be not upper case. */ 1247/* Upcase a character C known to be not upper case. */
1249BUFFER_INLINE int 1248BUFFER_INLINE int
@@ -1255,8 +1254,11 @@ upcase1 (int c)
1255} 1254}
1256 1255
1257/* 1 if C is lower case. */ 1256/* 1 if C is lower case. */
1258BUFFER_INLINE int lowercasep (int c) 1257BUFFER_INLINE bool
1259{ return !uppercasep (c) && upcase1 (c) != c; } 1258lowercasep (int c)
1259{
1260 return !uppercasep (c) && upcase1 (c) != c;
1261}
1260 1262
1261/* Upcase a character C, or make no change if that cannot be done. */ 1263/* Upcase a character C, or make no change if that cannot be done. */
1262BUFFER_INLINE int upcase (int c) { return uppercasep (c) ? c : upcase1 (c); } 1264BUFFER_INLINE int upcase (int c) { return uppercasep (c) ? c : upcase1 (c); }