aboutsummaryrefslogtreecommitdiffstats
path: root/src/marker.c
diff options
context:
space:
mode:
authorPaul Eggert2012-10-11 09:23:37 -0700
committerPaul Eggert2012-10-11 09:23:37 -0700
commit7cded46f2bef23f86041cc883618ac82b6dbfe61 (patch)
treec85855d128fee9247561a6f1395bfec9d8ceaa58 /src/marker.c
parent549c3414d97575bfe537d2a4d357d48ea58c980a (diff)
downloademacs-7cded46f2bef23f86041cc883618ac82b6dbfe61.tar.gz
emacs-7cded46f2bef23f86041cc883618ac82b6dbfe61.zip
lread.c, macros.c, marker.c, menu.c, minibuf.c: Use bool for booleans.
* lread.c (load_each_byte, new_backquote_flag, readchar) (read_filtered_event, lisp_file_lexically_bound_p) (safe_to_load_version, Fload, complete_filename_p, openp) (build_load_history, readevalloop, read_escape, read1) (string_to_number, read_vector, read_list): * macros.c (Fstart_kbd_macro): * marker.c (CONSIDER): * menu.c (parse_single_submenu, digest_single_submenu) (find_and_return_menu_selection, Fx_popup_menu): * minibuf.c (read_minibuf_noninteractive, read_minibuf) (Ftry_completion): * nsmenu.m (ns_update_menubar, runMenuAt:forFrame:keymaps:): (ns_menu_show): * xmenu.c (set_frame_menubar, create_and_show_popup_menu) (xmenu_show, xdialog_show): Use bool for booleans. * lread.c (safe_to_load_version): Rename from safe_to_load_p, as it's not a predicate. All uses changed. Omit unnecessary buffer termination.
Diffstat (limited to 'src/marker.c')
-rw-r--r--src/marker.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/marker.c b/src/marker.c
index 2e2aba579db..69be4faec3a 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -91,7 +91,7 @@ clear_charpos_cache (struct buffer *b)
91#define CONSIDER(CHARPOS, BYTEPOS) \ 91#define CONSIDER(CHARPOS, BYTEPOS) \
92{ \ 92{ \
93 ptrdiff_t this_charpos = (CHARPOS); \ 93 ptrdiff_t this_charpos = (CHARPOS); \
94 int changed = 0; \ 94 bool changed = 0; \
95 \ 95 \
96 if (this_charpos == charpos) \ 96 if (this_charpos == charpos) \
97 { \ 97 { \
@@ -190,7 +190,7 @@ buf_charpos_to_bytepos (struct buffer *b, ptrdiff_t charpos)
190 190
191 if (charpos - best_below < best_above - charpos) 191 if (charpos - best_below < best_above - charpos)
192 { 192 {
193 int record = charpos - best_below > 5000; 193 bool record = charpos - best_below > 5000;
194 194
195 while (best_below != charpos) 195 while (best_below != charpos)
196 { 196 {
@@ -215,7 +215,7 @@ buf_charpos_to_bytepos (struct buffer *b, ptrdiff_t charpos)
215 } 215 }
216 else 216 else
217 { 217 {
218 int record = best_above - charpos > 5000; 218 bool record = best_above - charpos > 5000;
219 219
220 while (best_above != charpos) 220 while (best_above != charpos)
221 { 221 {
@@ -335,7 +335,7 @@ buf_bytepos_to_charpos (struct buffer *b, ptrdiff_t bytepos)
335 335
336 if (bytepos - best_below_byte < best_above_byte - bytepos) 336 if (bytepos - best_below_byte < best_above_byte - bytepos)
337 { 337 {
338 int record = bytepos - best_below_byte > 5000; 338 bool record = bytepos - best_below_byte > 5000;
339 339
340 while (best_below_byte < bytepos) 340 while (best_below_byte < bytepos)
341 { 341 {
@@ -362,7 +362,7 @@ buf_bytepos_to_charpos (struct buffer *b, ptrdiff_t bytepos)
362 } 362 }
363 else 363 else
364 { 364 {
365 int record = best_above_byte - bytepos > 5000; 365 bool record = best_above_byte - bytepos > 5000;
366 366
367 while (best_above_byte > bytepos) 367 while (best_above_byte > bytepos)
368 { 368 {
@@ -479,10 +479,10 @@ live_buffer (Lisp_Object buffer)
479 479
480static Lisp_Object 480static Lisp_Object
481set_marker_internal (Lisp_Object marker, Lisp_Object position, 481set_marker_internal (Lisp_Object marker, Lisp_Object position,
482 Lisp_Object buffer, int restricted) 482 Lisp_Object buffer, bool restricted)
483{ 483{
484 register struct Lisp_Marker *m; 484 struct Lisp_Marker *m;
485 register struct buffer *b = live_buffer (buffer); 485 struct buffer *b = live_buffer (buffer);
486 486
487 CHECK_MARKER (marker); 487 CHECK_MARKER (marker);
488 m = XMARKER (marker); 488 m = XMARKER (marker);