diff options
| author | Paul Eggert | 2011-04-16 14:24:54 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-16 14:24:54 -0700 |
| commit | 3c647824ce968b3305848d2f49176d4dbecd3a19 (patch) | |
| tree | 56b717c9adb40d609b38b51d90bb3afc5e3fff45 /src | |
| parent | b165261a478678b338c6cac70af59b8d16651c1e (diff) | |
| download | emacs-3c647824ce968b3305848d2f49176d4dbecd3a19.tar.gz emacs-3c647824ce968b3305848d2f49176d4dbecd3a19.zip | |
* dispextern.h (struct redisplay_interface): Rename param
to avoid shadowing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/dispextern.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fa04a7ebfe5..329ec9400c7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * dispextern.h (struct redisplay_interface): Rename param | ||
| 4 | to avoid shadowing. | ||
| 5 | |||
| 3 | * insdel.c (make_gap_smaller): Define only if | 6 | * insdel.c (make_gap_smaller): Define only if |
| 4 | USE_MMAP_FOR_BUFFERS || REL_ALLOC || DOUG_LEA_MALLOC. | 7 | USE_MMAP_FOR_BUFFERS || REL_ALLOC || DOUG_LEA_MALLOC. |
| 5 | 8 | ||
diff --git a/src/dispextern.h b/src/dispextern.h index bda59d53055..d00eeae2b19 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -2650,9 +2650,9 @@ struct redisplay_interface | |||
| 2650 | int cursor_type, int cursor_width, | 2650 | int cursor_type, int cursor_width, |
| 2651 | int on_p, int active_p); | 2651 | int on_p, int active_p); |
| 2652 | 2652 | ||
| 2653 | /* Draw vertical border for window W from (X,Y0) to (X,Y1). */ | 2653 | /* Draw vertical border for window W from (X,Y_0) to (X,Y_1). */ |
| 2654 | void (*draw_vertical_window_border) (struct window *w, | 2654 | void (*draw_vertical_window_border) (struct window *w, |
| 2655 | int x, int y0, int y1); | 2655 | int x, int y_0, int y_1); |
| 2656 | 2656 | ||
| 2657 | /* Shift display of frame F to make room for inserted glyphs. | 2657 | /* Shift display of frame F to make room for inserted glyphs. |
| 2658 | The area at pixel (X,Y) of width WIDTH and height HEIGHT is | 2658 | The area at pixel (X,Y) of width WIDTH and height HEIGHT is |