* emulation/pc-select.el (scroll-down-mark, scroll-down-nomark)

(scroll-up-mark, scroll-up-nomark): Doc fix (Bug#4190).

2 files changed, 17 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ff983c19cf..d8441603366 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emulation/pc-select.el (scroll-down-mark, scroll-down-nomark)
+        (scroll-up-mark, scroll-up-nomark): Doc fix (Bug#4190).
+
 2009-09-11  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-mi.el (gdb-var-list-children-regexp): Delete.
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index 5e6063efa34..536eaa1840c 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -382,7 +382,9 @@ If scan reaches end of buffer, stop there without error."
   "Ensure mark is active; scroll down ARG lines; or near full screen if no ARG.
 A near full screen is `next-screen-context-lines' less than a full screen.
 Negative ARG means scroll upward.
-When calling from a program, supply a number as argument or nil."
+When calling from a program, supply a number as argument or nil.
+Attempting to scroll past the edge of buffer does not raise an
+error, unless `pc-select-override-scroll-error' is nil."
   (interactive "P")
   (pc-select-ensure-mark)
   (cond (pc-select-override-scroll-error
@@ -515,7 +517,9 @@ If scan reaches end of buffer, stop there without error."
   "Deactivate mark; scroll down ARG lines; or near full screen if no ARG.
 A near full screen is `next-screen-context-lines' less than a full screen.
 Negative ARG means scroll upward.
-When calling from a program, supply a number as argument or nil."
+When calling from a program, supply a number as argument or nil.
+Attempting to scroll past the edge of buffer does not raise an
+error, unless `pc-select-override-scroll-error' is nil."
   (interactive "P")
   (pc-select-maybe-deactivate-mark)
   (cond (pc-select-override-scroll-error
@@ -630,7 +634,9 @@ If scan reaches end of buffer, stop there without error."
 "Ensure mark is active; scroll upward ARG lines; or near full screen if no ARG.
 A near full screen is `next-screen-context-lines' less than a full screen.
 Negative ARG means scroll downward.
-When calling from a program, supply a number as argument or nil."
+When calling from a program, supply a number as argument or nil.
+Attempting to scroll past the edge of buffer does not raise an
+error, unless `pc-select-override-scroll-error' is nil."
   (interactive "P")
   (pc-select-ensure-mark)
   (cond (pc-select-override-scroll-error
@@ -727,7 +733,9 @@ If scan reaches end of buffer, stop there without error."
   "Deactivate mark; scroll upward ARG lines; or near full screen if no ARG.
 A near full screen is `next-screen-context-lines' less than a full screen.
 Negative ARG means scroll downward.
-When calling from a program, supply a number as argument or nil."
+When calling from a program, supply a number as argument or nil.
+Attempting to scroll past the edge of buffer does not raise an
+error, unless `pc-select-override-scroll-error' is nil."
   (interactive "P")
   (pc-select-maybe-deactivate-mark)
   (cond (pc-select-override-scroll-error