From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 13 Jun 2014 15:31:17 +0000 (-0400)
Subject: * lisp/emacs-lisp/smie.el (smie-next-sexp): Fix up "other-end" info when
X-Git-Tag: emacs-24.3.92~81
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf26b463ea0e7621255f73d22893a93754694800;p=emacs.git

* lisp/emacs-lisp/smie.el (smie-next-sexp): Fix up "other-end" info when
bumping forward into a closing paren.

Fixes: debbugs:17761
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ecc6a140ab..db615f68adf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-06-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* emacs-lisp/smie.el (smie-next-sexp): Fix up "other-end" info when
+	bumping forward into a closing paren (bug#17761).
+
 	* term/xterm.el (xterm--version-handler): Work around for OSX
 	Terminal.app (bug#17607).
 
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index e65f873b874..3e40d37aacf 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -709,7 +709,8 @@ Possible return values:
                 (condition-case err
                     (progn (funcall next-sexp 1) nil)
                   (scan-error
-                   (let ((epos (nth 2 err)))
+                   (let* ((epos1 (nth 2 err))
+                          (epos (if (<= (point) epos1) (nth 3 err) epos1)))
                      (goto-char pos)
                      (throw 'return
                             (list t epos
@@ -1832,6 +1833,8 @@ KEYWORDS are additional arguments, which can use the following keywords:
                     (append smie-blink-matching-triggers
                             (delete-dups triggers)))))))
 
+(declare-function edebug-instrument-function "edebug" (func))
+
 (defun smie-edebug ()
   "Instrument the `smie-rules-function' for Edebug."
   (interactive)