[Emacs-diffs] /srv/bzr/emacs/trunk r104330: * lisp/emacs-lisp/lisp.el (up-list): Fix forward movement.

[Stefan Monnier]

------------------------------------------------------------
revno: 104330
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8708
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-05-23 13:40:16 -0300
message:
  * lisp/emacs-lisp/lisp.el (up-list): Fix forward movement.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/lisp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-23 15:03:04 +0000
+++ b/lisp/ChangeLog    2011-05-23 16:40:16 +0000
@@ -1,3 +1,7 @@
+2011-05-23  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/lisp.el (up-list): Fix forward movement (bug#8708).
+
 2011-05-23  Ken Manheimer  <address@hidden>
 
        * allout.el (allout-inhibit-auto-fill-on-headline): Create new

=== modified file 'lisp/emacs-lisp/lisp.el'
--- a/lisp/emacs-lisp/lisp.el   2011-05-12 07:07:06 +0000
+++ b/lisp/emacs-lisp/lisp.el   2011-05-23 16:40:16 +0000
@@ -145,12 +145,12 @@
     (while (/= arg 0)
       (if (null forward-sexp-function)
           (goto-char (or (scan-lists (point) inc 1) (buffer-end arg)))
-          (condition-case err
-              (while (progn (setq pos (point))
-                       (forward-sexp inc)
-                       (/= (point) pos)))
-            (scan-error (goto-char (nth 2 err))))
-        (if (= (point) pos)
+       (condition-case err
+           (while (progn (setq pos (point))
+                         (forward-sexp inc)
+                         (/= (point) pos)))
+         (scan-error (goto-char (nth (if (> arg 0) 3 2) err))))
+       (if (= (point) pos)
             (signal 'scan-error
                     (list "Unbalanced parentheses" (point) (point)))))
       (setq arg (- arg inc)))))