Make up-list and backward-up-list get out of more spots

3 files changed, 25 insertions, 4 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 2ae1faffc4e..25fa8ca4946 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2014-04-09  Daniel Colascione  <dancol@dancol.org>
+
+        * errors.texi (Standard Errors): Document required error
+        parameters for `scan-error'.
+
+        * positions.texi (List Motion): Explain new `up-list' arguments.
+        Mention `backward-up-list'.
+
 2014-04-08  Daniel Colascione  <dancol@dancol.org>
 
         * minibuf.texi (Programmed Completion): Improve phrasing, remove
diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi
index e00496e3478..dba8d219774 100644
--- a/doc/lispref/errors.texi
+++ b/doc/lispref/errors.texi
@@ -157,7 +157,10 @@ The message is @samp{Attempt to modify a protected file}.
 @item scan-error
 The message is @samp{Scan error}.  This happens when certain
 syntax-parsing functions find invalid syntax or mismatched
-parentheses.  @xref{List Motion}, and @xref{Parsing Expressions}.
+parentheses.  Conventionally raised with three argument: a
+human-readable error message, the start of the obstacle that cannot be
+moved over, and the end of the obstacle.  @xref{List Motion}, and
+@xref{Parsing Expressions}.
 
 @item search-failed
 The message is @samp{Search failed}.  @xref{Searching and Matching}.
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index f83173e2038..5a77b37e7e1 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -647,9 +647,19 @@ parentheses.  (Other syntactic entities such as words or paired string
 quotes are ignored.)
 @end deffn
 
-@deffn Command up-list &optional arg
-This function moves forward out of @var{arg} (default 1) levels of parentheses.
-A negative argument means move backward but still to a less deep spot.
+@deffn Command up-list &optional arg escape-strings no-syntax-crossing
+This function moves forward out of @var{arg} (default 1) levels of
+parentheses.  A negative argument means move backward but still to a
+less deep spot.  If @var{escape-strings} is non-nil (as it is
+interactively), move out of enclosing strings as well. If
+@var{no-syntax-crossing} is non-nil (as it is interactively), prefer
+to break out of any enclosing string instead of moving to the start of
+a list broken across multiple strings.  On error, location of point is
+unspecified.
+@end deffn
+
+@deffn Command backward-up-list &optional arg escape-strings no-syntax-crossing
+This function is just like @code{up-list}, but with a negated argument.
 @end deffn
 
 @deffn Command down-list &optional arg