Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
7cd4e72c
Commit
7cd4e72c
authored
Dec 09, 2011
by
Eli Zaretskii
Browse files
Fix bug #10170 with extra scrolling after C-s.
src/xdisp.c (try_scrolling): Don't set scroll_down_p if dy is zero.
parent
b34d7317
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
src/ChangeLog
src/ChangeLog
+5
-0
src/xdisp.c
src/xdisp.c
+3
-2
No files found.
src/ChangeLog
View file @
7cd4e72c
2011-12-09 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (try_scrolling): Don't set scroll_down_p if dy is zero.
(Bug#10170)
2011-12-09 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* unexelf.c (unexec) [NS_IMPL_GNUSTEP]: Take account of the case
...
...
src/xdisp.c
View file @
7cd4e72c
...
...
@@ -14360,7 +14360,7 @@ try_scrolling (Lisp_Object window, int just_this_one_p,
{
int scroll_margin_y;
/* Compute the pixel ypos of the scroll margin, then move
it
to
/* Compute the pixel ypos of the scroll margin, then move
IT
to
either that ypos or PT, whichever comes first. */
start_display (&it, w, startp);
scroll_margin_y = it.last_visible_y - this_scroll_margin
...
...
@@ -14390,7 +14390,8 @@ try_scrolling (Lisp_Object window, int just_this_one_p,
if (dy > scroll_max)
return SCROLLING_FAILED;
scroll_down_p = 1;
if (dy > 0)
scroll_down_p = 1;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment