diff options
| author | Paul Eggert | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /src/fringe.c | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.zip | |
Merge from trunk.
Diffstat (limited to 'src/fringe.c')
| -rw-r--r-- | src/fringe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fringe.c b/src/fringe.c index 727547b1ab7..edc254fa3f2 100644 --- a/src/fringe.c +++ b/src/fringe.c | |||
| @@ -35,7 +35,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 35 | Logical bitmaps are used internally to denote things like | 35 | Logical bitmaps are used internally to denote things like |
| 36 | 'end-of-buffer', 'left-truncation', 'overlay-arrow', etc. | 36 | 'end-of-buffer', 'left-truncation', 'overlay-arrow', etc. |
| 37 | 37 | ||
| 38 | Physical bitmaps specify the visual appearence of the bitmap, | 38 | Physical bitmaps specify the visual appearance of the bitmap, |
| 39 | e.g. 'bottom-left-angle', 'left-arrow', 'left-triangle', etc. | 39 | e.g. 'bottom-left-angle', 'left-arrow', 'left-triangle', etc. |
| 40 | User defined bitmaps are physical bitmaps. | 40 | User defined bitmaps are physical bitmaps. |
| 41 | 41 | ||
| @@ -928,7 +928,7 @@ update_window_fringes (struct window *w, int keep_current_p) | |||
| 928 | int top_ind_rn, bot_ind_rn; | 928 | int top_ind_rn, bot_ind_rn; |
| 929 | int top_ind_min_y, bot_ind_max_y; | 929 | int top_ind_min_y, bot_ind_max_y; |
| 930 | 930 | ||
| 931 | /* top_ind_rn is set to a nonnegative value whenver | 931 | /* top_ind_rn is set to a nonnegative value whenever |
| 932 | row->indicate_bob_p is set, so it's OK that top_row_ends_at_zv_p | 932 | row->indicate_bob_p is set, so it's OK that top_row_ends_at_zv_p |
| 933 | is not initialized here. Similarly for bot_ind_rn, | 933 | is not initialized here. Similarly for bot_ind_rn, |
| 934 | row->indicate_eob_p and bot_row_ends_at_zv_p. */ | 934 | row->indicate_eob_p and bot_row_ends_at_zv_p. */ |