(truncate-partial-width-windows): Doc fix.

diff --git a/src/ChangeLog b/src/ChangeLog
index 29b0e0c5ab11971faa0a97edc3d2c8017c2c74f5..317a67c37d9c17e94737df365a22e4f89cd10eff 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-10  Glenn Morris  <rgm@gnu.org>
+
+       * xdisp.c (truncate-partial-width-windows): Doc fix.
+
 2008-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * fileio.c (read_file_name_cleanup, Fread_file_name_internal):

diff --git a/src/xdisp.c b/src/xdisp.c
index 7c6c9ebd50d15e3ad8afff50c8a0965731addb45..a64a6b2e854de3b8e702b91f7ea815f3fe939a38 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12539,7 +12539,7 @@ try_scrolling (window, just_this_one_p, scroll_conservatively,
            {
              double float_amount = XFLOATINT (aggressive) * height;
              amount_to_scroll = float_amount;
-             if (amount_to_scroll == 0 && float_amount > 0)
+             if (amount_to_scroll == 0 && float_amount >= 0)
                amount_to_scroll = 1;
            }
        }
@@ -12602,7 +12602,7 @@ try_scrolling (window, just_this_one_p, scroll_conservatively,
                {
                  double float_amount = XFLOATINT (aggressive) * height;
                  amount_to_scroll = float_amount;
-                 if (amount_to_scroll == 0 && float_amount > 0)
+                 if (amount_to_scroll == 0 && float_amount >= 0)
                    amount_to_scroll = 1;
                }
            }
@@ -24587,7 +24587,8 @@ Value is a number or a cons (WIDTH-DPI . HEIGHT-DPI).  */);
 
   DEFVAR_BOOL ("truncate-partial-width-windows",
               &truncate_partial_width_windows,
-    doc: /* *Non-nil means truncate lines in all windows less than full frame wide.  */);
+    doc: /* *Non-nil means truncate lines in all windows less than full frame wide.
+Nil means to respect the value of `truncate-lines'.  */);
   truncate_partial_width_windows = 1;
 
   DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video,