mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-03 11:33:37 +00:00
Code Issues Releases Activity

* lisp/emacs-lisp/smie.el (smie-next-sexp): Fix up "other-end" info when

Browse Source 
bumping forward into a closing paren.

Fixes: debbugs:17761
This commit is contained in:
Stefan Monnier 2014-06-13 11:31:17 -04:00
parent 40be983bc6
commit bf26b463ea
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -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).

5
lisp/emacs-lisp/smie.el
View File

@ -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)