diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:29:22 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:29:22 -0800 |
| commit | f15c8583198c3d6c26ca0c0a5b6fb019f98d6c3c (patch) | |
| tree | 7068ac99c5729e94a93a4a0ae7ddd1acbb7d2c01 /src/dispnew.c | |
| parent | 118a31a3b1eb08cba14887c3134054e9b4383688 (diff) | |
| parent | ec26c23f4815fbc6bbd16d20f400721bc7b58344 (diff) | |
| download | emacs-f15c8583198c3d6c26ca0c0a5b6fb019f98d6c3c.tar.gz | |
Merge from origin/emacs-24
ec26c23 authors.el: Add missing ignored and renamed files
e589765 A more thorough fix for bug#19307
4e8d586 Fix last commit
d6fee01 Tramp: Don't use a tempfile for ControlPath.
27e11c0 Fix display of overlay strings with faces after ellipsis (Bug#19307)
e9a7e10 Fix redrawing of mode lines when exposed (Bug#19721)
50f3811 net/tramp.el (tramp-ssh-controlmaster-options): Use "%C"
Conflicts:
lisp/ChangeLog
src/ChangeLog
src/xdisp.c
Diffstat (limited to 'src/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 6bc24697cb7..693dd49825c 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -567,6 +567,12 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y for (i = 0; i < matrix->nrows; ++i) matrix->rows[i].enabled_p = false; } + /* We've disabled the mode-line row, so force redrawing of + the mode line, if any, since otherwise it will remain + disabled in the current matrix, and expose events won't + redraw it. */ + if (WINDOW_WANTS_MODELINE_P (w)) + w->update_mode_line = 1; } else if (matrix == w->desired_matrix) { |