[Emacs-diffs] emacs-24 r117237: * lisp/emacs-lisp/smie.el (smie-next-sexp): Fix up "other-end" info when

[Stefan Monnier]

------------------------------------------------------------
revno: 117237
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17761
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-06-13 11:31:17 -0400
message:
  * lisp/emacs-lisp/smie.el (smie-next-sexp): Fix up "other-end" info when
  bumping forward into a closing paren.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/smie.el        smie.el-20100517192034-xap3ihmey43772vj-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-13 15:06:29 +0000
+++ b/lisp/ChangeLog    2014-06-13 15:31:17 +0000
@@ -1,5 +1,8 @@
 2014-06-13  Stefan Monnier  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/emacs-lisp/smie.el'
--- a/lisp/emacs-lisp/smie.el   2014-03-04 08:35:11 +0000
+++ b/lisp/emacs-lisp/smie.el   2014-06-13 15:31:17 +0000
@@ -709,7 +709,8 @@
                 (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 @@
                     (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)