From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 3 Dec 2015 20:22:14 +0000 (-0500)
Subject: * lisp/emacs-lisp/smie.el (smie-next-sexp): Fix BOB "token"
X-Git-Tag: emacs-25.0.90~551
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d611e25ffdfb31e321d4612b282542690f26534;p=emacs.git

* lisp/emacs-lisp/smie.el (smie-next-sexp): Fix BOB "token"
---

diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 25ea4bbb588..c9c002bc8fa 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -717,9 +717,10 @@ Possible return values:
                      (goto-char pos)
                      (throw 'return
                             (list t epos
-                                  (buffer-substring-no-properties
-                                   epos
-                                   (+ epos (if (< (point) epos) -1 1))))))))
+                                  (unless (= (point) epos)
+                                    (buffer-substring-no-properties
+                                     epos
+                                     (+ epos (if (< (point) epos) -1 1)))))))))
                 (if (eq pos (point))
                     ;; We did not move, so let's abort the loop.
                     (throw 'return (list t (point))))))