diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-06-14 17:06:30 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-06-14 17:06:30 -0700 |
| commit | 90de50e27049ae19492dd9843e50618ea4ed5d14 (patch) | |
| tree | 1efdf48fb6243e3f8448465c59dda3eb9db67a0c /lisp/emacs-lisp/smie.el | |
| parent | 799d2f3d87185a51835d0594a89485932d0f4c23 (diff) | |
| parent | 27433ff85f21f108e84a6e8966c9461cf66c2015 (diff) | |
| download | emacs-90de50e27049ae19492dd9843e50618ea4ed5d14.tar.gz emacs-90de50e27049ae19492dd9843e50618ea4ed5d14.tar.bz2 emacs-90de50e27049ae19492dd9843e50618ea4ed5d14.zip | |
Merge from emacs-24; up to 2014-06-03T06:51:18Z!eliz@gnu.org
Diffstat (limited to 'lisp/emacs-lisp/smie.el')
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 5 |
1 files changed, 4 insertions, 1 deletions
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) |