diff options
| author | Paul Eggert | 2011-04-13 16:38:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-13 16:38:13 -0700 |
| commit | ad9a7a06d48b0be0b1159db566c2760d951d62c1 (patch) | |
| tree | c7e09d5b90044bfd3c4ab51df74af02c4bf1836a /src | |
| parent | 816269316fbb2c248873b4387db5624ff57f6303 (diff) | |
| download | emacs-ad9a7a06d48b0be0b1159db566c2760d951d62c1.tar.gz emacs-ad9a7a06d48b0be0b1159db566c2760d951d62c1.zip | |
* fringe.c (standard_bitmaps): Now static.
(max_used_fringe_bitmap): Now static, unless HAVE_NS.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/fringe.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ea90a2f8057..a83bfbb2f46 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-04-13 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-13 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * fringe.c (standard_bitmaps): Now static. | ||
| 4 | (max_used_fringe_bitmap): Now static, unless HAVE_NS. | ||
| 5 | |||
| 3 | * frame.c: Make symbols static if they're not exported. | 6 | * frame.c: Make symbols static if they're not exported. |
| 4 | (x_report_frame_params, make_terminal_frame): Now static. | 7 | (x_report_frame_params, make_terminal_frame): Now static. |
| 5 | (get_frame_param): Now static, unless HAVE_NS. | 8 | (get_frame_param): Now static, unless HAVE_NS. |
diff --git a/src/fringe.c b/src/fringe.c index 281b563c9b7..bc6b493584c 100644 --- a/src/fringe.c +++ b/src/fringe.c | |||
| @@ -427,7 +427,7 @@ static unsigned short empty_line_bits[] = { | |||
| 427 | /* NOTE: The order of these bitmaps must match the sequence | 427 | /* NOTE: The order of these bitmaps must match the sequence |
| 428 | used in fringe.el to define the corresponding symbols. */ | 428 | used in fringe.el to define the corresponding symbols. */ |
| 429 | 429 | ||
| 430 | struct fringe_bitmap standard_bitmaps[] = | 430 | static struct fringe_bitmap standard_bitmaps[] = |
| 431 | { | 431 | { |
| 432 | { NULL, 0, 0, 0, 0, 0 }, /* NO_FRINGE_BITMAP */ | 432 | { NULL, 0, 0, 0, 0, 0 }, /* NO_FRINGE_BITMAP */ |
| 433 | { FRBITS (question_mark_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 }, | 433 | { FRBITS (question_mark_bits), 8, 0, ALIGN_BITMAP_CENTER, 0 }, |
| @@ -462,6 +462,9 @@ static struct fringe_bitmap **fringe_bitmaps; | |||
| 462 | static Lisp_Object *fringe_faces; | 462 | static Lisp_Object *fringe_faces; |
| 463 | static int max_fringe_bitmaps; | 463 | static int max_fringe_bitmaps; |
| 464 | 464 | ||
| 465 | #ifndef HAVE_NS | ||
| 466 | static | ||
| 467 | #endif | ||
| 465 | int max_used_fringe_bitmap = MAX_STANDARD_FRINGE_BITMAPS; | 468 | int max_used_fringe_bitmap = MAX_STANDARD_FRINGE_BITMAPS; |
| 466 | 469 | ||
| 467 | 470 | ||