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

2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 29b0e0c5ab1..317a67c37d9 100644
--- 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 7c6c9ebd50d..a64a6b2e854 100644
--- 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,