- if (VECTORP (Vredisplay__all_windows_cause)
- && windows_or_buffers_changed >= 0
- && windows_or_buffers_changed < ASIZE (Vredisplay__all_windows_cause)
- && INTEGERP (AREF (Vredisplay__all_windows_cause,
- windows_or_buffers_changed)))
- ASET (Vredisplay__all_windows_cause, windows_or_buffers_changed,
- make_number (1 + XINT (AREF (Vredisplay__all_windows_cause,
- windows_or_buffers_changed))));
-
- if (VECTORP (Vredisplay__mode_lines_cause)
- && update_mode_lines >= 0
- && update_mode_lines < ASIZE (Vredisplay__mode_lines_cause)
- && INTEGERP (AREF (Vredisplay__mode_lines_cause,
- update_mode_lines)))
- ASET (Vredisplay__mode_lines_cause, update_mode_lines,
- make_number (1 + XINT (AREF (Vredisplay__mode_lines_cause,
- update_mode_lines))));
+ if (windows_or_buffers_changed && !update_mode_lines)
+ /* Code that sets windows_or_buffers_changed doesn't distinguish whether
+ only the windows's contents needs to be refreshed, or whether the
+ mode-lines also need a refresh. */
+ update_mode_lines = (windows_or_buffers_changed == REDISPLAY_SOME
+ ? REDISPLAY_SOME : 32);
+
+ /* If specs for an arrow have changed, do thorough redisplay
+ to ensure we remove any arrow that should no longer exist. */
+ if (overlay_arrows_changed_p ())
+ /* Apparently, this is the only case where we update other windows,
+ without updating other mode-lines. */
+ windows_or_buffers_changed = 49;
+
+ consider_all_windows_p = (update_mode_lines
+ || windows_or_buffers_changed);
+
+#define AINC(a,i) \
+ if (VECTORP (a) && i >= 0 && i < ASIZE (a) && INTEGERP (AREF (a, i))) \
+ ASET (a, i, make_number (1 + XINT (AREF (a, i))))
+
+ AINC (Vredisplay__all_windows_cause, windows_or_buffers_changed);
+ AINC (Vredisplay__mode_lines_cause, update_mode_lines);