diff options
| author | Paul Eggert | 2012-08-27 10:23:48 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-08-27 10:23:48 -0700 |
| commit | de1339b0a8a5b6b8bf784c816b2b974f4610e3ac (patch) | |
| tree | 2a77a2ce1b781f5cf30c734e9b0919a6ff3264ec /src/composite.c | |
| parent | f10fe38f772c29031a23ef7aa92d2de1b3675461 (diff) | |
| download | emacs-de1339b0a8a5b6b8bf784c816b2b974f4610e3ac.tar.gz emacs-de1339b0a8a5b6b8bf784c816b2b974f4610e3ac.zip | |
* composite.c, data.c, dbusbind.c, dired.c: Use bool for booleans.
* composite.c (find_composition, composition_gstring_p)
(composition_reseat_it, find_automatic_composition):
* data.c (let_shadows_buffer_binding_p)
(let_shadows_global_binding_p, set_internal, make_blv)
(Fmake_variable_buffer_local, Fmake_local_variable)
(Fmake_variable_frame_local, arithcompare, cons_to_unsigned)
(cons_to_signed, arith_driver):
* dbusbind.c (xd_in_read_queued_messages):
* dired.c (directory_files_internal, file_name_completion):
Use bool for booleans.
* dired.c (file_name_completion):
* process.h (fd_callback):
Omit int (actually boolean) argument. It wasn't being used.
All uses changed.
* composite.h, lisp.h: Reflect above API changes.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/composite.c b/src/composite.c index 4e90e9bb914..eddabb66d33 100644 --- a/src/composite.c +++ b/src/composite.c | |||
| @@ -428,7 +428,7 @@ get_composition_id (ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t nchars, | |||
| 428 | 428 | ||
| 429 | This doesn't check the validity of composition. */ | 429 | This doesn't check the validity of composition. */ |
| 430 | 430 | ||
| 431 | int | 431 | bool |
| 432 | find_composition (ptrdiff_t pos, ptrdiff_t limit, | 432 | find_composition (ptrdiff_t pos, ptrdiff_t limit, |
| 433 | ptrdiff_t *start, ptrdiff_t *end, | 433 | ptrdiff_t *start, ptrdiff_t *end, |
| 434 | Lisp_Object *prop, Lisp_Object object) | 434 | Lisp_Object *prop, Lisp_Object object) |
| @@ -709,7 +709,7 @@ static Lisp_Object fill_gstring_header (Lisp_Object, Lisp_Object, | |||
| 709 | Lisp_Object, Lisp_Object, | 709 | Lisp_Object, Lisp_Object, |
| 710 | Lisp_Object); | 710 | Lisp_Object); |
| 711 | 711 | ||
| 712 | int | 712 | bool |
| 713 | composition_gstring_p (Lisp_Object gstring) | 713 | composition_gstring_p (Lisp_Object gstring) |
| 714 | { | 714 | { |
| 715 | Lisp_Object header; | 715 | Lisp_Object header; |
| @@ -1212,11 +1212,13 @@ composition_compute_stop_pos (struct composition_it *cmp_it, ptrdiff_t charpos, | |||
| 1212 | string. In that case, FACE must not be NULL. | 1212 | string. In that case, FACE must not be NULL. |
| 1213 | 1213 | ||
| 1214 | If the character is composed, setup members of CMP_IT (id, nglyphs, | 1214 | If the character is composed, setup members of CMP_IT (id, nglyphs, |
| 1215 | from, to, reversed_p), and return 1. Otherwise, update | 1215 | from, to, reversed_p), and return true. Otherwise, update |
| 1216 | CMP_IT->stop_pos, and return 0. */ | 1216 | CMP_IT->stop_pos, and return false. */ |
| 1217 | 1217 | ||
| 1218 | int | 1218 | bool |
| 1219 | composition_reseat_it (struct composition_it *cmp_it, ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t endpos, struct window *w, struct face *face, Lisp_Object string) | 1219 | composition_reseat_it (struct composition_it *cmp_it, ptrdiff_t charpos, |
| 1220 | ptrdiff_t bytepos, ptrdiff_t endpos, struct window *w, | ||
| 1221 | struct face *face, Lisp_Object string) | ||
| 1220 | { | 1222 | { |
| 1221 | if (endpos < 0) | 1223 | if (endpos < 0) |
| 1222 | endpos = NILP (string) ? BEGV : 0; | 1224 | endpos = NILP (string) ? BEGV : 0; |
| @@ -1482,10 +1484,10 @@ struct position_record | |||
| 1482 | /* This is like find_composition, but find an automatic composition | 1484 | /* This is like find_composition, but find an automatic composition |
| 1483 | instead. It is assured that POS is not within a static | 1485 | instead. It is assured that POS is not within a static |
| 1484 | composition. If found, set *GSTRING to the glyph-string | 1486 | composition. If found, set *GSTRING to the glyph-string |
| 1485 | representing the composition, and return 1. Otherwise, *GSTRING to | 1487 | representing the composition, and return true. Otherwise, *GSTRING to |
| 1486 | Qnil, and return 0. */ | 1488 | Qnil, and return false. */ |
| 1487 | 1489 | ||
| 1488 | static int | 1490 | static bool |
| 1489 | find_automatic_composition (ptrdiff_t pos, ptrdiff_t limit, | 1491 | find_automatic_composition (ptrdiff_t pos, ptrdiff_t limit, |
| 1490 | ptrdiff_t *start, ptrdiff_t *end, | 1492 | ptrdiff_t *start, ptrdiff_t *end, |
| 1491 | Lisp_Object *gstring, Lisp_Object string) | 1493 | Lisp_Object *gstring, Lisp_Object string) |
| @@ -1498,7 +1500,7 @@ find_automatic_composition (ptrdiff_t pos, ptrdiff_t limit, | |||
| 1498 | int c; | 1500 | int c; |
| 1499 | Lisp_Object window; | 1501 | Lisp_Object window; |
| 1500 | struct window *w; | 1502 | struct window *w; |
| 1501 | int need_adjustment = 0; | 1503 | bool need_adjustment = 0; |
| 1502 | 1504 | ||
| 1503 | window = Fget_buffer_window (Fcurrent_buffer (), Qnil); | 1505 | window = Fget_buffer_window (Fcurrent_buffer (), Qnil); |
| 1504 | if (NILP (window)) | 1506 | if (NILP (window)) |