diff options
| author | Paul Eggert | 2014-09-23 09:07:23 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-09-23 09:07:23 -0700 |
| commit | ccc7be94d73afce4295b6ee7eaa388d1cd930926 (patch) | |
| tree | f6c817bd0667f36c47cab9006f59882aaba83b62 /src | |
| parent | 59e10fbd934323702a4586f50139d58db846bbf1 (diff) | |
| download | emacs-ccc7be94d73afce4295b6ee7eaa388d1cd930926.tar.gz emacs-ccc7be94d73afce4295b6ee7eaa388d1cd930926.zip | |
* dispextern.h, xdisp.c (window_box_right_offset): Now static.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/dispextern.h | 1 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 63d732c8d2c..7e1768e2cda 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-09-23 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * dispextern.h, xdisp.c (window_box_right_offset): Now static. | ||
| 4 | |||
| 1 | 2014-09-23 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2014-09-23 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | Use known length of a Lisp string to copy it faster. | 7 | Use known length of a Lisp string to copy it faster. |
diff --git a/src/dispextern.h b/src/dispextern.h index 99396b1deef..81e36d7b3c6 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -3176,7 +3176,6 @@ int window_box_width (struct window *, enum glyph_row_area); | |||
| 3176 | int window_box_left (struct window *, enum glyph_row_area); | 3176 | int window_box_left (struct window *, enum glyph_row_area); |
| 3177 | int window_box_left_offset (struct window *, enum glyph_row_area); | 3177 | int window_box_left_offset (struct window *, enum glyph_row_area); |
| 3178 | int window_box_right (struct window *, enum glyph_row_area); | 3178 | int window_box_right (struct window *, enum glyph_row_area); |
| 3179 | int window_box_right_offset (struct window *, enum glyph_row_area); | ||
| 3180 | int estimate_mode_line_height (struct frame *, enum face_id); | 3179 | int estimate_mode_line_height (struct frame *, enum face_id); |
| 3181 | int move_it_to (struct it *, ptrdiff_t, int, int, int, int); | 3180 | int move_it_to (struct it *, ptrdiff_t, int, int, int, int); |
| 3182 | void pixel_to_glyph_coords (struct frame *, int, int, int *, int *, | 3181 | void pixel_to_glyph_coords (struct frame *, int, int, int *, int *, |
diff --git a/src/xdisp.c b/src/xdisp.c index 18ba3319f32..ba513644484 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -1144,7 +1144,7 @@ window_box_left_offset (struct window *w, enum glyph_row_area area) | |||
| 1144 | area AREA of window W. ANY_AREA means return the right edge of the | 1144 | area AREA of window W. ANY_AREA means return the right edge of the |
| 1145 | whole window, to the left of the right fringe of W. */ | 1145 | whole window, to the left of the right fringe of W. */ |
| 1146 | 1146 | ||
| 1147 | int | 1147 | static int |
| 1148 | window_box_right_offset (struct window *w, enum glyph_row_area area) | 1148 | window_box_right_offset (struct window *w, enum glyph_row_area area) |
| 1149 | { | 1149 | { |
| 1150 | /* Don't return more than the window's pixel width. */ | 1150 | /* Don't return more than the window's pixel width. */ |