aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-04-10 18:36:02 +0000
committerGerd Moellmann2001-04-10 18:36:02 +0000
commit60f8d73535346769b3dd7b5332864a220012d6d5 (patch)
tree8fdc942f770500c39446424a4a85b3d5eadff1c1 /src
parentafffeb573cba26952badf9db0060fc5c8179d2fd (diff)
downloademacs-60f8d73535346769b3dd7b5332864a220012d6d5.tar.gz
emacs-60f8d73535346769b3dd7b5332864a220012d6d5.zip
(Fcompare_strings): Fix return values.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/fns.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bab28c171c2..bf6c5522d25 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12001-04-10 Gerd Moellmann <gerd@gnu.org> 12001-04-10 Gerd Moellmann <gerd@gnu.org>
2 2
3 * fns.c (Fcompare_strings): Fix return values.
4
3 * window.c (window_scroll): Change the meaning of N to mean 5 * window.c (window_scroll): Change the meaning of N to mean
4 N screen-fulls or N lines. 6 N screen-fulls or N lines.
5 (window_scroll_pixel_based, window_scroll_line_based) 7 (window_scroll_pixel_based, window_scroll_line_based)
diff --git a/src/fns.c b/src/fns.c
index 4bd577772fd..ceda1cfbf41 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -326,9 +326,9 @@ If string STR1 is greater, the value is a positive number N;\n\
326 past the character that we are comparing; 326 past the character that we are comparing;
327 hence we don't add or subtract 1 here. */ 327 hence we don't add or subtract 1 here. */
328 if (c1 < c2) 328 if (c1 < c2)
329 return make_number (- i1); 329 return make_number (- i1 + XINT (start1));
330 else 330 else
331 return make_number (i1); 331 return make_number (i1 - XINT (start1));
332 } 332 }
333 333
334 if (i1 < end1_char) 334 if (i1 < end1_char)