diff options
| author | Paul Eggert | 2011-03-06 01:54:06 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-06 01:54:06 -0800 |
| commit | 179b8720a2e5c37d18ab8f601b982fdcabd19626 (patch) | |
| tree | 4fe59a6e81c905b4081695461a27de1e8426e93e /src | |
| parent | e9588e2e96025e416921e24d08fc4822d2ce3c6b (diff) | |
| download | emacs-179b8720a2e5c37d18ab8f601b982fdcabd19626.tar.gz emacs-179b8720a2e5c37d18ab8f601b982fdcabd19626.zip | |
* xdisp.c (redisplay_window): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3de7ddcdb28..4955966ad81 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | Remove decls. | 6 | Remove decls. |
| 7 | 7 | ||
| 8 | * cmds.c (internal_self_insert): Reindent to match Emacs style. | 8 | * cmds.c (internal_self_insert): Reindent to match Emacs style. |
| 9 | * xdisp.c (redisplay_window): Likewise. | ||
| 9 | 10 | ||
| 10 | * xdisp.c: Rename or move local decls to avoid shadowing. | 11 | * xdisp.c: Rename or move local decls to avoid shadowing. |
| 11 | (init_iterator, handle_fontified_prop, handle_single_display_spec): | 12 | (init_iterator, handle_fontified_prop, handle_single_display_spec): |
diff --git a/src/xdisp.c b/src/xdisp.c index b95325c8397..c8ec74ea7b0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -14330,9 +14330,9 @@ redisplay_window (Lisp_Object window, int just_this_one_p) | |||
| 14330 | || (!NILP (w->column_number_displayed) | 14330 | || (!NILP (w->column_number_displayed) |
| 14331 | && (XFASTINT (w->column_number_displayed) | 14331 | && (XFASTINT (w->column_number_displayed) |
| 14332 | != (int) current_column ()))) /* iftc */ | 14332 | != (int) current_column ()))) /* iftc */ |
| 14333 | /* This means that the window has a mode line. */ | 14333 | /* This means that the window has a mode line. */ |
| 14334 | && (WINDOW_WANTS_MODELINE_P (w) | 14334 | && (WINDOW_WANTS_MODELINE_P (w) |
| 14335 | || WINDOW_WANTS_HEADER_LINE_P (w))) | 14335 | || WINDOW_WANTS_HEADER_LINE_P (w))) |
| 14336 | { | 14336 | { |
| 14337 | display_mode_lines (w); | 14337 | display_mode_lines (w); |
| 14338 | 14338 | ||