diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-06-25 11:21:00 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-06-25 11:21:00 -0700 |
| commit | 11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20 (patch) | |
| tree | 4359edf5c3e99c0abcf9eff028a7a2609f483745 /src | |
| parent | 3794a2d3a43433c27f65c902bfdc21479d7d309f (diff) | |
| parent | c9e799dbb100c5161f7a485452d29f554d95e6c7 (diff) | |
| download | emacs-11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20.tar.gz | |
Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dispnew.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b8b3d2a1a9c..c431eb1e7b2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-06-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * dispnew.c (scrolling_window): Before scrolling, turn off a + mouse-highlight in the window being scrolled. + 2011-06-24 Juanma Barranquero <lekktu@gmail.com> Move DEFSYM to lisp.h and use everywhere. diff --git a/src/dispnew.c b/src/dispnew.c index c33442d5048..8691c921853 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -4543,6 +4543,7 @@ scrolling_window (struct window *w, int header_line_p) /* Copy on the display. */ if (r->current_y != r->desired_y) { + rif->clear_window_mouse_face (w); rif->scroll_run_hook (w, r); /* Invalidate runs that copy from where we copied to. */ |